Eclipse Public License

Attribute name	Class name	Description
org.restlet.http.headers	org.restlet.data.Form	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 - * non-standard headers that should be added to the request or to - * the response.
org.restlet.https.clientCertificates	List	For requests received via a secure connector, indicates the ordered - * list of client certificates, if they are available and accessible.

Attribute name	Class name	Description
org.restlet.http.headers	org.restlet.data.Form	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 + * non-standard headers that should be added to the request or to the + * response.
org.restlet.https.clientCertificates	List	For requests received via a secure connector, indicates the ordered + * list of client certificates, if they are available and accessible.

" f00ea151341c3b7a481ed512e124349990fa8c15,Vala,"libgnomeui-2.0: Update to 2.24.2. ",c,https://github.com/GNOME/vala/,⚠️ Could not parse repo info 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 Single from(Future future, Scheduler sch return new Single(OnSubscribeToObservableFuture.toObservableFuture(future)).subscribeOn(scheduler); } + /** + * Returns a {@link Single} that invokes passed function and emits its result for each new Observer that subscribes. + *

+ * 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}. + *

Scheduler:: {@code fromCallable} does not operate by default on a particular {@link Scheduler}.

+ * + * @param func + * function which execution should be deferred, it will be invoked when Observer will subscribe to the {@link Single}. + * @param + * 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 Single fromCallable(final Callable func) { + return create(new OnSubscribe() { + @Override + public void call(SingleSubscriber 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. *

Will create two message codes for an object error, in the following order: + *

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}): *

1.: code + ""."" + object name *

2.: code @@ -68,11 +72,16 @@ *

7. try ""typeMismatch"" *

* + *

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. + * *

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. + *

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. *

+ * 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 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 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 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 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 Java DSL 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 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. *

+ * You can use a regular {@link RouteBuilder} but the specialized {@link org.apache.camel.builder.AdviceWithRouteBuilder} + * has additional features when using the advice with feature. + * We therefore suggest you to use the {@link org.apache.camel.builder.AdviceWithRouteBuilder}. + *

* The advice process will add the interceptors, on exceptions, on completions etc. configured * from the route builder to this route. *

@@ -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 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" 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 @SessionScoped bean. *

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 windowId * associated with this very Thread.

@@ -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 true if any did exist, false 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 @PreDestroy. */ - public void destroyAllActive(ContextualStorage storage) + public static void destroyAllActive(ContextualStorage storage) { Map> contextMap = storage.getStorage(); for (Map.Entry> 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 storageMap = new ConcurrentHashMap(); + //X TODO review usage public Map getStorageMap() { return storageMap; @@ -86,4 +89,18 @@ public Map forceNewStorage() storageMap = new ConcurrentHashMap(); 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 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 windowContexts = new ConcurrentHashMap(); - 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 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());" 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" 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. + + +" 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 @@ /tmp/hama-${user.name} Temporary directory on the local filesystem. + + bsp.disk.queue.dir + ${hama.tmp.dir}/messages/ + Temporary directory on the local message buffer on disk. + bsp.child.java.opts -Xmx512m 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>> it = messenger + // normally all messages should been send now, finalizing the send phase + messenger.finishSendPhase(); + Iterator>> it = messenger .getMessageIterator(); boolean shouldCheckPoint = false; @@ -304,7 +306,7 @@ public final void sync() throws IOException, SyncException, } while (it.hasNext()) { - Entry> entry = it.next(); + Entry> entry = it.next(); final InetSocketAddress addr = entry.getKey(); final Iterable 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 implements @SuppressWarnings(""rawtypes"") private static final ConcurrentHashMap managerMap = new ConcurrentHashMap(); - private final HashMap> localOutgoingMessages = new HashMap>(); + private final HashMap> localOutgoingMessages = new HashMap>(); private static final ConcurrentHashMap socketCache = new ConcurrentHashMap(); private final LinkedBlockingDeque localIncomingMessages = new LinkedBlockingDeque(); private BSPPeer peer; @Override - public void init(BSPPeer peer, Configuration conf, InetSocketAddress peerAddress) { + public void init(TaskAttemptID attemptId, BSPPeer 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 msgs = localOutgoingMessages.get(inetSocketAddress); + MessageQueue msgs = localOutgoingMessages.get(inetSocketAddress); if (msgs == null) { - msgs = new LinkedList(); + msgs = new MemoryQueue(); } msgs.add(msg); peer.incrementCounter(BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_SENT, 1L); @@ -380,12 +383,13 @@ public void transfer(InetSocketAddress addr, BSPMessageBundle 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>> getMessageIterator() { + public Iterator>> 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 implements + MessageManager, Configurable { + + private static final Log LOG = LogFactory + .getLog(AbstractMessageManager.class); + + // conf is injected via reflection of the factory + protected Configuration conf; + protected final HashMap peerSocketCache = new HashMap(); + protected final HashMap> outgoingQueues = new HashMap>(); + protected MessageQueue localQueue; + // this must be a synchronized implementation: this is accessed per RPC + protected SynchronizedQueue localQueueForNextIteration; + protected BSPPeer peer; + // the peer address of this peer + protected InetSocketAddress peerAddress; + // the task attempt id + protected TaskAttemptID attemptId; + + @Override + public void init(TaskAttemptID attemptId, BSPPeer 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> values = outgoingQueues.values(); + for (MessageQueue msgQueue : values) { + msgQueue.close(); + } + localQueue.close(); + } + + @Override + public void finishSendPhase() throws IOException { + Collection> values = outgoingQueues.values(); + for (MessageQueue 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 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>> 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 new queue implementation. + */ + protected MessageQueue getQueue() { + Class queueClass = conf.getClass(QUEUE_TYPE_CLASS, MemoryQueue.class); + @SuppressWarnings(""unchecked"") + MessageQueue newInstance = (MessageQueue) ReflectionUtils + .newInstance(queueClass, conf); + newInstance.init(conf, attemptId); + return newInstance; + } + + protected SynchronizedQueue 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 extends CompressableMessageManager implements Sender { @@ -50,39 +46,24 @@ public final class AvroMessageManagerImpl extends private NettyServer server = null; private final HashMap> peers = new HashMap>(); - private final HashMap peerSocketCache = new HashMap(); - - private final HashMap> outgoingQueues = new HashMap>(); - private Deque localQueue = new LinkedList(); - // this must be a synchronized implementation: this is accessed per RPC - private final ConcurrentLinkedQueue localQueueForNextIteration = new ConcurrentLinkedQueue(); - - private BSPPeer peer; @Override - public void init(BSPPeer peer, Configuration conf, - InetSocketAddress addr) { - this.peer = peer; + public void init(TaskAttemptID attemptId, BSPPeer 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 messages) { - peer.incrementCounter( - BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_RECEIVED, messages.getMessages() - .size()); + peer.incrementCounter(BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_RECEIVED, + messages.getMessages().size()); Iterator iterator = messages.getMessages().iterator(); while (iterator.hasNext()) { this.localQueueForNextIteration.add(iterator.next()); @@ -90,11 +71,6 @@ public void put(BSPMessageBundle messages) { } } - @Override - public int getNumCurrentMessages() { - return localQueue.size(); - } - @SuppressWarnings(""unchecked"") @Override public void transfer(InetSocketAddress addr, BSPMessageBundle bundle) @@ -125,42 +101,19 @@ public Void transfer(AvroBSPMessageBundle 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 queue = outgoingQueues.get(targetPeerAddress); - if (queue == null) { - queue = new LinkedList(); - } - queue.add(msg); - outgoingQueues.put(targetPeerAddress, queue); - } - private final BSPMessageBundle deserializeMessage(ByteBuffer buffer) throws IOException { BSPMessageBundle msg = new BSPMessageBundle(); 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 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>> 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 */ -public abstract class CompressableMessageManager implements - MessageManager { +public abstract class CompressableMessageManager extends AbstractMessageManager { protected BSPMessageCompressor 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.
+ * Structure is as follows:
+ * If ""bsp.disk.queue.dir"" is not defined, ""hama.tmp.dir"" will be used instead.
+ * ${hama.tmp.dir}/diskqueue/job_id/task_attempt_id/
+ * 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.
+ * This is currently not intended to be production ready + */ +public final class DiskQueue implements MessageQueue { + + 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 col) { + for (M item : col) { + add(item); + } + } + + @Override + public void addAll(MessageQueue 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 iterator() { + return new DiskIterator(); + } + + @Override + public void setConf(Configuration conf) { + this.conf = conf; + } + + @Override + public Configuration getConf() { + return conf; + } + + private class DiskIterator implements Iterator { + + 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.
+ * 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 extends private static final Log LOG = LogFactory .getLog(HadoopMessageManagerImpl.class); - private Server server = null; - private Configuration conf; - private final HashMap> peers = new HashMap>(); - private final HashMap peerSocketCache = new HashMap(); - private final HashMap> outgoingQueues = new HashMap>(); - private Deque localQueue = new LinkedList(); - // this must be a synchronized implementation: this is accessed per RPC - private final ConcurrentLinkedQueue localQueueForNextIteration = new ConcurrentLinkedQueue(); - private BSPPeer peer; + private Server server = null; @Override - public final void init(BSPPeer peer, Configuration conf, InetSocketAddress peerAddress) { - this.peer = peer; - this.conf = conf; + public final void init(TaskAttemptID attemptId, BSPPeer 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 queue = outgoingQueues.get(targetPeerAddress); - if (queue == null) { - queue = new LinkedList(); - } - queue.add(msg); - peer.incrementCounter(BSPPeerImpl.PeerCounter.TOTAL_MESSAGES_SENT, 1L); - outgoingQueues.put(targetPeerAddress, queue); - } - - @Override - public final Iterator>> getMessageIterator() { - return this.outgoingQueues.entrySet().iterator(); - } - - @SuppressWarnings(""unchecked"") - protected final HadoopMessageManager getBSPPeerConnection( - InetSocketAddress addr) throws IOException { - HadoopMessageManager peer = peers.get(addr); - if (peer == null) { - peer = (HadoopMessageManager) RPC.getProxy(HadoopMessageManager.class, - HadoopMessageManager.versionID, addr, this.conf); - this.peers.put(addr, peer); - } - return peer; - } - @Override public final void transfer(InetSocketAddress addr, BSPMessageBundle bundle) throws IOException { @@ -155,18 +101,22 @@ public final void transfer(InetSocketAddress addr, BSPMessageBundle bundle) } } - @Override - public final void clearOutgoingQueues() { - this.outgoingQueues.clear(); - localQueue.addAll(localQueueForNextIteration); - localQueueForNextIteration.clear(); + @SuppressWarnings(""unchecked"") + protected final HadoopMessageManager getBSPPeerConnection( + InetSocketAddress addr) throws IOException { + HadoopMessageManager peer = peers.get(addr); + if (peer == null) { + peer = (HadoopMessageManager) 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 implements MessageQueue { + + private final Deque deque = new LinkedList(); + private Configuration conf; + + @Override + public final void addAll(Collection col) { + deque.addAll(col); + } + + @Override + public void addAll(MessageQueue 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 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 { + + 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 peer, Configuration conf, - InetSocketAddress peerAddress); + public void init(TaskAttemptID attemptId, BSPPeer 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 peer, Configuration conf, /** * Get the current message. * - * @return * @throws IOException */ public M getCurrentMessage() throws IOException; @@ -61,25 +61,26 @@ public void init(BSPPeer 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>> getMessageIterator(); + public Iterator>> getMessageIterator(); /** * This is the real transferring to a host with a bundle. * - * @param addr - * @param bundle - * @throws IOException */ public void transfer(InetSocketAddress addr, BSPMessageBundle bundle) throws IOException; @@ -92,7 +93,6 @@ public void transfer(InetSocketAddress addr, BSPMessageBundle 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 extends Iterable, 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 col); + + /** + * Adds the other queue to this queue. + */ + public void addAll(MessageQueue 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 { + + private final MessageQueue queue; + private final Object mutex; + + private SynchronizedQueue(MessageQueue queue) { + this.queue = queue; + this.mutex = new Object(); + } + + private SynchronizedQueue(MessageQueue queue, Object mutex) { + this.queue = queue; + this.mutex = mutex; + } + + public Iterator 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 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 getMessageQueue() { + synchronized (mutex) { + return queue; + } + } + + /* + * static constructor methods to be type safe + */ + + public static SynchronizedQueue synchronize(MessageQueue queue) { + return new SynchronizedQueue(queue); + } + + public static SynchronizedQueue synchronize(MessageQueue queue, + Object mutex) { + return new SynchronizedQueue(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 randomBundle = getRandomBundle(); Configuration conf = new Configuration(); + conf.set(DiskQueue.DISK_QUEUE_PATH_KEY, TMP_OUTPUT_PATH); MessageManager messageManager = MessageManagerFactory .getMessageManager(conf); conf.set(BSPMessageCompressorFactory.COMPRESSION_CODEC_CLASS, @@ -61,8 +65,8 @@ public void testAvroMessenger() throws Exception { BSPPeer dummyPeer = new BSPPeerImpl( 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 queue = getQueue(); + checkQueue(queue); + queue.close(); + } + + @Test + public void testMultipleIterations() throws Exception { + DiskQueue queue = getQueue(); + for (int superstep = 0; superstep < 15; superstep++) { + checkQueue(queue); + } + queue.close(); + } + + public DiskQueue getQueue() { + TaskAttemptID id = new TaskAttemptID(new TaskID(""123"", 1, 2), 0); + DiskQueue queue = new DiskQueue(); + // normally this is injected via reflection + queue.setConf(conf); + queue.init(conf, id); + return queue; + } + + public void checkQueue(DiskQueue 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 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 dummyPeer = new BSPPeerImpl( 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>> messageIterator = messageManager + Iterator>> messageIterator = messageManager .getMessageIterator(); - Entry> entry = messageIterator + Entry> 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(); } }" 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, 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 false. If its enabled, then will return true only if the specific flag is null 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); }" 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 @@ + + + + + + + + +Eclipse Public License - Version 1.0 + + + + + + +

+ +

Eclipse Public License - v 1.0 +

+ +

THE ACCOMPANYING PROGRAM IS PROVIDED UNDER +THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, +REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE +OF THIS AGREEMENT.

+ +

1. DEFINITIONS

+ +

"Contribution" 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 '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.

+ +

"Contributor" means any person or +entity that distributes the Program.

+ +

"Licensed Patents " 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.

+ +

"Program" means the Contributions +distributed in accordance with this Agreement.

+ +

"Recipient" 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'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 ("Commercial +Contributor") hereby agrees to defend and indemnify every other +Contributor ("Indemnified Contributor") against any losses, damages and +costs (collectively "Losses") 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'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 "AS IS" 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's patent(s), then such +Recipient's rights granted under Section 2(b) shall terminate as of the date +such litigation is filed.

+ +

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.

+ +

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.

+ +

+ + + + \ 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 @@ - *Eclipse Public License - v 1.0* - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE -PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF -THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -*1. DEFINITIONS* - -"Contribution" 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 -'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. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" 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. - -"Program" means the Contributions distributed in accordance with this -Agreement. - -"Recipient" 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'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 ("Commercial -Contributor") hereby agrees to defend and indemnify every other -Contributor ("Indemnified Contributor") against any losses, damages and -costs (collectively "Losses") 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'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 "AS IS" 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's patent(s), then such Recipient's -rights granted under Section 2(b) shall terminate as of the date such -litigation is filed. - -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. - -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 ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF +THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +*1. DEFINITIONS* + +"Contribution" 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 +'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. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" 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. + +"Program" means the Contributions distributed in accordance with this +Agreement. + +"Recipient" 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'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 ("Commercial +Contributor") hereby agrees to defend and indemnify every other +Contributor ("Indemnified Contributor") against any losses, damages and +costs (collectively "Losses") 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'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 "AS IS" 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's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +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. + +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. " a8dbce159679cd031f60e6151399fa2cd5ac9374,hadoop,HADOOP-7223. FileContext createFlag combinations- are not clearly defined. Contributed by Suresh Srinivas.--git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1092565 13f79535-47bb-0310-9956-ffa450edef68-,p,https://github.com/apache/hadoop,"diff --git a/CHANGES.txt b/CHANGES.txt index a6186537bdbb6..7a2ece8c71744 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -Hadoop Change Log +Hn jaadoop Change Log Trunk (unreleased changes) @@ -139,6 +139,10 @@ Trunk (unreleased changes) HADOOP-7207. fs member of FSShell is not really needed (boryas) + HADOOP-7223. FileContext createFlag combinations are not clearly defined. + (suresh) + + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/src/java/org/apache/hadoop/fs/ChecksumFs.java b/src/java/org/apache/hadoop/fs/ChecksumFs.java index a55108598becd..87cd5a77dec39 100644 --- a/src/java/org/apache/hadoop/fs/ChecksumFs.java +++ b/src/java/org/apache/hadoop/fs/ChecksumFs.java @@ -337,8 +337,9 @@ public ChecksumFSOutputSummer(final ChecksumFs fs, final Path file, int bytesPerSum = fs.getBytesPerSum(); int sumBufferSize = fs.getSumBufferSize(bytesPerSum, bufferSize); this.sums = fs.getRawFs().createInternal(fs.getChecksumFile(file), - EnumSet.of(CreateFlag.OVERWRITE), absolutePermission, sumBufferSize, - replication, blockSize, progress, bytesPerChecksum, createParent); + EnumSet.of(CreateFlag.CREATE, CreateFlag.OVERWRITE), + absolutePermission, sumBufferSize, replication, blockSize, progress, + bytesPerChecksum, createParent); sums.write(CHECKSUM_VERSION, 0, CHECKSUM_VERSION.length); sums.writeInt(bytesPerSum); } diff --git a/src/java/org/apache/hadoop/fs/CreateFlag.java b/src/java/org/apache/hadoop/fs/CreateFlag.java index 375876a8bdb40..4373124caabf4 100644 --- a/src/java/org/apache/hadoop/fs/CreateFlag.java +++ b/src/java/org/apache/hadoop/fs/CreateFlag.java @@ -17,49 +17,63 @@ */ package org.apache.hadoop.fs; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.EnumSet; + +import org.apache.hadoop.HadoopIllegalArgumentException; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; /**************************************************************** - *CreateFlag specifies the file create semantic. Users can combine flags like:
- *


+ * CreateFlag specifies the file create semantic. Users can combine flags like: 

+ * 
  * EnumSet.of(CreateFlag.CREATE, CreateFlag.APPEND)
  * 
- * and pass it to {@link org.apache.hadoop.fs.FileSystem #create(Path f, FsPermission permission,
- * EnumSet flag, int bufferSize, short replication, long blockSize,
- * Progressable progress)}.
- * 
  * 
- * Combine {@link #OVERWRITE} with either {@link #CREATE} 
- * or {@link #APPEND} does the same as only use 
- * {@link #OVERWRITE}. 

- * Combine {@link #CREATE} with {@link #APPEND} has the semantic:
+ * 
+ * Use the CreateFlag as follows:
+ * 

+ *  CREATE - to create a file if it does not exist, 
+ * else throw FileAlreadyExists.
+ *  APPEND - to append to a file if it exists, 
+ * else throw FileNotFoundException.
+ *  OVERWRITE - to truncate a file if it exists, 
+ * else throw FileNotFoundException.
+ *  CREATE|APPEND - to create a file if it does not exist, 
+ * else append to an existing file.
+ *  CREATE|OVERWRITE - to create a file if it does not exist, 
+ * else overwrite an existing file.
+ * 
+ * 
+ * Following combination is not valid and will result in 
+ * {@link HadoopIllegalArgumentException}:
  * 
- *  create the file if it does not exist;
- * 
 append the file if it already exists.
+ * 
 APPEND|OVERWRITE
+ *  CREATE|APPEND|OVERWRITE
  * 
  *****************************************************************/
 @InterfaceAudience.Public
-@InterfaceStability.Stable
+@InterfaceStability.Evolving
 public enum CreateFlag {
 
   /**
-   * create the file if it does not exist, and throw an IOException if it
+   * Create a file. See javadoc for more description
    * already exists
    */
   CREATE((short) 0x01),
 
   /**
-   * create the file if it does not exist, if it exists, overwrite it.
+   * Truncate/overwrite a file. Same as POSIX O_TRUNC. See javadoc for description.
    */
   OVERWRITE((short) 0x02),
 
   /**
-   * append to a file, and throw an IOException if it does not exist
+   * Append to a file. See javadoc for more description.
    */
   APPEND((short) 0x04);
 
-  private short mode;
+  private final short mode;
 
   private CreateFlag(short mode) {
     this.mode = mode;
@@ -68,4 +82,49 @@ private CreateFlag(short mode) {
   short getMode() {
     return mode;
   }
+  
+  /**
+   * Validate the CreateFlag and throw exception if it is invalid
+   * @param flag set of CreateFlag
+   * @throws HadoopIllegalArgumentException if the CreateFlag is invalid
+   */
+  public static void validate(EnumSet flag) {
+    if (flag == null || flag.isEmpty()) {
+      throw new HadoopIllegalArgumentException(flag
+          + "" does not specify any options"");
+    }
+    final boolean append = flag.contains(APPEND);
+    final boolean overwrite = flag.contains(OVERWRITE);
+    
+    // Both append and overwrite is an error
+    if (append && overwrite) {
+      throw new HadoopIllegalArgumentException(
+          flag + ""Both append and overwrite options cannot be enabled."");
+    }
+  }
+  
+  /**
+   * Validate the CreateFlag for create operation
+   * @param path Object representing the path; usually String or {@link Path}
+   * @param pathExists pass true if the path exists in the file system
+   * @param flag set of CreateFlag
+   * @throws IOException on error
+   * @throws HadoopIllegalArgumentException if the CreateFlag is invalid
+   */
+  public static void validate(Object path, boolean pathExists,
+      EnumSet flag) throws IOException {
+    validate(flag);
+    final boolean append = flag.contains(APPEND);
+    final boolean overwrite = flag.contains(OVERWRITE);
+    if (pathExists) {
+      if (!(append || overwrite)) {
+        throw new FileAlreadyExistsException(""File already exists: ""
+            + path.toString()
+            + "". Append or overwrite option must be specified in "" + flag);
+      }
+    } else if (!flag.contains(CREATE)) {
+      throw new FileNotFoundException(""Non existing file: "" + path.toString()
+          + "". Create option is not specified in "" + flag);
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/java/org/apache/hadoop/fs/FileContext.java b/src/java/org/apache/hadoop/fs/FileContext.java
index 2596daae5e7b4..e3163ea75e5b7 100644
--- a/src/java/org/apache/hadoop/fs/FileContext.java
+++ b/src/java/org/apache/hadoop/fs/FileContext.java
@@ -511,7 +511,7 @@ public Path makeQualified(final Path path) {
    * writing into the file.
    * 
    * @param f the file name to open
-   * @param createFlag gives the semantics of create: overwrite, append etc.
+   * @param createFlag gives the semantics of create; see {@link CreateFlag}
    * @param opts file creation options; see {@link Options.CreateOpts}.
    *          
    *          Progress - to report progress on the operation - default null
@@ -2057,7 +2057,10 @@ public boolean copy(final Path src, final Path dst, boolean deleteSource,
         OutputStream out = null;
         try {
           in = open(qSrc);
-          out = create(qDst, EnumSet.of(CreateFlag.OVERWRITE));
+          EnumSet createFlag = overwrite ? EnumSet.of(
+              CreateFlag.CREATE, CreateFlag.OVERWRITE) : 
+                EnumSet.of(CreateFlag.CREATE);
+          out = create(qDst, createFlag);
           IOUtils.copyBytes(in, out, conf, true);
         } catch (IOException e) {
           IOUtils.closeStream(out);
diff --git a/src/java/org/apache/hadoop/fs/FileSystem.java b/src/java/org/apache/hadoop/fs/FileSystem.java
index be1c796a4caa3..8708b7d62de03 100644
--- a/src/java/org/apache/hadoop/fs/FileSystem.java
+++ b/src/java/org/apache/hadoop/fs/FileSystem.java
@@ -717,24 +717,21 @@ protected FSDataOutputStream primitiveCreate(Path f,
      FsPermission absolutePermission, EnumSet flag, int bufferSize,
      short replication, long blockSize, Progressable progress,
      int bytesPerChecksum) throws IOException {
+
+    boolean pathExists = exists(f);
+    CreateFlag.validate(f, pathExists, flag);
     
     // Default impl  assumes that permissions do not matter and 
     // nor does the bytesPerChecksum  hence
     // calling the regular create is good enough.
     // FSs that implement permissions should override this.
 
-    if (exists(f)) {
-      if (flag.contains(CreateFlag.APPEND)) {
-        return append(f, bufferSize, progress);
-      } else if (!flag.contains(CreateFlag.OVERWRITE)) {
-        throw new IOException(""File already exists: "" + f);
-      }
-    } else {
-      if (flag.contains(CreateFlag.APPEND) && !flag.contains(CreateFlag.CREATE))
-        throw new IOException(""File already exists: "" + f.toString());
+    if (pathExists && flag.contains(CreateFlag.APPEND)) {
+      return append(f, bufferSize, progress);
     }
     
-    return this.create(f, absolutePermission, flag.contains(CreateFlag.OVERWRITE), bufferSize, replication,
+    return this.create(f, absolutePermission,
+        flag.contains(CreateFlag.OVERWRITE), bufferSize, replication,
         blockSize, progress);
   }
   
diff --git a/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java b/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java
index 18ef152baf35c..3a54fae955b7e 100644
--- a/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java
+++ b/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java
@@ -264,28 +264,6 @@ public FSDataOutputStream create(Path f, FsPermission permission,
     return out;
   }
   
-
-  @Override
-  protected FSDataOutputStream primitiveCreate(Path f,
-      FsPermission absolutePermission, EnumSet flag,
-      int bufferSize, short replication, long blockSize, Progressable progress,
-      int bytesPerChecksum) throws IOException {
-    
-    if(flag.contains(CreateFlag.APPEND)){
-      if (!exists(f)){
-        if(flag.contains(CreateFlag.CREATE)) {
-          return create(f, false, bufferSize, replication, blockSize, null);
-        }
-      }
-      return append(f, bufferSize, null);
-    }
- 
-    FSDataOutputStream out = create(f, flag.contains(CreateFlag.OVERWRITE),
-                                 bufferSize, replication, blockSize, progress);
-    setPermission(f, absolutePermission);
-    return out;
-  }
-
   public boolean rename(Path src, Path dst) throws IOException {
     if (pathToFile(src).renameTo(pathToFile(dst))) {
       return true;
diff --git a/src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java b/src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
index 1af5a6391bca2..b88f5b5c5d9ae 100644
--- a/src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
+++ b/src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
@@ -21,8 +21,8 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.EnumSet;
-import java.util.Iterator;
 
+import org.apache.hadoop.HadoopIllegalArgumentException;
 import org.apache.hadoop.fs.Options.CreateOpts;
 import org.apache.hadoop.fs.Options.Rename;
 import org.apache.hadoop.fs.permission.FsPermission;
@@ -32,6 +32,7 @@
 import org.junit.Test;
 
 import static org.apache.hadoop.fs.FileContextTestHelper.*;
+import static org.apache.hadoop.fs.CreateFlag.*;
 
 /**
  * 
@@ -155,7 +156,7 @@ public void testWorkingDirectory() throws Exception {
     
     // Now open a file relative to the wd we just set above.
     Path absolutePath = new Path(absoluteDir, ""foo"");
-    fc.create(absolutePath, EnumSet.of(CreateFlag.CREATE)).close();
+    fc.create(absolutePath, EnumSet.of(CREATE)).close();
     fc.open(new Path(""foo"")).close();
     
     
@@ -645,7 +646,7 @@ private void writeReadAndDelete(int len) throws IOException {
     
     fc.mkdir(path.getParent(), FsPermission.getDefault(), true);
 
-    FSDataOutputStream out = fc.create(path, EnumSet.of(CreateFlag.CREATE),
+    FSDataOutputStream out = fc.create(path, EnumSet.of(CREATE),
         CreateOpts.repFac((short) 1), CreateOpts
             .blockSize(getDefaultBlockSize()));
     out.write(data, 0, len);
@@ -670,31 +671,93 @@ private void writeReadAndDelete(int len) throws IOException {
 
   }
   
+  @Test(expected=HadoopIllegalArgumentException.class)
+  public void testNullCreateFlag() throws IOException {
+    Path p = getTestRootPath(fc, ""test/file"");
+    fc.create(p, null);
+    Assert.fail(""Excepted exception not thrown"");
+  }
+  
+  @Test(expected=HadoopIllegalArgumentException.class)
+  public void testEmptyCreateFlag() throws IOException {
+    Path p = getTestRootPath(fc, ""test/file"");
+    fc.create(p, EnumSet.noneOf(CreateFlag.class));
+    Assert.fail(""Excepted exception not thrown"");
+  }
+  
+  @Test(expected=FileAlreadyExistsException.class)
+  public void testCreateFlagCreateExistingFile() throws IOException {
+    Path p = getTestRootPath(fc, ""test/testCreateFlagCreateExistingFile"");
+    createFile(p);
+    fc.create(p, EnumSet.of(CREATE));
+    Assert.fail(""Excepted exception not thrown"");
+  }
+  
+  @Test(expected=FileNotFoundException.class)
+  public void testCreateFlagOverwriteNonExistingFile() throws IOException {
+    Path p = getTestRootPath(fc, ""test/testCreateFlagOverwriteNonExistingFile"");
+    fc.create(p, EnumSet.of(OVERWRITE));
+    Assert.fail(""Excepted exception not thrown"");
+  }
+  
   @Test
-  public void testOverwrite() throws IOException {
-    Path path = getTestRootPath(fc, ""test/hadoop/file"");
-    
-    fc.mkdir(path.getParent(), FsPermission.getDefault(), true);
-
-    createFile(path);
-    
-    Assert.assertTrue(""Exists"", exists(fc, path));
-    Assert.assertEquals(""Length"", data.length, fc.getFileStatus(path).getLen());
-    
-    try {
-      fc.create(path, EnumSet.of(CreateFlag.CREATE));
-      Assert.fail(""Should throw IOException."");
-    } catch (IOException e) {
-      // Expected
-    }
-    
-    FSDataOutputStream out = fc.create(path,EnumSet.of(CreateFlag.OVERWRITE));
+  public void testCreateFlagOverwriteExistingFile() throws IOException {
+    Path p = getTestRootPath(fc, ""test/testCreateFlagOverwriteExistingFile"");
+    createFile(p);
+    FSDataOutputStream out = fc.create(p, EnumSet.of(OVERWRITE));
+    writeData(fc, p, out, data, data.length);
+  }
+  
+  @Test(expected=FileNotFoundException.class)
+  public void testCreateFlagAppendNonExistingFile() throws IOException {
+    Path p = getTestRootPath(fc, ""test/testCreateFlagAppendNonExistingFile"");
+    fc.create(p, EnumSet.of(APPEND));
+    Assert.fail(""Excepted exception not thrown"");
+  }
+  
+  @Test
+  public void testCreateFlagAppendExistingFile() throws IOException {
+    Path p = getTestRootPath(fc, ""test/testCreateFlagAppendExistingFile"");
+    createFile(p);
+    FSDataOutputStream out = fc.create(p, EnumSet.of(APPEND));
+    writeData(fc, p, out, data, 2 * data.length);
+  }
+  
+  @Test
+  public void testCreateFlagCreateAppendNonExistingFile() throws IOException {
+    Path p = getTestRootPath(fc, ""test/testCreateFlagCreateAppendNonExistingFile"");
+    FSDataOutputStream out = fc.create(p, EnumSet.of(CREATE, APPEND));
+    writeData(fc, p, out, data, data.length);
+  }
+  
+  @Test
+  public void testCreateFlagCreateAppendExistingFile() throws IOException {
+    Path p = getTestRootPath(fc, ""test/testCreateFlagCreateAppendExistingFile"");
+    createFile(p);
+    FSDataOutputStream out = fc.create(p, EnumSet.of(CREATE, APPEND));
+    writeData(fc, p, out, data, 2*data.length);
+  }
+  
+  @Test(expected=HadoopIllegalArgumentException.class)
+  public void testCreateFlagAppendOverwrite() throws IOException {
+    Path p = getTestRootPath(fc, ""test/nonExistent"");
+    fc.create(p, EnumSet.of(APPEND, OVERWRITE));
+    Assert.fail(""Excepted exception not thrown"");
+  }
+  
+  @Test(expected=HadoopIllegalArgumentException.class)
+  public void testCreateFlagAppendCreateOverwrite() throws IOException {
+    Path p = getTestRootPath(fc, ""test/nonExistent"");
+    fc.create(p, EnumSet.of(CREATE, APPEND, OVERWRITE));
+    Assert.fail(""Excepted exception not thrown"");
+  }
+  
+  private static void writeData(FileContext fc, Path p, FSDataOutputStream out,
+      byte[] data, long expectedLen) throws IOException {
     out.write(data, 0, data.length);
     out.close();
-    
-    Assert.assertTrue(""Exists"", exists(fc, path));
-    Assert.assertEquals(""Length"", data.length, fc.getFileStatus(path).getLen());
-    
+    Assert.assertTrue(""Exists"", exists(fc, p));
+    Assert.assertEquals(""Length"", expectedLen, fc.getFileStatus(p).getLen());
   }
   
   @Test
@@ -1057,7 +1120,7 @@ public void testOutputStreamClosedTwice() throws IOException {
     //HADOOP-4760 according to Closeable#close() closing already-closed 
     //streams should have no effect. 
     Path src = getTestRootPath(fc, ""test/hadoop/file"");
-    FSDataOutputStream out = fc.create(src, EnumSet.of(CreateFlag.CREATE),
+    FSDataOutputStream out = fc.create(src, EnumSet.of(CREATE),
             Options.CreateOpts.createParent());
     
     out.writeChar('H'); //write some data
@@ -1091,7 +1154,7 @@ public void testUnsupportedSymlink() throws IOException {
   }
   
   protected void createFile(Path path) throws IOException {
-    FSDataOutputStream out = fc.create(path, EnumSet.of(CreateFlag.CREATE),
+    FSDataOutputStream out = fc.create(path, EnumSet.of(CREATE),
         Options.CreateOpts.createParent());
     out.write(data, 0, data.length);
     out.close();
diff --git a/src/test/core/org/apache/hadoop/fs/loadGenerator/DataGenerator.java b/src/test/core/org/apache/hadoop/fs/loadGenerator/DataGenerator.java
index 97342951579ca..5124211d344db 100644
--- a/src/test/core/org/apache/hadoop/fs/loadGenerator/DataGenerator.java
+++ b/src/test/core/org/apache/hadoop/fs/loadGenerator/DataGenerator.java
@@ -140,7 +140,8 @@ private void genFiles() throws IOException {
    * a length of fileSize. The file is filled with character 'a'.
    */
   private void genFile(Path file, long fileSize) throws IOException {
-    FSDataOutputStream out = fc.create(file, EnumSet.of(CreateFlag.OVERWRITE),
+    FSDataOutputStream out = fc.create(file,
+        EnumSet.of(CreateFlag.CREATE, CreateFlag.OVERWRITE),
         CreateOpts.createParent(), CreateOpts.bufferSize(4096),
         CreateOpts.repFac((short) 3));
     for(long i=0; i "")) != 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 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 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();
+        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 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 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 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 Ståle W. Pedersen
+ */
+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 Ståle W. Pedersen
+ */
+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 Ståle W. Pedersen
  */
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 Ståle W. Pedersen
+ */
+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 listMatchingDirectories(String possibleDir, File cwd) {
+        // that starts with possibleDir
+        List returnFiles = new ArrayList();
+        if (possibleDir.trim().isEmpty()) {
+            List 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();
+            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 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 listDirectory(File path) {
+        List fileNames = new ArrayList();
+        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));
+    }
+
 }"
b4a6e4a98e5ca16889391a5db989b151f03ed208,Valadoc,"Add initial reading-support for 
",a,https://github.com/GNOME/vala/,⚠️ Could not parse repo info
72ef7746017c1171199683ab682cb9e370720850,robotframework$swinglibrary,"Improved combobox testability
",p,https://github.com/MarketSquare/SwingLibrary,"diff --git a/test-application/src/main/java/org/robotframework/swing/testapp/TestApplication.java b/test-application/src/main/java/org/robotframework/swing/testapp/TestApplication.java
index 2a5b9a7c..91b84d45 100644
--- a/test-application/src/main/java/org/robotframework/swing/testapp/TestApplication.java
+++ b/test-application/src/main/java/org/robotframework/swing/testapp/TestApplication.java
@@ -97,7 +97,16 @@ public String getText() {
                 }
             });
         }});
-        panel.add(new ContentChangingCombobox());
+        final ContentChangingCombobox contentChangingComboBox = new ContentChangingCombobox();
+        panel.add(new JButton(""Reset Content Changing Combobox"") {{
+            setName(""resetContentChangingComboBox"");
+            addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    contentChangingComboBox.resetModel();
+                }
+            });
+        }});
+        panel.add(contentChangingComboBox);
         panel.add(new TestLabel());
         panel.add(new TestTable(""testTable"", getTestTableData()));
         panel.add(new TestTable(""anotherTable"", getTestTableData()));
@@ -147,11 +156,14 @@ private Object[][] getFoobarTestTableData() {
 
 class ContentChangingCombobox extends JComboBox implements ActionListener {
     
+    private static final String REMOVABLE_ITEM = ""Removable"";
+    private static final String[] ITEMS = new String[]{""Foo"", ""Bar"", ""Quux"", REMOVABLE_ITEM};
+
     public ContentChangingCombobox() {
         setEditable(true);
         setName(""contentChangingCombobox"");
         addActionListener(this);
-        setModel(new DefaultComboBoxModel(new String[]{""Foo"", ""Bar"", ""Quux""}));
+        setModel(new DefaultComboBoxModel(ITEMS));
     }
 
     @Override
@@ -159,7 +171,8 @@ public void actionPerformed(ActionEvent event) {
         if (event.getActionCommand().equals(""comboBoxChanged"")) {
             String selected = (String) getSelectedItem();
             List items = new ArrayList();
-            items.add(selected);
+            if (! selected.equals(REMOVABLE_ITEM))
+                items.add(selected);
             ComboBoxModel model = getModel();
             for (int i=0, size = model.getSize(); i < size; i++) {
                 String item = (String) model.getElementAt(i);
@@ -169,7 +182,11 @@ public void actionPerformed(ActionEvent event) {
             setModel(new DefaultComboBoxModel(items.toArray()));
             setSelectedIndex(0);
         }
-    }              
+    }  
+    
+    public void resetModel() {
+        setModel(new DefaultComboBoxModel(ITEMS));
+    }
 }
 
 class PopupPanel extends JPanel {"
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 seenCauses = new HashSet();
+
         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 throwables = new ArrayList();
+        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"
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 copyResponseHeaders(Response restletResponse) {
         final Series 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.

+ * 

+ * This class is especially useful when directly integrating Restlets with
+ * Spring managed Web applications. Here is a simple usage example:
+ * 
+ * 
+ * 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("Hello World");
+ *                 res.setEntity("Hello World!", MediaType.TEXT_PLAIN);
+ *             }
+ *         };
+ * 
+ *         this.adapter.setTarget(trace);
+ *     }
+ * 
+ *     protected void service(HttpServletRequest req, HttpServletResponse res)
+ *             throws ServletException, IOException {
+ *         this.adapter.service(req, res);
+ *     }
+ * }
+ * 
+ * 
+ * @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 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 @@
  * 
  *   * 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("Hello World");
- * 				res.setEntity("Hello World!", MediaType.TEXT_PLAIN);
- * 			}
- * 		};
+ *         Restlet trace = new Restlet(this.converter.getContext()) {
+ *             public void handle(Request req, Response res) {
+ *                 getLogger().info("Hello World");
+ *                 res.setEntity("Hello World!", 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);
+ *     }
  * }
  * 
  * 
  * @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 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 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.
+     * 
+     * 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.
-     * 

-     * 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> getObjectClasses(Variant variant) {
-        return null;
-    }
-
-    @Override
-    public List getVariants(Class objectClass) {
-        return null;
-    }
-
-    @Override
-    public  T toObject(Representation representation, Class 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 {
+public abstract class RestletHelper 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 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 @@
  * 
  * converter
  * String
- * org.restlet.engine.http.HttpClientConverter
+ * org.restlet.engine.http.HttpClientAdapter
  * Class name of the converter of low-level HTTP calls into high level
  * requests and responses.
  * 
@@ -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 @@
  * 
  * converter
  * String
- * org.restlet.engine.http.HttpServerConverter
+ * org.restlet.engine.http.HttpServerAdapter
  * Class name of the converter of low-level HTTP calls into high level
  * requests and responses.
  * 
@@ -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 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 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 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 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 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 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;
+    }
 
 }"
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()));"
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++;
     }"
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());"
589edc7aec4e95e8249f99dc703bb799203ac89f,Vala,"Copy default_expression in FormalParameter.copy
",c,https://github.com/GNOME/vala/,⚠️ Could not parse repo info
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 kieModules        = new HashMap();
+    private final KieModuleRepo        kieModuleRepo    = new KieModuleRepo();
 
     private final AtomicReference 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> kieModules = new HashMap>();
+
+        void store(KieModule kieModule) {
+            GAV gav = kieModule.getGAV();
+            String ga = gav.getGroupId() + "":"" + gav.getArtifactId();
+
+            TreeMap artifactMap = kieModules.get(ga);
+            if (artifactMap == null) {
+                artifactMap = new TreeMap();
+                kieModules.put(ga, artifactMap);
+            }
+            artifactMap.put(new ComparableVersion(gav.getVersion()), kieModule);
+        }
+
+        KieModule load(GAV gav, VersionRange versionRange) {
+            String ga = gav.getGroupId() + "":"" + gav.getArtifactId();
+            TreeMap 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 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 {
+        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 _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 implements Item {
+            public int getType() {
+                return LIST_ITEM;
+            }
+
+            public boolean isNull() {
+                return ( size() == 0 );
+            }
+
+            void normalize() {
+                for( ListIterator 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 left = iterator();
+                        Iterator 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 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 stack = new Stack();
+            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 scanForUpdates(Collection dep
         List newArtifacts = new ArrayList();
         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);"
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/JetBrains/intellij-community,⚠️ HTTP 404: Not Found
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 Ståle W. Pedersen
@@ -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 complete(String line, int cursor) {
+                // very simple completor
+                List commands = new ArrayList();
+                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 possibleCompletions) {
+        if(possibleCompletions.size() > 50) {
+            // display ask...
+        }
+        // display all
+        else {
+
+        }
+
+    }
+
+
 }"
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 scopes,
                                                                                final Map 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.emptyList(),
                                 globals, event);
@@ -33,7 +33,7 @@ public static CmdlineRemoteProto.Message.ControllerMessage createForceCompileReq
                                                                                        Collection paths,
                                                                                        final Map 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 scopes,
+                                                                                          List scopes,
                                                                                           Map userData,
                                                                                           Collection 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) {"
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"")));"
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> tasks = futures;
       LOG.debug(""cancelling "" + tasks.size() + "" tasks for snapshot "" + name);
       for (Future 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."
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  Observable concat(Observable... source) {
         return _create(OperationConcat.concat(source));
     }
 
+    /**
+     * Emits the same objects as the given Observable, calling the given action
+     * when it calls onComplete or onError.
+     * @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 MSDN: Observable.Finally Method
+     */
+    public static  Observable 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.
      * 

      * 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  Func1, Subscription> finally0(final Observable 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 nums = Observable.toObservable(n);
             TestAction action = new TestAction();
             action.called = 0;
-            @SuppressWarnings(""unchecked"")
             Observable fin = Observable.create(finally0(nums, action));
             @SuppressWarnings(""unchecked"")
             Observer aObserver = mock(Observer.class);
             fin.subscribe(aObserver);
-            Assert.assertEquals(1, action.called);
+            assertEquals(1, action.called);
 
             action.called = 0;
             Observable error = Observable.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
+}"
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);
     }
   }"
5fe6054a3835b11a4432e3da770f779183de4291,Mylyn Reviews,"Minor cleanup

-ignore warning about internal api
-minor reformatting
",p,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/CreateReviewActionFromAttachment.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/CreateReviewActionFromAttachment.java
index d9265032..81c8bf28 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/CreateReviewActionFromAttachment.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/CreateReviewActionFromAttachment.java
@@ -39,6 +39,12 @@
 import org.eclipse.mylyn.tasks.ui.TasksUi;
 import org.eclipse.ui.IActionDelegate;
 
+/**
+ * 
+ * @author mattk
+ * 
+ */
+@SuppressWarnings(""restriction"")
 public class CreateReviewActionFromAttachment extends Action implements
 		IActionDelegate {
 
@@ -53,7 +59,8 @@ public void run(IAction action) {
 			ITaskDataManager manager = TasksUi.getTaskDataManager();
 			TaskData parentTaskData = manager.getTaskData(taskAttachment
 					.getTask());
-			ITaskProperties parentTask= TaskProperties.fromTaskData(manager, parentTaskData);
+			ITaskProperties parentTask = TaskProperties.fromTaskData(manager,
+					parentTaskData);
 
 			TaskMapper initializationData = new TaskMapper(parentTaskData);
 			IReviewMapper taskMapper = ReviewsUiPlugin.getMapper();
@@ -69,12 +76,13 @@ public void run(IAction action) {
 
 			ITaskProperties taskProperties = TaskProperties.fromTaskData(
 					manager, taskData);
-			taskProperties.setSummary(""[review] "" + parentTask.getDescription());
+			taskProperties
+					.setSummary(""[review] "" + parentTask.getDescription());
 
 			String reviewer = taskRepository.getUserName();
 			taskProperties.setAssignedTo(reviewer);
 
-			initTaskProperties(taskMapper, taskProperties,parentTask);
+			initTaskProperties(taskMapper, taskProperties, parentTask);
 
 			TasksUiInternal.createAndOpenNewTask(taskData);
 		} catch (CoreException e) {
@@ -84,15 +92,13 @@ public void run(IAction action) {
 	}
 
 	private void initTaskProperties(IReviewMapper taskMapper,
-			ITaskProperties taskProperties,ITaskProperties parentTask) {
+			ITaskProperties taskProperties, ITaskProperties parentTask) {
 		ReviewScope scope = new ReviewScope();
 		for (ITaskAttachment taskAttachment : selection2) {
 			// FIXME date from task attachment
-			Attachment attachment = ReviewsUtil
-					.findAttachment(taskAttachment.getFileName(),
-							taskAttachment.getAuthor().getPersonId(),
-							taskAttachment.getCreationDate().toString(),
-							parentTask);
+			Attachment attachment = ReviewsUtil.findAttachment(taskAttachment
+					.getFileName(), taskAttachment.getAuthor().getPersonId(),
+					taskAttachment.getCreationDate().toString(), parentTask);
 			if (attachment.isPatch()) {
 				scope.addScope(new PatchScopeItem(attachment));
 			} else {
@@ -127,5 +133,4 @@ public void selectionChanged(IAction action, ISelection selection) {
 			}
 		}
 	}
-
 }
diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/editors/ReviewTaskEditorPage.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/editors/ReviewTaskEditorPage.java
index a7b674ca..71f035d5 100644
--- a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/editors/ReviewTaskEditorPage.java
+++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/editors/ReviewTaskEditorPage.java
@@ -40,6 +40,7 @@
 /*
  * @author Kilian Matt
  */
+@SuppressWarnings(""restriction"")
 public class ReviewTaskEditorPage extends AbstractTaskEditorPage {
 	private ReviewScope scope;"
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, 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.
      * 

      * NOTE: This will block even if the Observable is asynchronous.
+     * 

+     * 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 observer) {
+    public void forEach(final Action1 onNext) {
         final CountDownLatch latch = new CountDownLatch(1);
+        final AtomicReference exceptionFromOnError = new AtomicReference();
+
         subscribe(new Observer() {
             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 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 onNext) {
-
-        forEach(new Observer() {
-
-            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 onNext, final Action1 onError) {
-
-        forEach(new Observer() {
-
-            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 onNext, final Action1 onError, final Action0 onComplete) {
-
-        forEach(new Observer() {
-
-            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.
      *"
84ff885f72d1ec8228407b6cdc9c09d342b5a0dc,kotlin,Constructor body generation extracted as a method- (+ migrated to Printer for convenience)--,p,https://github.com/JetBrains/intellij-community,⚠️ HTTP 404: Not Found
0578ba96dfe44b8264b74329764137084f8b62c8,apache$maven-plugins,"[MWAR-81] Request enhancement to pattern matching for packagingIncludes/packagingExcludes functionality (regular expressions?)
Submitted by: Nicolas Marcotte
Reviewed by: Dennis Lundberg
o Minor adjustments to code style
o Added a page to the site with examples
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1203638 13f79535-47bb-0310-9956-ffa450edef68
",p,https://github.com/apache/maven-plugins,"diff --git a/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java b/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
index 1d629accad..56d48e039d 100644
--- a/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
+++ b/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
@@ -75,7 +75,9 @@ public class WarMojo
     /**
      * The comma separated list of tokens to exclude from the WAR before
      * packaging. This option may be used to implement the skinny WAR use
-     * case.
+     * case. Note the you can use the Java Regular Expressions engine to 
+     * include and exclude specific pattern using the expression %regex[].
+     * Hint: read the about (?!Pattern).
      *
      * @parameter
      * @since 2.1-alpha-2
@@ -85,7 +87,9 @@ public class WarMojo
     /**
      * The comma separated list of tokens to include in the WAR before
      * packaging. By default everything is included. This option may be used
-     * to implement the skinny WAR use case.
+     * to implement the skinny WAR use case. Note the you can use the
+     * Java Regular Expressions engine to include and exclude specific pattern
+     * using the expression %regex[].
      *
      * @parameter
      * @since 2.1-beta-1
diff --git a/maven-war-plugin/src/site/apt/examples/including-excluding-files-from-war.apt.vm b/maven-war-plugin/src/site/apt/examples/including-excluding-files-from-war.apt.vm
new file mode 100644
index 0000000000..c1d832d9f6
--- /dev/null
+++ b/maven-war-plugin/src/site/apt/examples/including-excluding-files-from-war.apt.vm
@@ -0,0 +1,82 @@
+  ------
+  Including and Excluding Files From the WAR
+  ------
+  Dennis Lundberg
+  ------
+  2011-11-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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Including and Excluding Files From the WAR
+
+
+  It is possible to include or exclude certain files from the WAR file, by using the <<<\>>> and <<<\>>> configuration parameters. They each take a comma-separated list of Ant file set patterns. You can use wildcards such as <<<**>>> to indicate multiple directories and <<<*>>> to indicate an optional part of a file or directory name.
+  
+  Here is an example where we exclude all JAR files from <<>>:
+
++-----------------+
+
+  ...
+  
+    
+      
+        maven-war-plugin
+        ${project.version}
+        
+          WEB-INF/lib/*.jar
+        
+      
+    
+  
+  ...
+
++-----------------+
+
+  Sometimes even such wildcards are not enough. In these cases you can use regular expressions with the <<<%regex[]>>> syntax. Here is a real life use case in which this is used. In this example we want to exclude any commons-logging and log4j JARs, but we do not want to exclude the log4j-over-slf4j JAR. So we want to exclude <<.jar>>> but keep the <<.jar>>>.
+
++-----------------+
+
+  ...
+  
+    
+      
+        maven-war-plugin
+        ${project.version}
+        
+          
+          
+            WEB-INF/lib/commons-logging-*.jar,
+            %regex[WEB-INF/lib/log4j-(?!over-slf4j).*.jar]
+          
+        
+      
+    
+  
+  ...
+
++-----------------+
+
+  If you have more real life examples of using regular expressions, we'd like to know about them. Please file an issue in {{{../issue-tracking.html}our issue tracker}} with your configuration, so we can expand this page.
diff --git a/maven-war-plugin/src/site/apt/index.apt b/maven-war-plugin/src/site/apt/index.apt
index 61078ae81a..b51358e336 100644
--- a/maven-war-plugin/src/site/apt/index.apt
+++ b/maven-war-plugin/src/site/apt/index.apt
@@ -81,6 +81,8 @@ Maven WAR Plugin
 
  * {{{./examples/skinny-wars.html}Creating Skinny WARs}}
 
+ * {{{./examples/including-excluding-files-from-war.html}Including and Excluding Files From the WAR}}
+
  * {{{./examples/file-name-mapping.html}Using File Name Mapping}}
 
  []
diff --git a/maven-war-plugin/src/site/site.xml b/maven-war-plugin/src/site/site.xml
index f6f9aa7bfa..2244644cc9 100644
--- a/maven-war-plugin/src/site/site.xml
+++ b/maven-war-plugin/src/site/site.xml
@@ -38,6 +38,7 @@ under the License.
       
       
       
+      
       
     
   
diff --git a/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java b/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
index c53c7c3cab..f590a19236 100644
--- a/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
+++ b/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
@@ -93,6 +93,38 @@ public void testSimpleWar()
                                            new String[]{null, mojo.getWebXml().toString(), null, null, null, null} );
     }
 
+    public void testSimpleWarPackagingExcludeWithIncludesRegEx()
+        throws Exception
+    {
+        String testId = ""SimpleWarPackagingExcludeWithIncludesRegEx"";
+        MavenProject4CopyConstructor project = new MavenProject4CopyConstructor();
+        String outputDir = getTestDirectory().getAbsolutePath() + ""/"" + testId + ""-output"";
+        File webAppDirectory = new File( getTestDirectory(), testId );
+        WarArtifact4CCStub warArtifact = new WarArtifact4CCStub( getBasedir() );
+        String warName = ""simple"";
+        File webAppSource = createWebAppSource( testId );
+        File classesDir = createClassesDir( testId, true );
+        File xmlSource = createXMLConfigDir( testId, new String[]{""web.xml""} );
+
+        project.setArtifact( warArtifact );
+        this.configureMojo( mojo, new LinkedList(), classesDir, webAppSource, webAppDirectory, project );
+        setVariableValueToObject( mojo, ""outputDirectory"", outputDir );
+        setVariableValueToObject( mojo, ""warName"", warName );
+        mojo.setWebXml( new File( xmlSource, ""web.xml"" ) );
+        setVariableValueToObject( mojo,""packagingIncludes"",""%regex[(.(?!exile))+]"" );
+       
+       
+        mojo.execute();
+
+        //validate jar file
+        File expectedJarFile = new File( outputDir, ""simple.war"" );
+        assertJarContent( expectedJarFile, new String[]{""META-INF/MANIFEST.MF"", ""WEB-INF/web.xml"", ""pansit.jsp"",
+            ""META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml"",
+            ""META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties""},
+                                           new String[]{null, mojo.getWebXml().toString(), null, null, null, },
+                                           new String[]{""org/web/app/last-exile.jsp""} );
+    }
+
     public void testClassifier()
         throws Exception
     {
@@ -383,6 +415,12 @@ public void testAttachClassesWithCustomClassifier()
 
     protected Map assertJarContent( final File expectedJarFile, final String[] files, final String[] filesContent )
         throws IOException
+    {
+        return assertJarContent( expectedJarFile, files, filesContent, null );
+    }
+
+    protected Map assertJarContent( final File expectedJarFile, final String[] files, final String[] filesContent, final String[] mustNotBeInJar )
+        throws IOException
     {
         // Sanity check
         assertEquals( ""Could not test, files and filesContent lenght does not match"", files.length,
@@ -404,6 +442,7 @@ protected Map assertJarContent( final File expectedJarFile, final String[] files
         for ( int i = 0; i < files.length; i++ )
         {
             String file = files[i];
+
             assertTrue( ""File["" + file + ""] not found in archive"", jarContent.containsKey( file ) );
             if ( filesContent[i] != null )
             {
@@ -411,6 +450,16 @@ protected Map assertJarContent( final File expectedJarFile, final String[] files
                               IOUtil.toString( jarFile.getInputStream( (ZipEntry) jarContent.get( file ) ) ) );
             }
         }
+        if( mustNotBeInJar!=null )
+        {         
+            for ( int i = 0; i < mustNotBeInJar.length; i++ )
+            {
+                String file = mustNotBeInJar[i];
+
+                assertFalse( ""File["" + file + ""]  found in archive"", jarContent.containsKey( file ) );
+
+            }
+        }
         return jarContent;
     }"
e4e85d3facf1633ea6a058d186dfbcf75f3e3a07,Delta Spike,"DELTASPIKE-315 provide common EntityManagerFactoryProducer
",a,https://github.com/apache/deltaspike,"diff --git a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/test/jpa/api/entitymanager/PersistenceConfigurationProvider.java b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/test/jpa/api/entitymanager/PersistenceConfigurationProvider.java
new file mode 100644
index 000000000..ca59d9bc0
--- /dev/null
+++ b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/test/jpa/api/entitymanager/PersistenceConfigurationProvider.java
@@ -0,0 +1,39 @@
+/*
+ * 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.jpa.api.entitymanager;
+
+import java.util.Properties;
+
+/**
+ * Provide the configuration for the EntityManagerFactory
+ * which gets produced with a given {@link PersistenceUnitName}.
+ *
+ * By default we provide a configuration which con be configured
+ * differently depending on the -DdatabaseVendor and the
+ * {@link org.apache.deltaspike.core.api.projectstage.ProjectStage}
+ */
+public interface PersistenceConfigurationProvider
+{
+
+    /**
+     * @param persistenceUnitName the name of the persistence unit in persistence.xml
+     * @return the additional Properties from the configuration.
+     */
+    Properties getEntityManagerFactoryConfiguration(String persistenceUnitName);
+}
diff --git a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/test/jpa/api/entitymanager/PersistenceUnitName.java b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/test/jpa/api/entitymanager/PersistenceUnitName.java
new file mode 100644
index 000000000..45e94581f
--- /dev/null
+++ b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/test/jpa/api/entitymanager/PersistenceUnitName.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.test.jpa.api.entitymanager;
+
+import javax.enterprise.util.Nonbinding;
+import javax.inject.Qualifier;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+
+/**
+ * The name of the PersistenceUnit to get picked up by the
+ * EntityManagerFactoryProducer.
+ */
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(value= RetentionPolicy.RUNTIME)
+@Documented
+@Qualifier
+public @interface PersistenceUnitName
+{
+    /**
+     * @return the name of the persistence unit.
+     */
+    @Nonbinding
+    String value();
+}
diff --git a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerFactoryProducer.java b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerFactoryProducer.java
new file mode 100644
index 000000000..05129f3a5
--- /dev/null
+++ b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerFactoryProducer.java
@@ -0,0 +1,67 @@
+/*
+ * 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.jpa.impl.entitymanager;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import java.util.Properties;
+import java.util.logging.Logger;
+
+import org.apache.deltaspike.test.jpa.api.entitymanager.PersistenceConfigurationProvider;
+import org.apache.deltaspike.test.jpa.api.entitymanager.PersistenceUnitName;
+
+
+/**
+ *  TODO
+ */
+public class EntityManagerFactoryProducer
+{
+    private static final Logger LOG = Logger.getLogger(EntityManagerFactoryProducer.class.getName());
+
+
+    private @Inject PersistenceConfigurationProvider persistenceConfigurationProvider;
+
+
+    @Produces
+    @Dependent
+    @PersistenceUnitName(""any"") // the value is nonbinding, thus this is just a dummy parameter here
+    public EntityManagerFactory createEntityManagerFactoryForUnit(InjectionPoint injectionPoint)
+    {
+        PersistenceUnitName unitNameAnnotation = injectionPoint.getAnnotated().getAnnotation(PersistenceUnitName.class);
+
+        if (unitNameAnnotation == null)
+        {
+            LOG.warning(""@PersisteneUnitName annotation could not be found at EntityManagerFactory injection point!"");
+
+            return null;
+        }
+
+        String unitName = unitNameAnnotation.value();
+
+        Properties properties = persistenceConfigurationProvider.getEntityManagerFactoryConfiguration(unitName);
+
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory(unitName, properties);
+
+        return emf;
+    }
+}
diff --git a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/PersistenceConfigurationProviderImpl.java b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/PersistenceConfigurationProviderImpl.java
new file mode 100644
index 000000000..1271a12b8
--- /dev/null
+++ b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/PersistenceConfigurationProviderImpl.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.deltaspike.jpa.impl.entitymanager;
+
+import javax.enterprise.context.ApplicationScoped;
+
+
+import java.util.Properties;
+
+import org.apache.deltaspike.test.jpa.api.entitymanager.PersistenceConfigurationProvider;
+
+/**
+ * Default implementation of the PersistenceConfigurationProvider
+ */
+@ApplicationScoped
+public class PersistenceConfigurationProviderImpl implements PersistenceConfigurationProvider
+{
+    @Override
+    public Properties getEntityManagerFactoryConfiguration(String persistenceUnitName)
+    {
+        Properties unitProperties = new Properties();
+
+        //X TODO fill properties
+
+        return unitProperties;
+    }
+}
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/EntityManagerFactoryProducerTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/EntityManagerFactoryProducerTest.java
new file mode 100644
index 000000000..62b8d032c
--- /dev/null
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/EntityManagerFactoryProducerTest.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.deltaspike.test.jpa.api.entitymanager;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.spi.PersistenceProviderResolverHolder;
+
+import org.apache.deltaspike.test.category.SeCategory;
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
+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.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+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;
+
+@RunWith(Arquillian.class)
+@Category(SeCategory.class)
+public class EntityManagerFactoryProducerTest
+{
+
+    @Deployment
+    public static WebArchive deploy()
+    {
+        // set the dummy PersistenceProviderResolver which creates our DummyEntityManagerFactory
+        PersistenceProviderResolverHolder.setPersistenceProviderResolver(new TestPersistenceProviderResolver());
+
+        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, ""unitDefinitionTest.jar"")
+                .addPackage(ArchiveUtils.SHARED_PACKAGE)
+                .addPackage(EntityManagerFactoryProducerTest.class.getPackage().getName())
+                .addAsManifestResource(EmptyAsset.INSTANCE, ""beans.xml"")
+                .addAsResource(new StringAsset(TestPersistenceProviderResolver.class.getName()),
+                        ""META-INF/services/javax.persistence.spi.PersistenceProviderResolver"");
+
+        return ShrinkWrap.create(WebArchive.class)
+                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
+                .addAsLibraries(testJar)
+                .addAsWebInfResource(ArchiveUtils.getBeansXml(), ""beans.xml"");
+    }
+
+
+    @Inject
+    @SampleDb
+    private EntityManager entityManager;
+
+    @Test
+    public void testUnitDefinitionQualifier() throws Exception
+    {
+        Assert.assertNotNull(entityManager);
+        Assert.assertNotNull(entityManager.getDelegate());
+
+        Assert.assertTrue(entityManager.getDelegate() instanceof TestEntityManager);
+        TestEntityManager tem = (TestEntityManager) entityManager.getDelegate();
+        Assert.assertEquals(""testPersistenceUnit"", tem.getUnitName());
+    }
+}
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/SampleDb.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/SampleDb.java
new file mode 100644
index 000000000..6c57195e3
--- /dev/null
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/SampleDb.java
@@ -0,0 +1,40 @@
+/*
+ * 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.jpa.api.entitymanager;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+/**
+ * Sample Database Qualifier
+ */
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(value= RUNTIME)
+@Qualifier
+public @interface SampleDb
+{
+}
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/SampleEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/SampleEntityManagerProducer.java
new file mode 100644
index 000000000..238c049a4
--- /dev/null
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/SampleEntityManagerProducer.java
@@ -0,0 +1,52 @@
+/*
+ * 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.jpa.api.entitymanager;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+/**
+ * Sample producer for a @SampleDb EntityManager.
+ */
+@ApplicationScoped
+@SuppressWarnings(""unused"")
+public class SampleEntityManagerProducer
+{
+    @Inject
+    @PersistenceUnitName(""testPersistenceUnit"")
+    private EntityManagerFactory emf;
+
+    @Produces
+    @RequestScoped
+    @SampleDb
+    public EntityManager createEntityManager()
+    {
+        return emf.createEntityManager();
+    }
+
+    public void closeEm(@Disposes @SampleDb EntityManager em)
+    {
+        em.close();
+    }
+}
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/TestPersistenceProviderResolver.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/TestPersistenceProviderResolver.java
new file mode 100644
index 000000000..acd6a651f
--- /dev/null
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/TestPersistenceProviderResolver.java
@@ -0,0 +1,159 @@
+/*
+ * 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.jpa.api.entitymanager;
+
+import javax.enterprise.inject.Typed;
+import javax.persistence.Cache;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceUnitUtil;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.metamodel.Metamodel;
+import javax.persistence.spi.PersistenceProvider;
+import javax.persistence.spi.PersistenceProviderResolver;
+import javax.persistence.spi.PersistenceUnitInfo;
+import javax.persistence.spi.ProviderUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
+
+/**
+ * PersistenceProviderResolver for dummy PersistenceProviders.
+ */
+@Typed()
+public class TestPersistenceProviderResolver implements PersistenceProviderResolver
+{
+    private List persistenceProviders;
+
+    public TestPersistenceProviderResolver()
+    {
+        this.persistenceProviders = new ArrayList();
+        this.persistenceProviders.add(new DummyPersistenceProvider());
+    }
+
+    @Override
+    public void clearCachedProviders()
+    {
+    }
+
+    @Override
+    public List getPersistenceProviders()
+    {
+        return persistenceProviders;
+    }
+
+
+    @Typed()
+    public static class DummyPersistenceProvider implements PersistenceProvider
+    {
+        @Override
+        public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map map)
+        {
+            return new DummyEntityManagerFactory();
+        }
+
+        @Override
+        public EntityManagerFactory createEntityManagerFactory(String emName, Map map)
+        {
+            return new DummyEntityManagerFactory(emName, map);
+        }
+
+        @Override
+        public ProviderUtil getProviderUtil()
+        {
+            return null;  
+        }
+    }
+
+    @Typed()
+    public static class DummyEntityManagerFactory implements EntityManagerFactory
+    {
+        private final String emName;
+        private final Map map;
+
+        public DummyEntityManagerFactory()
+        {
+            this.emName = null;
+            this.map = null;
+
+        }
+
+        public DummyEntityManagerFactory(String emName, Map map)
+        {
+            this.emName = emName;
+            this.map = map;
+        }
+
+
+        @Override
+        public void close()
+        {
+        }
+
+        @Override
+        public EntityManager createEntityManager()
+        {
+            return new TestEntityManager(emName);
+        }
+
+        @Override
+        public EntityManager createEntityManager(Map map)
+        {
+            return new TestEntityManager(emName);
+        }
+
+        @Override
+        public CriteriaBuilder getCriteriaBuilder()
+        {
+            return null;  
+        }
+
+        @Override
+        public Metamodel getMetamodel()
+        {
+            return null;  
+        }
+
+        @Override
+        public boolean isOpen()
+        {
+            return false;  
+        }
+
+        @Override
+        public Map getProperties()
+        {
+            return map;
+        }
+
+        @Override
+        public Cache getCache()
+        {
+            return null;  
+        }
+
+        @Override
+        public PersistenceUnitUtil getPersistenceUnitUtil()
+        {
+            return null;  
+        }
+    }
+}
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
index face0a853..44654f592 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
@@ -38,6 +38,21 @@ public class TestEntityManager implements EntityManager
 
     private boolean open = true;
     private boolean flushed = false;
+    private String unitName = null;
+
+    public TestEntityManager()
+    {
+    }
+
+    public TestEntityManager(String name)
+    {
+        this.unitName = name;
+    }
+
+    public String getUnitName()
+    {
+        return unitName;
+    }
 
     @Override
     public void persist(Object entity)
@@ -240,7 +255,7 @@ public  T unwrap(Class cls)
     @Override
     public Object getDelegate()
     {
-        throw new IllegalStateException(""not implemented"");
+        return this;
     }
 
     @Override"
296212eab186b860fd9494db9ed238b341fc2975,kotlin,Merge two JetTypeMapper-mapToCallableMethod- methods--,p,https://github.com/JetBrains/intellij-community,⚠️ HTTP 404: Not Found
ce7f1b2f0c49c2c536f16595888caaf893108ee0,Delta Spike,"add small helper script to quickly verify most important scenarios
",p,https://github.com/apache/deltaspike,"diff --git a/deltaspike/buildall.sh b/deltaspike/buildall.sh
new file mode 100755
index 000000000..840fefbfa
--- /dev/null
+++ b/deltaspike/buildall.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+#####################################################################################
+# 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.
+#####################################################################################
+#
+# this is a small helper script for building a few container constellations locally
+# you can easily check the output via $> tail mvn-*.log | less
+#
+#####################################################################################
+
+rm mvn-*log
+mvn clean install -POWB -Dowb.version=1.1.8 | tee mvn-owb1_1_8.log
+mvn clean install -POWB -Dowb.version=1.2.1-SNAPSHOT -Dopenejb.owb.version=1.1.8 | tee mvn-owb1_2_1.log
+mvn clean install -PWeld -Dweld.version=1.1.10.Final | tee mvn-weld1_1_10.log
+mvn clean install  -Ptomee-build-managed -Dtomee.version=1.6.0-SNAPSHOT -Dopenejb.version=4.6.0-SNAPSHOT -Dopenejb.owb.version=1.2.1-SNAPSHOT | tee mvn-tomee_1_6_0.log
+mvn clean install  -Ptomee-build-managed -Dtomee.version=1.5.2 -Dopenejb.version=4.5.2 -Dopenejb.owb.version=1.1.8 | tee mvn-tomee_1_5_2.log
+mvn clean install -Pjbossas-build-managed-7 | tee mvn-jbossas_7.log
+"
362e94ffa7bc065e0a88f6f999c9c491b06e8946,Vala,"girparser: use identifier prefix from GIR when appropriate

Fixes bug 731066
",a,https://github.com/GNOME/vala/,⚠️ Could not parse repo info
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 @@
       org.apache.camel
       camel-spring
     
-
-    
-      org.springframework
-      spring
-    
-
-    
-      commons-logging
-      commons-logging-api
-    
-
     
       javax.persistence
       persistence-api
       1.0
     
 
+    
     
       org.apache.camel
       camel-core
       test-jar
-      true
       test
     
     
       org.apache.camel
       camel-spring
       test-jar
-      true
+      test
+    
+    
+      org.apache.camel
+      camel-juel
+      test
+    
+    
+      commons-logging
+      commons-logging
+      test
+    
+    
+      log4j
+      log4j
       test
     
     
 
-    
-      mysql
-      mysql-connector-java
-      5.0.5
-      test
-    
 
     
       junit
@@ -110,6 +107,7 @@
         
           false
           true
+          pertest
           
             **/*Test.*
           
@@ -163,6 +161,41 @@
         
       
     
+    
+      derby
+      
+        
+          
+            ${basedir}/src/test/profiles/derby
+          
+          
+            ${basedir}/src/test/resources
+          
+        
+      
+      
+        
+          org.hibernate
+          hibernate-entitymanager
+          test
+        
+        
+          org.hibernate
+          hibernate
+          test
+        
+        
+          org.apache.derby
+          derby
+          test
+        
+        
+          org.apache.geronimo.specs
+          geronimo-jta_1.0.1B_spec
+          test
+        
+      
+    
 
     
       mysql
@@ -188,8 +221,9 @@
           test
         
         
-          hsqldb
-          hsqldb
+          mysql
+          mysql-connector-java
+          5.0.5
           test
         
         
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 activityStates = new HashSet();
     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 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 BAM which a derived
  * class would do the actual persistence such as the {@link JpaBamProcessor}
- * 
+ *
  * @version $Revision: $
  */
 public abstract class BamProcessorSupport implements Processor {
@@ -42,6 +44,15 @@ public abstract class BamProcessorSupport implements Processor {
     private Class entityType;
     private Expression 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 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)argumentType;
+                    this.entityType = (Class) 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 extends BamProcessorSupport {
+    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 correlationKeyExpression, ActivityRules activityRules, Class 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 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 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"", ""world!"");
 
-        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"", ""A"");
+        template.sendBody(""direct:a"", ""B"");
+        template.sendBody(""direct:a"", ""C"");
+    }
+
+    protected void sendBMessages() {
+        template.sendBody(""direct:b"", ""A"");
+        template.sendBody(""direct:b"", ""C"");
+    }
+}
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 @@
+
+
+
+
+  
+    org.apache.camel.bam.model.ActivityDefinition
+    org.apache.camel.bam.model.ActivityState
+    org.apache.camel.bam.model.ProcessDefinition
+    org.apache.camel.bam.model.ProcessInstance
+
+    
+      
+      
+      
+      
+    
+
+  
+
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 @@
       
       
       
+
+      
+      
+      
+
       
     
 
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 @@
       
       
       
+
+      
+
     
 
   "
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());"
17fdbe6c71b97305d5c1d8dd78a6c7b249c9e481,tomakehurst$wiremock,"More flexibility with request body matching
",p,https://github.com/wiremock/wiremock,"diff --git a/docs-v2/_docs/record-playback.md b/docs-v2/_docs/record-playback.md
index 4f701d4f25..42ae79074c 100644
--- a/docs-v2/_docs/record-playback.md
+++ b/docs-v2/_docs/record-playback.md
@@ -191,6 +191,11 @@ POST /__admin/recordings/start
       ""caseInsensitive"" : true
     }
   },
+  ""requestBodyPattern"" : {
+    ""matcher"" : ""equalToJson"",
+    ""ignoreArrayOrder"" : false,
+    ""ignoreExtraElements"" : true
+  },
   ""extractBodyCriteria"" : {
     ""textSizeThreshold"" : ""2048"",
     ""binarySizeThreshold"" : ""10240""
@@ -200,10 +205,6 @@ POST /__admin/recordings/start
   ""transformers"" : [ ""modify-response-header"" ],
   ""transformerParameters"" : {
     ""headerValue"" : ""123""
-  },
-  ""jsonMatchingFlags"" : {
-    ""ignoreArrayOrder"" : false,
-    ""ignoreExtraElements"" : true
   }
 }
 ```
@@ -245,6 +246,11 @@ POST /__admin/recordings/snapshot
       ""caseInsensitive"" : true
     }
   },
+  ""requestBodyPattern"" : {
+    ""matcher"" : ""equalToJson"",
+    ""ignoreArrayOrder"" : false,
+    ""ignoreExtraElements"" : true
+  },
   ""extractBodyCriteria"" : {
     ""textSizeThreshold"" : ""2 kb"",
     ""binarySizeThreshold"" : ""1 Mb""
@@ -255,10 +261,6 @@ POST /__admin/recordings/snapshot
   ""transformers"" : [ ""modify-response-header"" ],
   ""transformerParameters"" : {
     ""headerValue"" : ""123""
-  },
-  ""jsonMatchingFlags"" : {
-    ""ignoreArrayOrder"" : false,
-    ""ignoreExtraElements"" : true
   }
 }
 ```
@@ -355,20 +357,26 @@ As with other types of WireMock extension, parameters can be supplied. The exact
 ```
 
 
-### JSON matching flags
+### Request body matching
 
-When a stub is recorded from a request with a JSON body, its body match operator will be set to `equalToJson` (rather than `equalTo`, the default).
-This operator has two optional parameters, indicating whether array order should be ignored, and whether extra elements should be ignored.
+By default, the body match operator for a recorded stub is based on the `Content-Type` header of the request. For `*/json` MIME types, the operator will be `equalToJson` with both the `ignoreArrayOrder` and `ignoreExtraElements` options set to `true`. For `*/xml` MIME types, it will use `equalToXml`. Otherwise, it will use `equalTo` with the `caseInsensitive` option set to `false`. 
+ 
+ This behavior can be customized via the `requestBodyPattern` parameter, which accepts a `matcher` (either `equalTo`, `equalToJson`, `equalToXml`, or `auto`) and any relevant matcher options (`ignoreArrayOrder`, `ignoreExtraElements`, or `caseInsensitive`). For example, here's how to preserve the default behavior, but set `ignoreArrayOrder` to `false` when `equalToJson` is used:
 
 ```json
-""jsonMatchingFlags"" : {
-    ""ignoreArrayOrder"" : false,
-    ""ignoreExtraElements"" : true
+""requestBodyPattern"" : {
+    ""matcher"": ""auto"",
+    ""ignoreArrayOrder"" : false
   }
 ```
 
-If not specified, both of these will default to `false`. 
-
+If you want to always match request bodies with `equalTo` case-insensitively, regardless of the MIME type, use:
+```json
+""requestBodyPattern"" : {
+    ""matcher"": ""equalTo"",
+    ""caseInsenstivie"" : true
+  }
+```
 
 > **note**
 >
diff --git a/src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpec.java b/src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpec.java
index dc834bac28..655f96cf6e 100644
--- a/src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpec.java
+++ b/src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpec.java
@@ -34,6 +34,8 @@ public class RecordSpec {
     private final ProxiedServeEventFilters filters;
     // Headers from the request to include in the stub mapping, if they match the corresponding matcher
     private final Map captureHeaders;
+    // Factory for the StringValuePattern that will be used to match request bodies
+    private final RequestBodyPatternFactory requestBodyPatternFactory;
     // Criteria for extracting body from responses
     private final ResponseDefinitionBodyMatcher extractBodyCriteria;
     // How to format StubMappings in the response body
@@ -46,30 +48,29 @@ public class RecordSpec {
     private final List transformers;
     // Parameters for stub mapping transformers
     private final Parameters transformerParameters;
-    private final JsonMatchingFlags jsonMatchingFlags;
 
     @JsonCreator
     public RecordSpec(
         @JsonProperty(""targetBaseUrl"") String targetBaseUrl,
         @JsonProperty(""filters"") ProxiedServeEventFilters filters,
         @JsonProperty(""captureHeaders"") Map captureHeaders,
+        @JsonProperty(""requestBodyPattern"") RequestBodyPatternFactory requestBodyPatternFactory,
         @JsonProperty(""extractBodyCriteria"") ResponseDefinitionBodyMatcher extractBodyCriteria,
         @JsonProperty(""outputFormat"") SnapshotOutputFormatter outputFormat,
         @JsonProperty(""persist"") Boolean persist,
         @JsonProperty(""repeatsAsScenarios"") Boolean repeatsAsScenarios,
         @JsonProperty(""transformers"") List transformers,
-        @JsonProperty(""transformerParameters"") Parameters transformerParameters,
-        @JsonProperty(""jsonMatchingFlags"") JsonMatchingFlags jsonMatchingFlags) {
+        @JsonProperty(""transformerParameters"") Parameters transformerParameters) {
         this.targetBaseUrl = targetBaseUrl;
         this.filters = filters == null ? new ProxiedServeEventFilters() : filters;
         this.captureHeaders = captureHeaders;
+        this.requestBodyPatternFactory = requestBodyPatternFactory == null ? RequestBodyAutomaticPatternFactory.DEFAULTS : requestBodyPatternFactory;
         this.extractBodyCriteria = extractBodyCriteria;
         this.outputFormat = outputFormat == null ? SnapshotOutputFormatter.FULL : outputFormat;
         this.persist = persist == null ? true : persist;
         this.repeatsAsScenarios = repeatsAsScenarios;
         this.transformers = transformers;
         this.transformerParameters = transformerParameters;
-        this.jsonMatchingFlags = jsonMatchingFlags;
     }
 
     private RecordSpec() {
@@ -79,7 +80,7 @@ private RecordSpec() {
     public static final RecordSpec DEFAULTS = new RecordSpec();
 
     public static RecordSpec forBaseUrl(String targetBaseUrl) {
-        return new RecordSpec(targetBaseUrl, null, null, null, null, null, true, null, null, null);
+        return new RecordSpec(targetBaseUrl, null, null, null, null, null, null, true, null, null);
     }
 
     public String getTargetBaseUrl() {
@@ -110,7 +111,5 @@ public Boolean getRepeatsAsScenarios() {
 
     public ResponseDefinitionBodyMatcher getExtractBodyCriteria() { return extractBodyCriteria; }
 
-    public JsonMatchingFlags getJsonMatchingFlags() {
-        return jsonMatchingFlags;
-    }
+    public RequestBodyPatternFactory getRequestBodyPatternFactory() { return requestBodyPatternFactory; }
 }
diff --git a/src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpecBuilder.java b/src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpecBuilder.java
index 4fea93623a..862056c43f 100644
--- a/src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpecBuilder.java
+++ b/src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpecBuilder.java
@@ -16,8 +16,7 @@
 package com.github.tomakehurst.wiremock.recording;
 
 import com.github.tomakehurst.wiremock.extension.Parameters;
-import com.github.tomakehurst.wiremock.matching.RequestPattern;
-import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
+import com.github.tomakehurst.wiremock.matching.*;
 
 import java.util.List;
 import java.util.Map;
@@ -32,13 +31,13 @@ public class RecordSpecBuilder {
     private RequestPatternBuilder filterRequestPatternBuilder;
     private List filterIds;
     private Map headers = newLinkedHashMap();
+    private RequestBodyPatternFactory requestBodyPatternFactory;
     private long maxTextBodySize = ResponseDefinitionBodyMatcher.DEFAULT_MAX_TEXT_SIZE;
     private long maxBinaryBodySize = ResponseDefinitionBodyMatcher.DEFAULT_MAX_BINARY_SIZE;
     private boolean persistentStubs = true;
     private boolean repeatsAsScenarios = true;
     private List transformerNames;
     private Parameters transformerParameters;
-    private JsonMatchingFlags jsonMatchingFlags;
 
     public RecordSpecBuilder forTarget(String targetBaseUrl) {
         this.targetBaseUrl = targetBaseUrl;
@@ -98,6 +97,26 @@ public RecordSpecBuilder captureHeader(String key, Boolean caseInsensitive) {
         return this;
     }
 
+    public RecordSpecBuilder requestBodyAutoPattern(boolean ignoreArrayOrder, boolean ignoreExtraElements, boolean caseInsensitive) {
+        this.requestBodyPatternFactory = new RequestBodyAutomaticPatternFactory(ignoreArrayOrder, ignoreExtraElements, caseInsensitive);
+        return this;
+    }
+
+    public RecordSpecBuilder requestBodyEqualToJsonPattern(boolean ignoreArrayOrder, boolean ignoreExtraElements) {
+        this.requestBodyPatternFactory = new RequestBodyEqualToJsonPatternFactory(ignoreArrayOrder, ignoreExtraElements);
+        return this;
+    }
+
+    public RecordSpecBuilder requestBodyEqualToXmlPattern() {
+        this.requestBodyPatternFactory = new RequestBodyEqualToXmlPatternFactory();
+        return this;
+    }
+
+    public RecordSpecBuilder requestBodyEqualToPattern(boolean caseInsensitive) {
+        this.requestBodyPatternFactory = new RequestBodyEqualToPatternFactory(caseInsensitive);
+        return this;
+    }
+
     public RecordSpec build() {
         RequestPattern filterRequestPattern = filterRequestPatternBuilder != null ?
             filterRequestPatternBuilder.build() :
@@ -112,17 +131,12 @@ public RecordSpec build() {
             targetBaseUrl,
             filters,
             headers.isEmpty() ? null : headers,
+            requestBodyPatternFactory,
             responseDefinitionBodyMatcher,
             SnapshotOutputFormatter.FULL,
             persistentStubs,
             repeatsAsScenarios,
             transformerNames,
-            transformerParameters,
-            jsonMatchingFlags);
-    }
-
-    public RecordSpecBuilder jsonBodyMatchFlags(boolean ignoreArrayOrder, boolean ignoreExtraElements) {
-        this.jsonMatchingFlags = new JsonMatchingFlags(ignoreArrayOrder, ignoreExtraElements);
-        return this;
+            transformerParameters);
     }
 }
diff --git a/src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java b/src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java
index a80b967ced..9bbe627f16 100644
--- a/src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java
+++ b/src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java
@@ -106,7 +106,7 @@ public SnapshotRecordResult takeSnapshot(List serveEvents, RecordSpe
         final List stubMappings = serveEventsToStubMappings(
             Lists.reverse(serveEvents),
             recordSpec.getFilters(),
-            new SnapshotStubMappingGenerator(recordSpec.getCaptureHeaders(), recordSpec.getJsonMatchingFlags()),
+            new SnapshotStubMappingGenerator(recordSpec.getCaptureHeaders(), recordSpec.getRequestBodyPatternFactory()),
             getStubMappingPostProcessor(admin.getOptions(), recordSpec)
         );
 
diff --git a/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactory.java b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactory.java
new file mode 100644
index 0000000000..f0f3c3bc50
--- /dev/null
+++ b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactory.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2011 Thomas Akehurst
+ *
+ * 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.github.tomakehurst.wiremock.recording;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.tomakehurst.wiremock.http.ContentTypeHeader;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;
+import com.github.tomakehurst.wiremock.matching.EqualToPattern;
+import com.github.tomakehurst.wiremock.matching.EqualToXmlPattern;
+import com.github.tomakehurst.wiremock.matching.StringValuePattern;
+
+public class RequestBodyAutomaticPatternFactory implements RequestBodyPatternFactory {
+
+    private final Boolean caseInsensitive;
+    private final Boolean ignoreArrayOrder;
+    private final Boolean ignoreExtraElements;
+
+    @JsonCreator
+    public RequestBodyAutomaticPatternFactory(
+        @JsonProperty(""ignoreArrayOrder"") Boolean ignoreArrayOrder,
+        @JsonProperty(""ignoreExtraElements"") Boolean ignoreExtraElements,
+        @JsonProperty(""caseInsensitive"") Boolean caseInsensitive) {
+        this.ignoreArrayOrder = ignoreArrayOrder == null ? true : ignoreArrayOrder;
+        this.ignoreExtraElements = ignoreExtraElements == null ? true : ignoreExtraElements;
+        this.caseInsensitive = caseInsensitive == null ? false : caseInsensitive;
+    }
+
+    private RequestBodyAutomaticPatternFactory() {
+        this(null, null, null);
+    }
+
+    public static final RequestBodyAutomaticPatternFactory DEFAULTS = new RequestBodyAutomaticPatternFactory();
+
+    public Boolean isIgnoreArrayOrder() {
+        return ignoreArrayOrder;
+    }
+
+    public Boolean isIgnoreExtraElements() {
+        return ignoreExtraElements;
+    }
+
+    public Boolean isCaseInsensitive() {
+        return caseInsensitive;
+    }
+
+    /**
+     * If request body was JSON or XML, use ""equalToJson"" or ""equalToXml"" (respectively) in the RequestPattern so it's
+     * easier to read. Otherwise, just use ""equalTo""
+     */
+    @Override
+    public StringValuePattern forRequest(Request request) {
+        final ContentTypeHeader contentType = request.getHeaders().getContentTypeHeader();
+        if (contentType.mimeTypePart() != null) {
+            if (contentType.mimeTypePart().contains(""json"")) {
+                return new EqualToJsonPattern(request.getBodyAsString(), ignoreArrayOrder, ignoreExtraElements);
+            } else if (contentType.mimeTypePart().contains(""xml"")) {
+                return new EqualToXmlPattern(request.getBodyAsString());
+            }
+        }
+
+        return new EqualToPattern(request.getBodyAsString(), caseInsensitive);
+    }
+}
diff --git a/src/main/java/com/github/tomakehurst/wiremock/recording/JsonMatchingFlags.java b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToJsonPatternFactory.java
similarity index 62%
rename from src/main/java/com/github/tomakehurst/wiremock/recording/JsonMatchingFlags.java
rename to src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToJsonPatternFactory.java
index 2a7f3c69fe..87b54fc90c 100644
--- a/src/main/java/com/github/tomakehurst/wiremock/recording/JsonMatchingFlags.java
+++ b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToJsonPatternFactory.java
@@ -15,15 +15,20 @@
  */
 package com.github.tomakehurst.wiremock.recording;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;
 
-public class JsonMatchingFlags {
+public class RequestBodyEqualToJsonPatternFactory implements RequestBodyPatternFactory {
 
     private final Boolean ignoreArrayOrder;
     private final Boolean ignoreExtraElements;
 
-    public JsonMatchingFlags(@JsonProperty(""ignoreArrayOrder"") Boolean ignoreArrayOrder,
-                             @JsonProperty(""ignoreExtraElements"") Boolean ignoreExtraElements) {
+    @JsonCreator
+    public RequestBodyEqualToJsonPatternFactory(
+        @JsonProperty(""ignoreArrayOrder"") Boolean ignoreArrayOrder,
+        @JsonProperty(""ignoreExtraElements"") Boolean ignoreExtraElements) {
         this.ignoreArrayOrder = ignoreArrayOrder;
         this.ignoreExtraElements = ignoreExtraElements;
     }
@@ -35,4 +40,9 @@ public Boolean isIgnoreArrayOrder() {
     public Boolean isIgnoreExtraElements() {
         return ignoreExtraElements;
     }
+
+    @Override
+    public EqualToJsonPattern forRequest(Request request) {
+        return new EqualToJsonPattern(request.getBodyAsString(), ignoreArrayOrder, ignoreExtraElements);
+    }
 }
diff --git a/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToPatternFactory.java b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToPatternFactory.java
new file mode 100644
index 0000000000..f6c7b9dad0
--- /dev/null
+++ b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToPatternFactory.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2011 Thomas Akehurst
+ *
+ * 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.github.tomakehurst.wiremock.recording;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.matching.EqualToPattern;
+
+public class RequestBodyEqualToPatternFactory implements RequestBodyPatternFactory {
+
+    private final Boolean caseInsensitive;
+
+    @JsonCreator
+    public RequestBodyEqualToPatternFactory(@JsonProperty(""caseInsensitive"") Boolean caseInsensitive) {
+        this.caseInsensitive = caseInsensitive;
+    }
+
+    public Boolean isCaseInsensitive() {
+        return caseInsensitive;
+    }
+
+    @Override
+    public EqualToPattern forRequest(Request request) {
+        return new EqualToPattern(request.getBodyAsString(), caseInsensitive);
+    }
+}
diff --git a/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToXmlPatternFactory.java b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToXmlPatternFactory.java
new file mode 100644
index 0000000000..0c31cc75c7
--- /dev/null
+++ b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToXmlPatternFactory.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2011 Thomas Akehurst
+ *
+ * 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.github.tomakehurst.wiremock.recording;
+
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.matching.EqualToXmlPattern;
+
+public class RequestBodyEqualToXmlPatternFactory implements RequestBodyPatternFactory {
+
+    @Override
+    public EqualToXmlPattern forRequest(Request request) {
+        return new EqualToXmlPattern(request.getBodyAsString());
+    }
+}
diff --git a/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyPatternFactory.java b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyPatternFactory.java
new file mode 100644
index 0000000000..c2f350d292
--- /dev/null
+++ b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyPatternFactory.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2011 Thomas Akehurst
+ *
+ * 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.github.tomakehurst.wiremock.recording;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.matching.StringValuePattern;
+
+/**
+ * Factory for the StringValuePattern to use in a recorded stub mapping to match request bodies
+ */
+@JsonTypeInfo(
+    use = JsonTypeInfo.Id.NAME,
+    include = JsonTypeInfo.As.PROPERTY,
+    property = ""matcher"",
+    defaultImpl = RequestBodyAutomaticPatternFactory.class
+)
+@JsonSubTypes({
+    @JsonSubTypes.Type(value = RequestBodyAutomaticPatternFactory.class, name = ""auto""),
+    @JsonSubTypes.Type(value = RequestBodyEqualToPatternFactory.class, name = ""equalTo""),
+    @JsonSubTypes.Type(value = RequestBodyEqualToJsonPatternFactory.class, name = ""equalToJson""),
+    @JsonSubTypes.Type(value = RequestBodyEqualToXmlPatternFactory.class, name = ""equalToXml"")
+})
+public interface RequestBodyPatternFactory {
+    StringValuePattern forRequest(Request request);
+}
diff --git a/src/main/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformer.java b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformer.java
index 65c7c36afd..dd194e99b7 100644
--- a/src/main/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformer.java
+++ b/src/main/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformer.java
@@ -15,9 +15,6 @@
  */
 package com.github.tomakehurst.wiremock.recording;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.tomakehurst.wiremock.http.ContentTypeHeader;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.matching.*;
 import com.google.common.base.Function;
@@ -33,13 +30,13 @@
  */
 public class RequestPatternTransformer implements Function {
     private final Map headers;
-    private final JsonMatchingFlags jsonMatchingFlags;
+    private final RequestBodyPatternFactory bodyPatternFactory;
 
-    @JsonCreator
-    public RequestPatternTransformer(@JsonProperty(""headers"") Map headers,
-                                     @JsonProperty(""jsonMatchingFlags"") JsonMatchingFlags jsonMatchingFlags) {
+    public RequestPatternTransformer(
+        Map headers,
+        RequestBodyPatternFactory bodyPatternFactory) {
         this.headers = headers;
-        this.jsonMatchingFlags = jsonMatchingFlags;
+        this.bodyPatternFactory = bodyPatternFactory;
     }
 
     /**
@@ -62,29 +59,10 @@ public RequestPatternBuilder apply(Request request) {
         }
 
         String body = request.getBodyAsString();
-        if (body != null && !body.isEmpty()) {
-            builder.withRequestBody(valuePatternForContentType(request));
+        if (bodyPatternFactory != null && body != null && !body.isEmpty()) {
+            builder.withRequestBody(bodyPatternFactory.forRequest(request));
         }
 
         return builder;
     }
-
-    /**
-     * If request body was JSON or XML, use ""equalToJson"" or ""equalToXml"" (respectively) in the RequestPattern so it's
-     * easier to read. Otherwise, just use ""equalTo""
-     */
-    private StringValuePattern valuePatternForContentType(Request request) {
-        final ContentTypeHeader contentType = request.getHeaders().getContentTypeHeader();
-        if (contentType.mimeTypePart() != null) {
-            if (contentType.mimeTypePart().contains(""json"")) {
-                return jsonMatchingFlags == null ?
-                    equalToJson(request.getBodyAsString()) :
-                    equalToJson(request.getBodyAsString(), jsonMatchingFlags.isIgnoreArrayOrder(), jsonMatchingFlags.isIgnoreExtraElements());
-            } else if (contentType.mimeTypePart().contains(""xml"")) {
-                return equalToXml(request.getBodyAsString());
-            }
-        }
-
-        return equalTo(request.getBodyAsString());
-    }
 }
diff --git a/src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingGenerator.java b/src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingGenerator.java
index 32e9ecebad..5fb93f6715 100644
--- a/src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingGenerator.java
+++ b/src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingGenerator.java
@@ -40,9 +40,9 @@ public SnapshotStubMappingGenerator(
         this.responseTransformer = responseTransformer;
     }
 
-    public SnapshotStubMappingGenerator(Map captureHeaders, JsonMatchingFlags jsonMatchingFlags) {
+    public SnapshotStubMappingGenerator(Map captureHeaders, RequestBodyPatternFactory requestBodyPatternFactory) {
         this(
-            new RequestPatternTransformer(captureHeaders, jsonMatchingFlags),
+            new RequestPatternTransformer(captureHeaders, requestBodyPatternFactory),
             new LoggedResponseDefinitionTransformer()
         );
     }
diff --git a/src/main/resources/raml/examples/record-spec.example.json b/src/main/resources/raml/examples/record-spec.example.json
index 8fff7ed1bc..fef1992388 100644
--- a/src/main/resources/raml/examples/record-spec.example.json
+++ b/src/main/resources/raml/examples/record-spec.example.json
@@ -10,6 +10,11 @@
             ""caseInsensitive"" : true
         }
     },
+    ""requestBodyPattern"" : {
+        ""matcher"" : ""equalToJson"",
+        ""ignoreArrayOrder"" : false,
+        ""ignoreExtraElements"" : true
+    },
     ""extractBodyCriteria"" : {
         ""textSizeThreshold"" : ""2048"",
         ""binarySizeThreshold"" : ""10240""
@@ -19,9 +24,5 @@
     ""transformers"" : [ ""modify-response-header"" ],
     ""transformerParameters"" : {
         ""headerValue"" : ""123""
-    },
-    ""jsonMatchingFlags"" : {
-        ""ignoreArrayOrder"" : false,
-        ""ignoreExtraElements"" : true
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/raml/examples/snapshot-spec.example.json b/src/main/resources/raml/examples/snapshot-spec.example.json
index 45317b706f..b9a3e18fba 100644
--- a/src/main/resources/raml/examples/snapshot-spec.example.json
+++ b/src/main/resources/raml/examples/snapshot-spec.example.json
@@ -10,6 +10,11 @@
             ""caseInsensitive"" : true
         }
     },
+    ""requestBodyPattern"" : {
+        ""matcher"" : ""equalToJson"",
+        ""ignoreArrayOrder"" : false,
+        ""ignoreExtraElements"" : true
+    },
     ""extractBodyCriteria"" : {
         ""textSizeThreshold"" : ""2 kb"",
         ""binarySizeThreshold"" : ""1 Mb""
@@ -20,9 +25,5 @@
     ""transformers"" : [ ""modify-response-header"" ],
     ""transformerParameters"" : {
         ""headerValue"" : ""123""
-    },
-    ""jsonMatchingFlags"" : {
-        ""ignoreArrayOrder"" : false,
-        ""ignoreExtraElements"" : true
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/raml/schemas/record-spec.schema.json b/src/main/resources/raml/schemas/record-spec.schema.json
index 4c49d63585..e3db883663 100644
--- a/src/main/resources/raml/schemas/record-spec.schema.json
+++ b/src/main/resources/raml/schemas/record-spec.schema.json
@@ -18,6 +18,29 @@
                 }
             }
         },
+        ""requestBodyPattern"": {
+            ""type"": ""object"",
+            ""properties"": {
+                ""matcher"": {
+                    ""type"": ""string"",
+                    ""enum"": [
+                        ""equalTo"",
+                        ""equalToJson"",
+                        ""equalToXml"",
+                        ""auto""
+                    ]
+                },
+                ""ignoreArrayOrder"": {
+                    ""type"": ""boolean""
+                },
+                ""ignoreExtraElements"": {
+                    ""type"": ""boolean""
+                },
+                ""caseInsensitive"": {
+                    ""type"": ""boolean""
+                }
+            }
+        },
         ""filters"": {
             ""type"": ""object"",
             ""properties"": {
@@ -35,17 +58,6 @@
                 }
             }
         },
-        ""jsonMatchingFlags"": {
-            ""type"": ""object"",
-            ""properties"": {
-                ""ignoreArrayOrder"": {
-                    ""type"": ""boolean""
-                },
-                ""ignoreExtraElements"": {
-                    ""type"": ""boolean""
-                }
-            }
-        },
         ""persist"": {
             ""type"": ""boolean""
         },
diff --git a/src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java b/src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java
index dc3233ed89..e7c592e9c0 100644
--- a/src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java
+++ b/src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java
@@ -199,7 +199,7 @@ public void supportsInstanceClientWithSpec() {
         adminClient.startStubRecording(
             recordSpec()
                 .forTarget(targetBaseUrl)
-                .jsonBodyMatchFlags(true, true)
+                .requestBodyEqualToJsonPattern(true, true)
         );
 
         client.postJson(""/record-this-with-body"", ""{}"");
@@ -218,7 +218,7 @@ public void supportsDirectDslCallsWithSpec() {
         proxyingService.startRecording(
             recordSpec()
                 .forTarget(targetBaseUrl)
-                .jsonBodyMatchFlags(true, true)
+                .requestBodyEqualToJsonPattern(true, true)
         );
 
         client.postJson(""/record-this-with-body"", ""{}"");
diff --git a/src/test/java/com/github/tomakehurst/wiremock/SnapshotDslAcceptanceTest.java b/src/test/java/com/github/tomakehurst/wiremock/SnapshotDslAcceptanceTest.java
index 89129b6cfb..35a96d31bd 100644
--- a/src/test/java/com/github/tomakehurst/wiremock/SnapshotDslAcceptanceTest.java
+++ b/src/test/java/com/github/tomakehurst/wiremock/SnapshotDslAcceptanceTest.java
@@ -22,9 +22,7 @@
 import com.github.tomakehurst.wiremock.extension.StubMappingTransformer;
 import com.github.tomakehurst.wiremock.http.RequestMethod;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
-import com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;
-import com.github.tomakehurst.wiremock.matching.EqualToPattern;
-import com.github.tomakehurst.wiremock.matching.StringValuePattern;
+import com.github.tomakehurst.wiremock.matching.*;
 import com.github.tomakehurst.wiremock.stubbing.Scenario;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 import com.github.tomakehurst.wiremock.testsupport.WireMatchers;
@@ -106,8 +104,8 @@ public void snapshotRecordsAllLoggedRequestsWhenNoParametersPassed() throws Exce
         JSONAssert.assertEquals(""{ \""counter\"": 55 }"", bodyPattern.getExpected(), true);
 
         EqualToJsonPattern equalToJsonPattern = (EqualToJsonPattern) bodyPattern;
-        assertThat(equalToJsonPattern.isIgnoreArrayOrder(), nullValue());
-        assertThat(equalToJsonPattern.isIgnoreExtraElements(), nullValue());
+        assertThat(equalToJsonPattern.isIgnoreArrayOrder(), is(true));
+        assertThat(equalToJsonPattern.isIgnoreExtraElements(), is(true));
     }
 
     @Test
@@ -253,27 +251,64 @@ public void appliesTransformerWithParameters() {
     }
 
     @Test
-    public void supportsConfigurationOfJsonBodyMatching() {
+    public void supportsConfigurationOfAutoRequestBodyPatternFactory() {
         client.postJson(""/some-json"", ""{}"");
+        client.postWithBody(""/some-json"", """", ""application/xml"", ""utf-8"");
+        client.postWithBody(""/some-json"", ""foo"", ""application/text"", ""utf-8"");
 
-        List mappings = snapshotRecord(
-            recordSpec().jsonBodyMatchFlags(true, true)
-        );
+        List mappings = snapshotRecord(recordSpec().requestBodyAutoPattern(false, false, true));
+
+        EqualToJsonPattern jsonBodyPattern = (EqualToJsonPattern) mappings.get(0).getRequest().getBodyPatterns().get(0);
+        assertThat(jsonBodyPattern.getEqualToJson(), is(""{}""));
+        assertThat(jsonBodyPattern.isIgnoreArrayOrder(), is(false));
+        assertThat(jsonBodyPattern.isIgnoreExtraElements(), is(false));
+
+        EqualToXmlPattern xmlBodyPattern = (EqualToXmlPattern) mappings.get(1).getRequest().getBodyPatterns().get(0);
+        assertThat(xmlBodyPattern.getEqualToXml(), is(""""));
+
+        EqualToPattern textBodyPattern = (EqualToPattern) mappings.get(2).getRequest().getBodyPatterns().get(0);
+        assertThat(textBodyPattern.getEqualTo(), is(""foo""));
+        assertThat(textBodyPattern.getCaseInsensitive(), is(true));
+    }
+
+    @Test
+    public void supportsConfigurationOfRequestBodyPatternFactoryWithEqualToJsonPattern() {
+        client.postJson(""/some-json"", ""{}"");
+
+        List mappings = snapshotRecord(recordSpec().requestBodyEqualToJsonPattern(false, true));
 
         EqualToJsonPattern bodyPattern = (EqualToJsonPattern) mappings.get(0).getRequest().getBodyPatterns().get(0);
-        assertThat(bodyPattern.isIgnoreArrayOrder(), is(true));
+        assertThat(bodyPattern.isIgnoreArrayOrder(), is(false));
         assertThat(bodyPattern.isIgnoreExtraElements(), is(true));
     }
 
     @Test
-    public void defaultsToNoJsonBodyMatchingFlags() {
+    public void supportsConfigurationOfRequestBodyPatternFactoryWithEqualToXmlPattern() {
+        client.postWithBody(""/some-json"", """", ""application/xml"", ""utf-8"");
+
+        List mappings = snapshotRecord(recordSpec().requestBodyEqualToXmlPattern());
+
+        assertThat(mappings.get(0).getRequest().getBodyPatterns().get(0), instanceOf(EqualToXmlPattern.class));
+    }
+
+    @Test
+    public void supportsConfigurationOfRequestBodyPatternFactoryWithEqualToPattern() {
+        client.postWithBody(""/some-json"", ""foo"", ""application/text"", ""utf-8"");
+
+        List mappings = snapshotRecord(recordSpec().requestBodyEqualToPattern(true));
+
+        EqualToPattern bodyPattern = (EqualToPattern) mappings.get(0).getRequest().getBodyPatterns().get(0);
+        assertThat(bodyPattern.getCaseInsensitive(), is(true));
+    }
+
+    @Test
+    public void defaultsToAutomaticRequestBodyPattern() {
         client.postJson(""/some-json"", ""{}"");
 
         List mappings = snapshotRecord(recordSpec());
 
         EqualToJsonPattern bodyPattern = (EqualToJsonPattern) mappings.get(0).getRequest().getBodyPatterns().get(0);
-        assertThat(bodyPattern.isIgnoreArrayOrder(), nullValue());
-        assertThat(bodyPattern.isIgnoreExtraElements(), nullValue());
+        assertThat(bodyPattern, is(new EqualToJsonPattern(""{}"", true, true)));
     }
 
     @Test
diff --git a/src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactoryTest.java b/src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactoryTest.java
new file mode 100644
index 0000000000..a64088f4c6
--- /dev/null
+++ b/src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactoryTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2011 Thomas Akehurst
+ *
+ * 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.github.tomakehurst.wiremock.recording;
+
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.matching.*;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;
+
+public class RequestBodyAutomaticPatternFactoryTest {
+    private final static String JSON_TEST_STRING = ""{ \""foo\"": 1 }"";
+    private final static String XML_TEST_STRING = """";
+
+    @Test
+    public void forRequestWithTextBodyIsCaseSensitiveByDefault() {
+        Request request = mockRequest().body(JSON_TEST_STRING);
+        EqualToPattern pattern = (EqualToPattern) patternForRequest(request);
+
+        assertThat(pattern.getEqualTo(), is(JSON_TEST_STRING));
+        assertThat(pattern.getCaseInsensitive(), is(false));
+    }
+
+    @Test
+    public void forRequestWithTextBodyRespectsCaseInsensitiveOption() {
+        Request request = mockRequest().body(JSON_TEST_STRING);
+        RequestBodyAutomaticPatternFactory patternFactory = new RequestBodyAutomaticPatternFactory(false, false, true);
+        EqualToPattern pattern = (EqualToPattern) patternFactory.forRequest(request);
+
+        assertThat(pattern.getEqualTo(), is(JSON_TEST_STRING));
+        assertThat(pattern.getCaseInsensitive(), is(true));
+    }
+
+    @Test
+    public void forRequestWithJsonBodyIgnoresExtraElementsAndArrayOrderByDefault() {
+        Request request = mockRequest()
+            .header(""Content-Type"", ""application/json"")
+            .body(JSON_TEST_STRING);
+        EqualToJsonPattern pattern = (EqualToJsonPattern) patternForRequest(request);
+
+        assertThat(pattern.getEqualToJson(), is(JSON_TEST_STRING));
+        assertThat(pattern.isIgnoreExtraElements(), is(true));
+        assertThat(pattern.isIgnoreArrayOrder(), is(true));
+    }
+
+    @Test
+    public void forRequestWithJsonBodyRespectsOptions() {
+        RequestBodyAutomaticPatternFactory patternFactory = new RequestBodyAutomaticPatternFactory(false, false, false);
+        Request request = mockRequest()
+            .header(""Content-Type"", ""application/json"")
+            .body(JSON_TEST_STRING);
+        EqualToJsonPattern pattern = (EqualToJsonPattern) patternFactory.forRequest(request);
+
+        assertThat(pattern.getEqualToJson(), is(JSON_TEST_STRING));
+        assertThat(pattern.isIgnoreExtraElements(), is(false));
+        assertThat(pattern.isIgnoreArrayOrder(), is(false));
+    }
+
+    @Test
+    public void forRequestWithXmlBody() {
+        Request request = mockRequest()
+            .header(""Content-Type"", ""application/xml"")
+            .body(XML_TEST_STRING);
+        EqualToXmlPattern pattern = (EqualToXmlPattern) patternForRequest(request);
+
+        assertThat(pattern.getEqualToXml(), is(XML_TEST_STRING));
+    }
+
+    private static StringValuePattern patternForRequest(Request request) {
+        return RequestBodyAutomaticPatternFactory.DEFAULTS.forRequest(request);
+    }
+}
diff --git a/src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToJsonPatternFactoryTest.java b/src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToJsonPatternFactoryTest.java
new file mode 100644
index 0000000000..4b30beebef
--- /dev/null
+++ b/src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyEqualToJsonPatternFactoryTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2011 Thomas Akehurst
+ *
+ * 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.github.tomakehurst.wiremock.recording;
+
+import com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;
+import org.junit.Test;
+
+import static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class RequestBodyEqualToJsonPatternFactoryTest {
+
+    @Test
+    public void withIgnoreArrayOrder() {
+        RequestBodyEqualToJsonPatternFactory patternFactory = new RequestBodyEqualToJsonPatternFactory(true, false);
+        EqualToJsonPattern pattern = (EqualToJsonPattern) patternFactory.forRequest(mockRequest().body(""{}""));
+
+        assertThat(pattern.getEqualToJson(), is(""{}""));
+        assertThat(pattern.isIgnoreExtraElements(), is(false));
+        assertThat(pattern.isIgnoreArrayOrder(), is(true));
+    }
+
+    @Test
+    public void withIgnoreExtraElements() {
+        RequestBodyEqualToJsonPatternFactory patternFactory = new RequestBodyEqualToJsonPatternFactory(false, true);
+        EqualToJsonPattern pattern = (EqualToJsonPattern) patternFactory.forRequest(mockRequest().body(""{}""));
+
+        assertThat(pattern.getEqualToJson(), is(""{}""));
+        assertThat(pattern.isIgnoreExtraElements(), is(true));
+        assertThat(pattern.isIgnoreArrayOrder(), is(false));
+    }
+}
diff --git a/src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyPatternFactoryJsonDeserializerTest.java b/src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyPatternFactoryJsonDeserializerTest.java
new file mode 100644
index 0000000000..ee2b6c3021
--- /dev/null
+++ b/src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyPatternFactoryJsonDeserializerTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2011 Thomas Akehurst
+ *
+ * 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.github.tomakehurst.wiremock.recording;
+
+import com.github.tomakehurst.wiremock.common.Json;
+import com.github.tomakehurst.wiremock.matching.*;
+import org.junit.Test;
+
+import static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class RequestBodyPatternFactoryJsonDeserializerTest {
+    @Test
+    public void correctlyDeserializesWithEmptyObject() {
+        RequestBodyPatternFactory bodyPatternFactory = deserializeJson(""{}"");
+        assertThat(bodyPatternFactory, instanceOf(RequestBodyAutomaticPatternFactory.class));
+    }
+
+    @Test
+    public void correctlyDeserializesWithAutoMatcher() {
+        RequestBodyPatternFactory bodyPatternFactory = deserializeJson(""{ \""matcher\"": \""auto\"" }"");
+        assertThat(bodyPatternFactory, instanceOf(RequestBodyAutomaticPatternFactory.class));
+    }
+
+    @Test
+    public void correctlyDeserializesWithEqualToMatcher() {
+        RequestBodyPatternFactory bodyPatternFactory = deserializeJson(
+            ""{                                    \n"" +
+            ""    \""matcher\"": \""equalTo\"",        \n"" +
+            ""    \""caseInsensitive\"": true        \n"" +
+            ""}                                      ""
+        );
+        EqualToPattern bodyPattern = (EqualToPattern) bodyPatternFactory.forRequest(mockRequest());
+        assertThat(bodyPattern.getCaseInsensitive(), is(true));
+    }
+
+    @Test
+    public void correctlyDeserializesWithEqualToJsonMatcher() {
+        RequestBodyPatternFactory bodyPatternFactory = deserializeJson(
+            ""{                                    \n"" +
+            ""    \""matcher\"": \""equalToJson\"",    \n"" +
+            ""    \""ignoreArrayOrder\"": false,     \n"" +
+            ""    \""ignoreExtraElements\"": true    \n"" +
+            ""}                                      ""
+        );
+        EqualToJsonPattern bodyPattern = (EqualToJsonPattern) bodyPatternFactory.forRequest(mockRequest().body(""1""));
+        assertThat(bodyPattern.isIgnoreArrayOrder(), is(false));
+        assertThat(bodyPattern.isIgnoreExtraElements(), is(true));
+
+    }
+
+    @Test
+    public void correctlyDeserializesWithEqualToXmlMatcher() {
+        RequestBodyPatternFactory bodyPatternFactory = deserializeJson(""{ \""matcher\"": \""equalToXml\"" }"");
+        assertThat(bodyPatternFactory, instanceOf(RequestBodyEqualToXmlPatternFactory.class));
+    }
+
+    private static RequestBodyPatternFactory deserializeJson(String json) {
+        return Json.read(json, RequestBodyPatternFactory.class);
+    }
+}
diff --git a/src/test/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformerTest.java b/src/test/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformerTest.java
index 007a2d24c2..3bbe1ac1b8 100644
--- a/src/test/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformerTest.java
+++ b/src/test/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformerTest.java
@@ -15,75 +15,50 @@
  */
 package com.github.tomakehurst.wiremock.recording;
 
-import com.github.tomakehurst.wiremock.recording.CaptureHeadersSpec;
-import com.github.tomakehurst.wiremock.recording.RequestPatternTransformer;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.RequestMethod;
-import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
+import com.github.tomakehurst.wiremock.matching.*;
+import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 
 import java.util.Map;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;
-import static com.google.common.collect.Maps.newLinkedHashMap;
 import static org.junit.Assert.assertEquals;
 
 public class RequestPatternTransformerTest {
     @Test
-    public void applyWithDefaultsAndNoBody() {
+    public void applyIncludesMethodAndUrlMatchers() {
         Request request = mockRequest()
             .url(""/foo"")
             .method(RequestMethod.GET)
             .header(""User-Agent"", ""foo"")
             .header(""X-Foo"", ""bar"");
+
         RequestPatternBuilder expected = new RequestPatternBuilder(RequestMethod.GET, urlEqualTo(""/foo""));
 
-        // Default is to include method and URL exactly
         assertEquals(expected.build(), new RequestPatternTransformer(null, null).apply(request).build());
     }
 
     @Test
-    public void applyWithUrlAndPlainTextBody() {
+    public void applyWithHeaders() {
         Request request = mockRequest()
-            .url(""/foo"")
-            .method(RequestMethod.GET)
-            .body(""HELLO"")
-            .header(""Accept"", ""foo"")
-            .header(""User-Agent"", ""bar"");
+            .url(""/"")
+            .method(RequestMethod.POST)
+            .header(""X-CaseSensitive"", ""foo"")
+            .header(""X-Ignored"", ""ignored"")
+            .header(""X-CaseInsensitive"", ""Baz"");
 
-        RequestPatternBuilder expected = new RequestPatternBuilder(RequestMethod.GET, urlEqualTo(""/foo""))
-            .withRequestBody(equalTo(""HELLO""));
+        RequestPatternBuilder expected = new RequestPatternBuilder(RequestMethod.POST, urlEqualTo(""/""))
+            .withHeader(""X-CaseSensitive"", equalTo(""foo""))
+            .withHeader(""X-CaseInsensitive"", equalToIgnoreCase(""Baz""));
 
-        Map headers = newLinkedHashMap();
+        Map headers = ImmutableMap.of(
+            ""X-CaseSensitive"", new CaptureHeadersSpec(false),
+            ""X-CaseInsensitive"", new CaptureHeadersSpec(true)
+        );
 
         assertEquals(expected.build(), new RequestPatternTransformer(headers, null).apply(request).build());
     }
-
-    @Test
-    public void applyWithOnlyJsonBody() {
-        Request request = mockRequest()
-            .url(""/somewhere"")
-            .header(""Content-Type"", ""application/json"")
-            .body(""['hello']"");
-        RequestPatternBuilder expected = new RequestPatternBuilder()
-            .withUrl(""/somewhere"")
-            .withRequestBody(equalToJson(""['hello']""));
-
-        assertEquals(expected.build(), new RequestPatternTransformer(null, null).apply(request).build());
-    }
-
-    @Test
-    public void applyWithOnlyXmlBody() {
-        Request request = mockRequest()
-            .url(""/somewhere"")
-            .header(""Content-Type"", ""application/xml"")
-            .body("""");
-
-        RequestPatternBuilder expected = new RequestPatternBuilder()
-            .withUrl(""/somewhere"")
-            .withRequestBody(equalToXml(""""));
-
-        assertEquals(expected.build(), new RequestPatternTransformer(null, null).apply(request).build());
-    }
 }
diff --git a/src/test/java/ignored/Examples.java b/src/test/java/ignored/Examples.java
index 4dd2fd738b..fc50a248de 100644
--- a/src/test/java/ignored/Examples.java
+++ b/src/test/java/ignored/Examples.java
@@ -417,7 +417,7 @@ public void recordingDsl() {
                 .ignoreRepeatRequests()
                 .transformers(""modify-response-header"")
                 .transformerParameters(Parameters.one(""headerValue"", ""123""))
-                .jsonBodyMatchFlags(false, true)
+                .requestBodyEqualToJsonPattern(false, true)
         );
 
         System.out.println(Json.write(recordSpec()
@@ -431,7 +431,7 @@ public void recordingDsl() {
             .ignoreRepeatRequests()
             .transformers(""modify-response-header"")
             .transformerParameters(Parameters.one(""headerValue"", ""123""))
-            .jsonBodyMatchFlags(false, true)
+            .requestBodyEqualToJsonPattern(false, true)
             .build()));
     }
 
@@ -449,7 +449,7 @@ public void snapshotDsl() {
                 .ignoreRepeatRequests()
                 .transformers(""modify-response-header"")
                 .transformerParameters(Parameters.one(""headerValue"", ""123""))
-                .jsonBodyMatchFlags(false, true)
+                .requestBodyEqualToJsonPattern(false, true)
         );
 
         System.out.println(Json.write(recordSpec()
@@ -463,7 +463,7 @@ public void snapshotDsl() {
             .ignoreRepeatRequests()
             .transformers(""modify-response-header"")
             .transformerParameters(Parameters.one(""headerValue"", ""123""))
-            .jsonBodyMatchFlags(false, true)
+            .requestBodyEqualToJsonPattern(false, true)
             .build()));
     }
 }"
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;
+
+/**
+ * 
An injectable component for typesafe FacesMessages.
+ * T must be a class which is annotated with
+ * {@link org.apache.deltaspike.core.api.message.annotation.MessageBundle}
+ *
+ * Usage:
+ * 
+ * @Inject
+ * JsfMessage<MyMessages> msg;
+ * ...
+ * msg.addError().userNotLoggedIn();
+ * 
+ * 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. 
+ * 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.
+ *
+ */
+public interface JsfMessage
+{
+    T addError();
+    T addFatal();
+    T addInfo();
+    T addWarn();
+}"
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() {"
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 = """";
+  }
+}
\ 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 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) {"
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 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 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 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  Func1, Subscription> observeOn(Observable 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 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  Func1, Subscription> subscribeOn(Observable source, Scheduler scheduler) {
@@ -68,4 +73,30 @@ public void call() {
             });
         }
     }
-}
+
+    public static class UnitTest {
+
+        @Test
+        @SuppressWarnings(""unchecked"")
+        public void testSubscribeOn() {
+            Observable w = Observable.toObservable(1, 2, 3);
+
+            Scheduler scheduler = spy(Schedulers.forwardingScheduler(Schedulers.immediate()));
+
+            Observer 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"
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 );"
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 map)
+            throws SAXException, IOException, ParserConfigurationException {
+        parseMappings(root, map);
+        parseSemanticHighlightingMappings(root, map);
+    }
+
+    private void parseMappings(Element root, Map 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 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));
                 }
             }
         }"
5f2db5a15b6dce33253c7d6ba766db4ac2292957,Valadoc,"libvaladoc: gir-reader: accept #[id]->[id|func]
",a,https://github.com/GNOME/vala/,⚠️ Could not parse repo info
7d5abf3972158a3b24d2e075c20bde604de3e813,Valadoc,"libvaladoc: reorder @param
",a,https://github.com/GNOME/vala/,⚠️ Could not parse repo info
0453b2486ed9ef95942e6f304171a05a89b25590,isa-tools$isacreator,"Term tagger now partially working. Currently works on the whole investigation although does no String substitution yet to replace the freetext with ontology terms.
Next week will add functionality to:
1) visualise the freetext which was annotated;
2) add term tagging on a per spreadsheet basis;
3) add term tagging on a per study basis;
4) when you right click on a term or a selection of terms which are in a column requiring ontologies, you can click 'tag with ontology' and it will start tagging the terms and display the results
",p,https://github.com/isa-tools/isacreator,"diff --git a/trunk/src/main/java/org/isatools/isacreator/apiutils/InvestigationUtils.java b/trunk/src/main/java/org/isatools/isacreator/apiutils/InvestigationUtils.java
new file mode 100644
index 00000000..ecf4d9f6
--- /dev/null
+++ b/trunk/src/main/java/org/isatools/isacreator/apiutils/InvestigationUtils.java
@@ -0,0 +1,47 @@
+package org.isatools.isacreator.apiutils;
+
+import org.isatools.isacreator.model.Assay;
+import org.isatools.isacreator.model.Investigation;
+import org.isatools.isacreator.model.Study;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by the ISA team
+ *
+ * @author Eamonn Maguire (eamonnmag@gmail.com)
+ *         
+ *         Date: 03/02/2011
+ *         Time: 16:21
+ */
+public class InvestigationUtils {
+
+
+    /**
+     * Method return all the unannotated freetext found in the Investigation
+     *
+     * @param investigation @see Investigation
+     * @return Map from Assay object (general container for spreadsheet) to a Map from the Column Name to it's unannotated values
+     */
+    public static Map>> getFreeTextInInvestigationSpreadsheets(Investigation investigation) {
+
+        Map>> result = new HashMap>>();
+
+        Map studies = investigation.getStudies();
+
+        for (String studyId : studies.keySet()) {
+            Study study = studies.get(studyId);
+
+            result.put(study.getStudySample(),
+                    SpreadsheetUtils.getFreetextInSpreadsheet(study.getStudySample().getSpreadsheetUI().getTable()));
+
+            for (Assay assay : study.getAssays().values()) {
+                result.put(assay, SpreadsheetUtils.getFreetextInSpreadsheet(assay.getSpreadsheetUI().getTable()));
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/trunk/src/main/java/org/isatools/isacreator/spreadsheet/utils/SpreadsheetUtils.java b/trunk/src/main/java/org/isatools/isacreator/apiutils/SpreadsheetUtils.java
similarity index 64%
rename from trunk/src/main/java/org/isatools/isacreator/spreadsheet/utils/SpreadsheetUtils.java
rename to trunk/src/main/java/org/isatools/isacreator/apiutils/SpreadsheetUtils.java
index 403ea978..826b509d 100644
--- a/trunk/src/main/java/org/isatools/isacreator/spreadsheet/utils/SpreadsheetUtils.java
+++ b/trunk/src/main/java/org/isatools/isacreator/apiutils/SpreadsheetUtils.java
@@ -35,14 +35,16 @@ ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
  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.spreadsheet.utils;
+package org.isatools.isacreator.apiutils;
 
 import org.apache.commons.collections15.map.ListOrderedMap;
 import org.apache.commons.collections15.set.ListOrderedSet;
+import org.isatools.isacreator.configuration.DataTypes;
 import org.isatools.isacreator.spreadsheet.Spreadsheet;
+import org.isatools.isacreator.spreadsheet.Utils;
 
-import java.util.Map;
-import java.util.Set;
+import javax.swing.table.TableColumn;
+import java.util.*;
 
 /**
  * SpreadsheetUtils
@@ -140,4 +142,73 @@ public static String[][] getSpreadsheetDataSubset(Spreadsheet targetSheet, int n
 
         return data;
     }
+
+    /**
+     * Gets the freetext terms (which ideally should be ontology terms) in a Spreadsheet object
+     *
+     * @param spreadsheet @see Spreadsheet
+     * @return Map>
+     */
+    public static Map> getFreetextInSpreadsheet(Spreadsheet spreadsheet) {
+        Enumeration columns = spreadsheet.getTable().getColumnModel().getColumns();
+
+        Map> columnToFreeText = new HashMap>();
+
+        while (columns.hasMoreElements()) {
+            TableColumn tc = columns.nextElement();
+
+            if (spreadsheet.getTableReferenceObject().getClassType(tc.getHeaderValue().toString().trim())
+                    == DataTypes.ONTOLOGY_TERM) {
+
+                int colIndex = Utils.convertModelIndexToView(spreadsheet.getTable(), tc.getModelIndex());
+
+                for (int row = 0; row < spreadsheet.getTable().getRowCount(); row++) {
+
+                    String columnValue = (spreadsheet.getTable().getValueAt(row, colIndex) == null) ? """"
+                            : spreadsheet.getTable().getValueAt(row,
+                            colIndex).toString();
+
+                    if (columnValue != null && !columnValue.trim().equals("""")) {
+                        if (!columnToFreeText.containsKey(tc.getHeaderValue().toString())) {
+                            columnToFreeText.put(tc.getHeaderValue().toString(), new HashSet());
+                        }
+                        columnToFreeText.get(tc.getHeaderValue().toString()).add(columnValue);
+                    }
+                }
+            }
+        }
+
+        return columnToFreeText;
+    }
+
+    /**
+     * Method returns a Set of all the files defined in a spreadsheet. These locations are used to zip up the data files
+     * in the ISArchive for submission to the index.
+     *
+     * @return Set of files defined in the spreadsheet
+     */
+    public static Set getFilesDefinedInTable(Spreadsheet spreadsheet) {
+        Enumeration columns = spreadsheet.getTable().getColumnModel().getColumns();
+        Set files = new HashSet();
+
+        while (columns.hasMoreElements()) {
+            TableColumn tc = columns.nextElement();
+
+            if (spreadsheet.getTableReferenceObject().acceptsFileLocations(tc.getHeaderValue().toString())) {
+                int colIndex = Utils.convertModelIndexToView(spreadsheet.getTable(), tc.getModelIndex());
+
+                for (int row = 0; row < spreadsheet.getTable().getRowCount(); row++) {
+                    String s = (spreadsheet.getTable().getValueAt(row, colIndex) == null) ? """"
+                            : spreadsheet.getTable().getValueAt(row,
+                            colIndex).toString();
+
+                    if (s != null && !s.trim().equals("""")) {
+                        files.add(s);
+                    }
+                }
+            }
+        }
+
+        return files;
+    }
 }
diff --git a/trunk/src/main/java/org/isatools/isacreator/apiutils/StudyUtils.java b/trunk/src/main/java/org/isatools/isacreator/apiutils/StudyUtils.java
new file mode 100644
index 00000000..6ab5e7ad
--- /dev/null
+++ b/trunk/src/main/java/org/isatools/isacreator/apiutils/StudyUtils.java
@@ -0,0 +1,12 @@
+package org.isatools.isacreator.apiutils;
+
+/**
+ * Created by the ISA team
+ *
+ * @author Eamonn Maguire (eamonnmag@gmail.com)
+ *         

+ *         Date: 03/02/2011
+ *         Time: 16:21
+ */
+public class StudyUtils {
+}
diff --git a/trunk/src/main/java/org/isatools/isacreator/gui/ISAcreator.java b/trunk/src/main/java/org/isatools/isacreator/gui/ISAcreator.java
index 9b4674a8..835ba713 100755
--- a/trunk/src/main/java/org/isatools/isacreator/gui/ISAcreator.java
+++ b/trunk/src/main/java/org/isatools/isacreator/gui/ISAcreator.java
@@ -52,6 +52,8 @@ The ISA Team and the ISA software suite have been funded by the EU Carcinogenomi
 import org.isatools.isacreator.io.UserProfile;
 import org.isatools.isacreator.io.UserProfileIO;
 import org.isatools.isacreator.model.Investigation;
+import org.isatools.isacreator.ontologiser.adaptors.InvestigationAdaptor;
+import org.isatools.isacreator.ontologiser.ui.OntologiserUI;
 import org.isatools.isacreator.ontologymanager.OntologyConsumer;
 import org.isatools.isacreator.ontologymanager.OntologySourceRefObject;
 import org.isatools.isacreator.ontologyselectiontool.OntologyObject;
@@ -488,27 +490,35 @@ public void actionPerformed(ActionEvent e) {
 
         menuBar.add(view);
 
-        JMenu plugins = new JMenu(""plugins"");
+        JMenu plugins = new JMenu(""utilities"");
 
-        JMenu exporters = new JMenu(""Sample Tracking"");
-        exporters.addMouseListener(new MouseAdapter() {
+
+        JMenu sampleTracking = new JMenu(""Sample Tracking"");
+        sampleTracking.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseEntered(MouseEvent mouseEvent) {
                 updateExportList();
             }
         });
 
-//        JMenu mgRastExport = new JMenu(""export study to mg-rast"");
-//        mgRastExport.setIcon(mgRastIcon);
-//        menusRequiringStudyIds.put(""mgrast"", mgRastExport);
-//        exporters.add(mgRastExport);
+        JMenuItem tagInvestigation = new JMenuItem(""Autotagging"");
+        tagInvestigation.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent mouseEvent) {
+                OntologiserUI ontologiserUI = new OntologiserUI(ISAcreator.this, new InvestigationAdaptor(getDataEntryEnvironment().getInvestigation()));
+                ontologiserUI.createGUI();
+
+                showJDialogAsSheet(ontologiserUI);
+            }
+        });
 
         JMenu qrCodeExport = new JMenu(""generate QR codes for Study samples"");
         qrCodeExport.setIcon(qrCodeIcon);
         menusRequiringStudyIds.put(""qr"", qrCodeExport);
-        exporters.add(qrCodeExport);
+        sampleTracking.add(qrCodeExport);
 
-        plugins.add(exporters);
+        plugins.add(sampleTracking);
+        plugins.add(tagInvestigation);
 
         menuBar.add(plugins);
 
diff --git a/trunk/src/main/java/org/isatools/isacreator/mgrast/utils/APIHook.java b/trunk/src/main/java/org/isatools/isacreator/mgrast/utils/APIHook.java
index 755a4142..1c105743 100644
--- a/trunk/src/main/java/org/isatools/isacreator/mgrast/utils/APIHook.java
+++ b/trunk/src/main/java/org/isatools/isacreator/mgrast/utils/APIHook.java
@@ -38,12 +38,12 @@ The ISA Team and the ISA software suite have been funded by the EU Carcinogenomi
 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 org.isatools.isacreator.spreadsheet.utils.SpreadsheetUtils;
 
 import java.util.*;
 
diff --git a/trunk/src/main/java/org/isatools/isacreator/ontologiser/adaptors/ContentAdaptor.java b/trunk/src/main/java/org/isatools/isacreator/ontologiser/adaptors/ContentAdaptor.java
new file mode 100644
index 00000000..e9cc8f9e
--- /dev/null
+++ b/trunk/src/main/java/org/isatools/isacreator/ontologiser/adaptors/ContentAdaptor.java
@@ -0,0 +1,30 @@
+package org.isatools.isacreator.ontologiser.adaptors;
+
+import org.isatools.isacreator.ontologiser.model.OntologisedResult;
+
+import java.util.Set;
+
+/**
+ * Created by the ISA team
+ *
+ * @author Eamonn Maguire (eamonnmag@gmail.com)
+ *         

+ *         Date: 03/02/2011
+ *         Time: 22:40
+ */
+public interface ContentAdaptor {
+
+    /**
+     * Mechanism to get the terms to be annotated
+     *
+     * @return @see Set
+     */
+    public Set getTerms();
+
+    /**
+     * Will be the mechanism to replace the content
+     *
+     * @param result @see Set
+     */
+    public void replaceTerms(Set result);
+}
diff --git a/trunk/src/main/java/org/isatools/isacreator/ontologiser/adaptors/InvestigationAdaptor.java b/trunk/src/main/java/org/isatools/isacreator/ontologiser/adaptors/InvestigationAdaptor.java
new file mode 100644
index 00000000..44cb00e0
--- /dev/null
+++ b/trunk/src/main/java/org/isatools/isacreator/ontologiser/adaptors/InvestigationAdaptor.java
@@ -0,0 +1,62 @@
+package org.isatools.isacreator.ontologiser.adaptors;
+
+import org.isatools.isacreator.apiutils.InvestigationUtils;
+import org.isatools.isacreator.model.Assay;
+import org.isatools.isacreator.model.Investigation;
+import org.isatools.isacreator.ontologiser.model.OntologisedResult;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by the ISA team
+ *
+ * @author Eamonn Maguire (eamonnmag@gmail.com)
+ *         

+ *         Date: 03/02/2011
+ *         Time: 22:43
+ */
+public class InvestigationAdaptor implements ContentAdaptor {
+
+    private Investigation investigation;
+
+    // by creating and maintaining this Map, we are able to locate which Spreadsheets
+    // contain which terms, making string substitution much quicker.
+
+    private Map> assayToTerms;
+
+    public InvestigationAdaptor(Investigation investigation) {
+        this.investigation = investigation;
+    }
+
+    public void replaceTerms(Set annotations) {
+        // todo
+        for (OntologisedResult annotation : annotations) {
+
+        }
+    }
+
+    public Set getTerms() {
+        Map>> result = InvestigationUtils.getFreeTextInInvestigationSpreadsheets(investigation);
+
+        return createFlattenedSet(result);
+    }
+
+    private Set createFlattenedSet(Map>> toFlatten) {
+
+        Set flattenedSet = new HashSet();
+
+        for (Assay assay : toFlatten.keySet()) {
+            Set assayTerms = new HashSet();
+            for (String columnName : toFlatten.get(assay).keySet()) {
+                assayTerms.addAll(toFlatten.get(assay).get(columnName));
+
+            }
+            flattenedSet.addAll(assayTerms);
+            assayToTerms.put(assay, assayTerms);
+        }
+
+        return flattenedSet;
+    }
+}
diff --git a/trunk/src/main/java/org/isatools/isacreator/ontologiser/ui/OntologiserUI.java b/trunk/src/main/java/org/isatools/isacreator/ontologiser/ui/OntologiserUI.java
index fad1e144..cff02a82 100644
--- a/trunk/src/main/java/org/isatools/isacreator/ontologiser/ui/OntologiserUI.java
+++ b/trunk/src/main/java/org/isatools/isacreator/ontologiser/ui/OntologiserUI.java
@@ -3,6 +3,7 @@
 import org.isatools.isacreator.common.UIHelper;
 import org.isatools.isacreator.common.dialog.ConfirmationDialog;
 import org.isatools.isacreator.gui.ISAcreator;
+import org.isatools.isacreator.ontologiser.adaptors.ContentAdaptor;
 import org.isatools.isacreator.ontologiser.logic.impl.AnnotatorSearchClient;
 import org.isatools.isacreator.ontologymanager.bioportal.model.AnnotatorResult;
 import org.jdesktop.fuse.InjectedResource;
@@ -16,9 +17,7 @@
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Created by the ISA team
@@ -28,7 +27,7 @@
  *         Date: 26/01/2011
  *         Time: 11:13
  */
-public class OntologiserUI extends JFrame {
+public class OntologiserUI extends JDialog {
 
     public static final int TERM_TAGGER_VIEW = 0;
     public static final int HELP = 1;
@@ -58,6 +57,8 @@ public class OntologiserUI extends JFrame {
 
     private JLabel helpButton;
 
+    private ContentAdaptor content;
+
     private int selectedSection = HELP;
 
     @InjectedResource
@@ -69,11 +70,11 @@ public class OntologiserUI extends JFrame {
     private OntologyHelpPane helpPane;
     private ConfirmationDialog confirmChoice;
     private ISAcreator isacreatorEnvironment;
-    private String currentAssay;
 
-    public OntologiserUI(ISAcreator isacreatorEnvironment, String currentAssay) {
+
+    public OntologiserUI(ISAcreator isacreatorEnvironment, ContentAdaptor content) {
         this.isacreatorEnvironment = isacreatorEnvironment;
-        this.currentAssay = currentAssay;
+        this.content = content;
     }
 
     public void createGUI() {
@@ -100,8 +101,6 @@ public void createGUI() {
         add(createSouthPanel(), BorderLayout.SOUTH);
 
         pack();
-        setVisible(true);
-
     }
 
     private Container createTopPanel() {
@@ -133,28 +132,38 @@ public void mousePressed(MouseEvent mouseEvent) {
 
                 Thread performer = new Thread(new Runnable() {
                     public void run() {
-                        if (annotationPane == null) {
-                            // todo call API module to get all unannotated Ontology entries from the spreadsheet
 
-                            annotationPane = new OntologiserAnnotationPane(getTestData());
+                        Map> terms = getTerms();
+
+                        boolean haveTerms = terms != null;
+
+                        if (haveTerms) {
+
+                            if (annotationPane == null) {
+
+                                annotationPane = new OntologiserAnnotationPane(terms);
+
+                                SwingUtilities.invokeLater(new Runnable() {
+                                    public void run() {
+                                        annotationPane.createGUI();
+                                    }
+                                });
+                            }
 
                             SwingUtilities.invokeLater(new Runnable() {
                                 public void run() {
-                                    annotationPane.createGUI();
+                                    swapContainers(annotationPane);
+
+                                    termTaggerButton.setIcon(termTaggerIconOver);
+                                    visualiseButton.setIcon(visualiseIcon);
+                                    suggestButton.setIcon(suggestIcon);
+                                    clearAllButton.setIcon(clearAllIcon);
                                 }
                             });
+                        } else {
+                            // todo add info pane saying there are no terms to annotate
+                            swapContainers(helpPane);
                         }
-
-                        SwingUtilities.invokeLater(new Runnable() {
-                            public void run() {
-                                swapContainers(annotationPane);
-
-                                termTaggerButton.setIcon(termTaggerIconOver);
-                                visualiseButton.setIcon(visualiseIcon);
-                                suggestButton.setIcon(suggestIcon);
-                                clearAllButton.setIcon(clearAllIcon);
-                            }
-                        });
                     }
 
                 });
@@ -395,21 +404,18 @@ private void swapContainers(Container newContainer) {
         }
     }
 
-    public static void main(String[] args) {
-        OntologiserUI ui = new OntologiserUI(null, ""assay"");
-        ui.createGUI();
-    }
-
-    public Map> getTestData() {
+    public Map> getTerms() {
 
         AnnotatorSearchClient sc = new AnnotatorSearchClient();
 
-        Set testTerms = new HashSet();
-        testTerms.add(""CY3"");
-        testTerms.add(""DOSE"");
-        testTerms.add(""ASSAY"");
+        if (content != null && content.getTerms().size() > 0) {
+
+            return sc.searchForTerms(content.getTerms());
+
+        }
+
+        return null;
 
-        return sc.searchForTerms(testTerms);
     }
 
 
diff --git a/trunk/src/main/java/org/isatools/isacreator/qrcode/utils/QRAPIHook.java b/trunk/src/main/java/org/isatools/isacreator/qrcode/utils/QRAPIHook.java
index 1b48c0c8..8bcb5f5f 100644
--- a/trunk/src/main/java/org/isatools/isacreator/qrcode/utils/QRAPIHook.java
+++ b/trunk/src/main/java/org/isatools/isacreator/qrcode/utils/QRAPIHook.java
@@ -37,11 +37,11 @@ The ISA Team and the ISA software suite have been funded by the EU Carcinogenomi
 
 package org.isatools.isacreator.qrcode.utils;
 
+import org.isatools.isacreator.apiutils.SpreadsheetUtils;
 import org.isatools.isacreator.formatmappingutility.ui.MappingChoice;
 import org.isatools.isacreator.gui.ISAcreator;
 import org.isatools.isacreator.model.Investigation;
 import org.isatools.isacreator.model.Study;
-import org.isatools.isacreator.spreadsheet.utils.SpreadsheetUtils;
 import org.isatools.isacreator.utils.StringProcessing;
 
 import java.util.*;
diff --git a/trunk/src/main/java/org/isatools/isacreator/spreadsheet/Spreadsheet.java b/trunk/src/main/java/org/isatools/isacreator/spreadsheet/Spreadsheet.java
index eac2f604..813ee863 100644
--- a/trunk/src/main/java/org/isatools/isacreator/spreadsheet/Spreadsheet.java
+++ b/trunk/src/main/java/org/isatools/isacreator/spreadsheet/Spreadsheet.java
@@ -1825,6 +1825,8 @@ public TableConsistencyChecker getTableConsistencyChecker() {
      * @param removeEmptyColumns - should empty columns be removed from the submission?
      * @throws java.io.FileNotFoundException - never thrown since the file is created if it doesn't exist, and over written if
      *                                       it already exists
+     *                                       

+     *                                       todo Move this code into a utils class
      */
     public boolean exportTable(File f, String separator, boolean removeEmptyColumns)
             throws FileNotFoundException {
@@ -1945,6 +1947,8 @@ public boolean exportTable(File f, String separator, boolean removeEmptyColumns)
      * in the ISArchive for submission to the index.
      *
      * @return Set of files defined in the spreadsheet
+     *         

+     *         todo move to spreadsheetutils class
      */
     public Set getFilesDefinedInTable
     () {
@@ -2015,8 +2019,7 @@ public boolean exportTable(File f, String separator, boolean removeEmptyColumns)
      *
      * @return Set containing the Ontologies defined in the Spreadsheet.
      */
-    public Set getOntologiesDefinedInTable
-    () {
+    public Set getOntologiesDefinedInTable() {
         Enumeration columns = table.getColumnModel().getColumns();
 
         HashSet ontologySources = new HashSet();
diff --git a/trunk/src/main/java/org/isatools/isacreator/spreadsheet/TableReferenceObject.java b/trunk/src/main/java/org/isatools/isacreator/spreadsheet/TableReferenceObject.java
index da33b4e5..a02142c8 100644
--- a/trunk/src/main/java/org/isatools/isacreator/spreadsheet/TableReferenceObject.java
+++ b/trunk/src/main/java/org/isatools/isacreator/spreadsheet/TableReferenceObject.java
@@ -254,6 +254,7 @@ public boolean acceptsFileLocations(String colName) {
                 fieldLookup.get(colName).isAcceptsFileLocations();
     }
 
+
     public boolean acceptsMultipleValues(String colName) {
         return fieldLookup.get(colName).isAcceptsMultipleValues();
     }
@@ -271,7 +272,7 @@ public void addRowData(String[] headers, String[] rowData) {
         int prevValLoc = -1;
 
         for (int i = 0; i < headers.length; i++) {
-             String s;
+            String s;
             if (i < rowData.length) {
                 s = rowData[i];
             } else {"
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={0}

Consult IDE log for more details (Show Log)
+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"")));
       }
     };"
0b3db7cbf5eada6176af266cc6bebfcd1332f115,restlet-framework-java, - Additional WADL refactorings.--,p,https://github.com/restlet/restlet-framework-java,"diff --git a/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/FaultInfo.java b/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/FaultInfo.java
index 0752ec6751..0ad154478f 100644
--- a/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/FaultInfo.java
+++ b/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/FaultInfo.java
@@ -32,6 +32,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.restlet.data.MediaType;
 import org.restlet.data.Reference;
 import org.restlet.data.Status;
 import org.restlet.util.XmlWriter;
@@ -47,39 +48,66 @@ public class FaultInfo extends RepresentationInfo {
 
     /**
      * Constructor.
+     * 
+     * @param status
+     *            The associated status code.
      */
-    public FaultInfo() {
+    public FaultInfo(Status status) {
         super();
+        getStatuses().add(status);
     }
 
     /**
      * Constructor with a single documentation element.
      * 
+     * @param status
+     *            The associated status code.
      * @param documentation
      *            A single documentation element.
      */
-    public FaultInfo(DocumentationInfo documentation) {
+    public FaultInfo(Status status, DocumentationInfo documentation) {
         super(documentation);
+        getStatuses().add(status);
     }
 
     /**
      * Constructor with a list of documentation elements.
      * 
+     * @param status
+     *            The associated status code.
      * @param documentations
      *            The list of documentation elements.
      */
-    public FaultInfo(List documentations) {
+    public FaultInfo(Status status, List documentations) {
         super(documentations);
+        getStatuses().add(status);
     }
 
     /**
      * Constructor with a single documentation element.
      * 
+     * @param status
+     *            The associated status code.
      * @param documentation
      *            A single documentation element.
      */
-    public FaultInfo(String documentation) {
-        super(documentation);
+    public FaultInfo(Status status, String documentation) {
+        this(status, new DocumentationInfo(documentation));
+    }
+
+    /**
+     * Constructor with a single documentation element.
+     * 
+     * @param status
+     *            The associated status code.
+     * @param mediaType
+     *            The fault representation's media type.
+     * @param documentation
+     *            A single documentation element.
+     */
+    public FaultInfo(Status status, MediaType mediaType, String documentation) {
+        this(status, new DocumentationInfo(documentation));
+        setMediaType(mediaType);
     }
 
     /**
diff --git a/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/MethodInfo.java b/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/MethodInfo.java
index 5ac681ffc5..0aac5ee5ab 100644
--- a/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/MethodInfo.java
+++ b/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/MethodInfo.java
@@ -32,8 +32,10 @@
 import java.util.List;
 import java.util.Map;
 
+import org.restlet.data.MediaType;
 import org.restlet.data.Method;
 import org.restlet.data.Reference;
+import org.restlet.data.Status;
 import org.restlet.resource.Variant;
 import org.restlet.util.XmlWriter;
 import org.xml.sax.SAXException;
@@ -98,6 +100,24 @@ public MethodInfo(String documentation) {
         super(documentation);
     }
 
+    /**
+     * Adds a new fault to the response.
+     * 
+     * @param status
+     *            The associated status code.
+     * @param mediaType
+     *            The fault representation's media type.
+     * @param documentation
+     *            A single documentation element.
+     * @return The created fault description.
+     */
+    public FaultInfo addFault(Status status, MediaType mediaType,
+            String documentation) {
+        FaultInfo result = new FaultInfo(status, mediaType, documentation);
+        getResponse().getFaults().add(result);
+        return result;
+    }
+
     /**
      * Adds a new request parameter.
      * 
diff --git a/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/WadlRepresentation.java b/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/WadlRepresentation.java
index 9eadc8c8c6..d6af850a75 100644
--- a/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/WadlRepresentation.java
+++ b/modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/WadlRepresentation.java
@@ -530,7 +530,8 @@ public void startElement(String uri, String localName, String qName,
                     }
                     pushState(State.DOCUMENTATION);
                 } else if (localName.equals(""fault"")) {
-                    this.currentFault = new FaultInfo();
+                    this.currentFault = new FaultInfo(null);
+
                     if (attrs.getIndex(""id"") != -1) {
                         this.currentFault.setIdentifier(attrs.getValue(""id""));
                     }"
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;"
3980e032581824d7241748c7ec56a916fdce6261,orientdb,Improved memory usage and optimized general speed--,p,https://github.com/JetBrains/intellij-community,⚠️ HTTP 404: Not Found
e15a795130250de68c4ea9bf3205c58865732869,Vala,"codegen: Support ""foo is G""
",a,https://github.com/GNOME/vala/,⚠️ Could not parse repo info
9102b09aeca480dad12bf2edb56266b2d20ccbfb,Vala,"gtk+-2.0: Gtk.MessageDialog:buttons does not have an accessor method

Fixes bug 607992.
",c,https://github.com/GNOME/vala/,⚠️ Could not parse repo info
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;
             }
         }"
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 @@
 	
 	-->
 
-	
+	
+
+	
+		
+	
 
 	
 		
 	
 
+	
+		
+	
+
 	
 
 
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 tasks = (Map) 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"
90f3fc20181932474f371d143cf7b91755df53c4,Vala,"posix: add gettimeofday() and settimeofday() bindings.

Fixes bug 592189.
",a,https://github.com/GNOME/vala/,⚠️ Could not parse repo info
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 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 @@
     
   
 
+  
+    httpfs.user.provider.user.pattern
+    ^[A-Za-z_][A-Za-z0-9._-]*[$]?$
+    
+      Valid pattern for user and group names, it must be a valid java regex.
+    
+  
+
 
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);
+    }
   }
 
 }"
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 );
+            }
         }
     }"
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 RuleFlowGroup.
      * When activating, all activations of this RuleFlowGroup 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 listeners;
     private Map           nodeInstances    = new HashMap();
@@ -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 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() ) {"
736edba1d834a660bb01e9b9704cd7d7b310a097,tapiji,"removes the outdated package namespace `at.ac.tuwien.inso.tapiji`.

",p,https://github.com/tapiji/tapiji,
c7cbcd3136e0e5a914f6541db0267b9bb93a07ec,isa-tools$isacreator,"Decoupled functionality for creating user profile from the GUI class.
",p,https://github.com/isa-tools/isacreator,"diff --git a/src/main/java/org/isatools/isacreator/api/CreateProfile.java b/src/main/java/org/isatools/isacreator/api/CreateProfile.java
new file mode 100644
index 00000000..d29bf01b
--- /dev/null
+++ b/src/main/java/org/isatools/isacreator/api/CreateProfile.java
@@ -0,0 +1,70 @@
+package org.isatools.isacreator.api;
+
+import org.isatools.isacreator.gui.ISAcreator;
+import org.isatools.isacreator.io.UserProfile;
+import org.isatools.isacreator.managers.ApplicationManager;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by the ISATeam.
+ * User: agbeltran
+ * Date: 22/08/2012
+ * Time: 12:38
+ *
+ * Functionality for validating user profile fields and creating user profile
+ *
+ * @author Alejandra Gonzalez-Beltran
+ */
+public class CreateProfile {
+
+    private static ISAcreator main = ApplicationManager.getCurrentApplicationInstance();
+
+
+    public static boolean emptyPassword(char[] cpassword){
+        String password = new String(cpassword);
+        return password.equals("""");
+    }
+
+    public static boolean emptyField(String field){
+        return field.equals("""");
+    }
+
+    public static boolean matchingPasswords(char[] cpassword1, char[] cpassword2){
+        String password1 = new String(cpassword1);
+        String password2 = new String(cpassword2);
+        return password1.equals(password2);
+    }
+
+    public static boolean validEmail(String email){
+        Pattern p = Pattern.compile(""[.]*@[.]*"");
+        Matcher m = p.matcher(email);
+        return m.find();
+    }
+
+    public static boolean duplicateUser(String username){
+        for (UserProfile up : main.getUserProfiles()) {
+            if (up.getUsername().equals(username)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static void createProfile(String username,char[] password, String firstname, String surname, String institution, String email){
+
+        UserProfile newUser = new UserProfile(username,
+                new String(password).hashCode(),
+                firstname,
+                surname,
+                institution,
+                email);
+
+        main.getUserProfiles().add(newUser);
+        main.setCurrentUser(newUser);
+        main.setUserOntologyHistory(newUser.getUserHistory());
+        main.saveUserProfiles();
+    }
+
+}
diff --git a/src/main/java/org/isatools/isacreator/gui/menu/CreateProfile.java b/src/main/java/org/isatools/isacreator/gui/menu/CreateProfileMenu.java
similarity index 80%
rename from src/main/java/org/isatools/isacreator/gui/menu/CreateProfile.java
rename to src/main/java/org/isatools/isacreator/gui/menu/CreateProfileMenu.java
index 79614ab9..49cbd2bf 100644
--- a/src/main/java/org/isatools/isacreator/gui/menu/CreateProfile.java
+++ b/src/main/java/org/isatools/isacreator/gui/menu/CreateProfileMenu.java
@@ -5,7 +5,7 @@ ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
  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Ó);
+ ï¿½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
@@ -13,7 +13,7 @@ ISAcreator is a component of the ISA software suite (http://www.isa-tools.org)
  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,
+ 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.
 
@@ -37,9 +37,9 @@ The ISA Team and the ISA software suite have been funded by the EU Carcinogenomi
 
 package org.isatools.isacreator.gui.menu;
 
+import org.isatools.isacreator.api.CreateProfile;
 import org.isatools.isacreator.common.UIHelper;
 import org.isatools.isacreator.effects.components.RoundedJPasswordField;
-import org.isatools.isacreator.io.UserProfile;
 import org.jdesktop.fuse.InjectedResource;
 
 import javax.swing.*;
@@ -47,8 +47,7 @@ The ISA Team and the ISA software suite have been funded by the EU Carcinogenomi
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+
 
 /**
  * CreateProfileGUI provides interface to allow users to construct a new profile
@@ -59,7 +58,7 @@ The ISA Team and the ISA software suite have been funded by the EU Carcinogenomi
  */
 
 
-public class CreateProfile extends MenuUIComponent {
+public class CreateProfileMenu extends MenuUIComponent {
     @InjectedResource
     private ImageIcon createProfileButton, createProfileButtonOver,
             backButtonSml, backButtonSmlOver;
@@ -75,7 +74,7 @@ public class CreateProfile extends MenuUIComponent {
     private JTextField surnameVal;
     private JTextField usernameVal;
 
-    public CreateProfile(ISAcreatorMenu menu) {
+    public CreateProfileMenu(ISAcreatorMenu menu) {
         super(menu);
         status = new JLabel(""                                      "");
         status.setForeground(UIHelper.RED_COLOR);
@@ -254,56 +253,30 @@ private void assignKeyActionToComponent(Action action, JComponent field) {
 
     private void createProfile() {
         // check password is not empty and that the password and the confirmation match!
-        String password = new String(passwordVal.getPassword());
-        if (!password.equals("""")) {
-            String passwordConfirmation = new String(confirmPasswordVal.getPassword());
-            if (!password.equals(passwordConfirmation)) {
-                status.setText(
-                        ""passwords do not match! the password and confirmation must match!"");
-                return;
-            }
-        } else {
+        if (CreateProfile.emptyPassword(passwordVal.getPassword())) {
             status.setText(
                     ""password is required!"");
             return;
         }
+        if (!CreateProfile.matchingPasswords(passwordVal.getPassword(),confirmPasswordVal.getPassword())){
+            status.setText(
+                    ""passwords do not match! the password and confirmation must match!"");
+            return;
+        };
 
         // check the rest of the fields to ensure values have been entered and proceed to creating the
         // profile if everything is ok!
-        if (!usernameVal.getText().equals("""")) {
-            if (!firstnameVal.getText().equals("""")) {
-                if (!surnameVal.getText().equals("""")) {
-                    if (!institutionVal.getText().equals("""")) {
-                        if (!emailVal.getText().equals("""")) {
-                            Pattern p = Pattern.compile(""[.]*@[.]*"");
-                            Matcher m = p.matcher(emailVal.getText());
-
-                            if (m.find()) {
-                                UserProfile newUser = new UserProfile(usernameVal.getText(),
-                                        new String(passwordVal.getPassword()).hashCode(),
-                                        firstnameVal.getText(),
-                                        surnameVal.getText(),
-                                        institutionVal.getText(),
-                                        emailVal.getText());
-                                boolean dupUser = false;
-
-                                for (UserProfile up : menu.getMain().getUserProfiles()) {
-                                    if (up.getUsername()
-                                            .equals(usernameVal.getText())) {
-                                        dupUser = true;
-                                        status.setText(
-                                                ""user name taken! this username is already in use"");
-
-                                        break;
-                                    }
-                                }
-
-                                if (!dupUser) {
-                                    menu.getMain().getUserProfiles().add(newUser);
-                                    menu.getMain().setCurrentUser(newUser);
-                                    menu.getMain().setUserOntologyHistory(newUser.getUserHistory());
-                                    menu.getMain().saveUserProfiles();
-
+        if (!CreateProfile.emptyField(usernameVal.getText())) {
+            if (!CreateProfile.emptyField(firstnameVal.getText())) {
+                if (!CreateProfile.emptyField(surnameVal.getText())) {
+                    if (!CreateProfile.emptyField(institutionVal.getText())) {
+                        if (!CreateProfile.emptyField(emailVal.getText())) {
+                            if (CreateProfile.validEmail(emailVal.getText())) {
+                                if (CreateProfile.duplicateUser(usernameVal.getText())){
+                                   status.setText(
+                                         ""user name taken! this username is already in use"");
+                                }else{
+                                    CreateProfile.createProfile(usernameVal.getText(), passwordVal.getPassword(),firstnameVal.getText(),surnameVal.getText(),institutionVal.getText(),emailVal.getText());
                                     menu.changeView(menu.getMainMenuGUI());
                                 }
                             } else {
@@ -330,6 +303,6 @@ private void createProfile() {
             status.setText(
                     ""username is required! please enter a username"");
         }
-    }
+    }//createProfile method
 }
 
diff --git a/src/main/resources/dependency-injections/gui-package.properties b/src/main/resources/dependency-injections/gui-package.properties
index a7540c70..3f289acf 100644
--- a/src/main/resources/dependency-injections/gui-package.properties
+++ b/src/main/resources/dependency-injections/gui-package.properties
@@ -99,8 +99,8 @@ SaveAsDialog.saveSubmissionOver=/images/gui/savesubmission_over.png
 
 # MenuUIComponent images. This class is extended by AuthenticationMenu, CreateISATabMenu, CreateProfie,
 # ImportConfiguration, ImportFilesMenu & MainMenu
-MenuUIComponent.backButton={CreateProfile.backButtonSml}
-MenuUIComponent.backButtonOver={CreateProfile.backButtonSmlOver}
+MenuUIComponent.backButton={CreateProfileMenu.backButtonSml}
+MenuUIComponent.backButtonOver={CreateProfileMenu.backButtonSmlOver}
 MenuUIComponent.exitButtonSml=/images/gui/menu_new/exit_sml.png
 MenuUIComponent.exitButtonSmlOver=/images/gui/menu_new/exit_sml_over.png
 MenuUIComponent.createProfileButton=/images/gui/menu_new/create_profile.png
@@ -114,10 +114,10 @@ AuthenticationMenu.createProfileButtonOver={MenuUIComponent.createProfileButtonO
 AuthenticationMenu.exitButtonSml={MenuUIComponent.exitButtonSml}
 AuthenticationMenu.exitButtonSmlOver={MenuUIComponent.exitButtonSmlOver}
 
-CreateProfile.createProfileButton={AuthenticationMenu.createProfileButton}
-CreateProfile.createProfileButtonOver={AuthenticationMenu.createProfileButtonOver}
-CreateProfile.backButtonSml=/images/gui/menu_new/back_sml.png
-CreateProfile.backButtonSmlOver=/images/gui/menu_new/back_sml_over.png
+CreateProfileMenu.createProfileButton={AuthenticationMenu.createProfileButton}
+CreateProfileMenu.createProfileButtonOver={AuthenticationMenu.createProfileButtonOver}
+CreateProfileMenu.backButtonSml=/images/gui/menu_new/back_sml.png
+CreateProfileMenu.backButtonSmlOver=/images/gui/menu_new/back_sml_over.png
 
 MainMenu.panelHeader=/images/gui/mainmenu.png
 MainMenu.createNew=/images/gui/menu_new/create_new.png"
7679e6c2affe21f5179dbd1bedaac4cfa0b00436,Valadoc,"0.20.x: Add support for [GenericAccessors]
",a,https://github.com/GNOME/vala/,⚠️ Could not parse repo info
2daa05f2bd185e3de5c2e85afc86b2bc6194b41b,Valadoc,"gtkdoc: accept %
",a,https://github.com/GNOME/vala/,⚠️ Could not parse repo info
454302cf65c3c617149f28aee819549dd02f3680,Mylyn Reviews,"Move versions-task bridge to reviews
",p,https://github.com/eclipse-mylyn/org.eclipse.mylyn.reviews,"diff --git a/versions/org.eclipse.mylyn.versions.tasks-feature/.project b/versions/org.eclipse.mylyn.versions.tasks-feature/.project
new file mode 100644
index 00000000..dfb62cc5
--- /dev/null
+++ b/versions/org.eclipse.mylyn.versions.tasks-feature/.project
@@ -0,0 +1,17 @@
+
+
+	org.eclipse.mylyn.versions-feature
+	
+	
+	
+	
+		
+			org.eclipse.pde.FeatureBuilder
+			
+			
+		
+	
+	
+		org.eclipse.pde.FeatureNature
+	
+
diff --git a/versions/org.eclipse.mylyn.versions.tasks-feature/.settings/org.eclipse.jdt.core.prefs b/versions/org.eclipse.mylyn.versions.tasks-feature/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..bbaca6d6
--- /dev/null
+++ b/versions/org.eclipse.mylyn.versions.tasks-feature/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,357 @@
+#Wed Mar 02 16:00:06 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/versions/org.eclipse.mylyn.versions.tasks-feature/.settings/org.eclipse.jdt.ui.prefs b/versions/org.eclipse.mylyn.versions.tasks-feature/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000..f6c0a161
--- /dev/null
+++ b/versions/org.eclipse.mylyn.versions.tasks-feature/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,63 @@
+#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=

About This Content

License

Eclipse Foundation Software User Agreement

Usage Of Content

Applicable Licenses

Use of Provisioning Technology

Cryptography

About This Content

License

About This Content

License

Eclipse Foundation Software User Agreement

Usage Of Content

Applicable Licenses

Use of Provisioning Technology

Cryptography

About This Content

License