diff --git a/.gitignore b/.gitignore index e35ef8ef7..1c099caae 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ dependency-reduced-pom.xml target/ *.iml *.ipr +*.idea *.iws *.*~ bin/ diff --git a/README.md b/README.md index 1acded83c..76cbb9870 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,12 @@ Get Started 2. Include OCPSoft Rewrite in your application's POM file: - com.ocpsoft.rewrite + org.ocpsoft.rewrite rewrite-impl-servlet ${rewrite.version} -3. Add a configuration provider implementing the 'com.ocpsoft.rewrite.config.ConfigurationProvider' interface, or extending from the abstract HttpConfigurationProvider class for convenience: +3. Add a configuration provider implementing the 'org.ocpsoft.rewrite.config.ConfigurationProvider' interface, or extending from the abstract HttpConfigurationProvider class for convenience: package com.example; public class ExampleConfigurationProvider extends HttpConfigurationProvider @@ -55,13 +55,13 @@ Get Started } } -4. Create a file named: '/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider' which contains the fully qualified name of your ConfigurationProvider implementation: +4. Create a file named: '/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider' which contains the fully qualified name of your ConfigurationProvider implementation: - /META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider + /META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider --- com.example.ExampleConfigurationProvider -5. Add rules to your configuration. Condition objects such as 'Direction.isInbound()' and 'Path.matches(...)' can be found in the 'com.ocpsoft.rewrite.config.*' and 'com.ocpsoft.rewrite.servlet.config.*' packages. +5. Add rules to your configuration. Condition objects such as 'Direction.isInbound()' and 'Path.matches(...)' can be found in the 'org.ocpsoft.rewrite.config.*' and 'org.ocpsoft.rewrite.servlet.config.*' packages. 6. Consider using Rewrite extensions for extra power: * [JodaTime Integration](https://github.com/ocpsoft/rewrite/tree/master/config-jodatime) diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/RewriteLifecycleContext.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/RewriteLifecycleContext.java similarity index 70% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/RewriteLifecycleContext.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/RewriteLifecycleContext.java index f08d4dd8c..540d2d47f 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/RewriteLifecycleContext.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/RewriteLifecycleContext.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet; +package org.ocpsoft.rewrite.servlet; import java.util.List; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import com.ocpsoft.rewrite.context.Context; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer; -import com.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer; -import com.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper; -import com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; -import com.ocpsoft.rewrite.spi.RewriteProvider; +import org.ocpsoft.rewrite.context.Context; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer; +import org.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer; +import org.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper; +import org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; +import org.ocpsoft.rewrite.spi.RewriteProvider; /** * Stores implementations of all Rewrite lifecycle services. @@ -48,17 +48,17 @@ public interface RewriteLifecycleContext extends Context List> getRequestCycleWrappers(); /** - * Get all available {@link RewriteProvider} instances. + * Get all available {@link org.ocpsoft.rewrite.spi.RewriteProvider} instances. */ List> getRewriteProviders(); /** - * Get all available {@link InboundRewriteProducer} instances. + * Get all available {@link org.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer} instances. */ List> getInboundRewriteEventProducers(); /** - * Get all available {@link OutboundRewriteProducer} instances. + * Get all available {@link org.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer} instances. */ List> getOutboundProducers(); } diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/ServletRewriteProvider.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/ServletRewriteProvider.java similarity index 76% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/ServletRewriteProvider.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/ServletRewriteProvider.java index e696fcb12..d83f33535 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/ServletRewriteProvider.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/ServletRewriteProvider.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet; +package org.ocpsoft.rewrite.servlet; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.event.ServletRewrite; -import com.ocpsoft.rewrite.spi.RewriteProvider; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.event.ServletRewrite; +import org.ocpsoft.rewrite.spi.RewriteProvider; /** - * Abstract implementation of {@link RewriteProvider} which only handles {@link ServletRewrite} events. + * Abstract implementation of {@link org.ocpsoft.rewrite.spi.RewriteProvider} which only handles {@link org.ocpsoft.rewrite.servlet.event.ServletRewrite} events. * * @author Lincoln Baxter, III * diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/HttpCondition.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/HttpCondition.java similarity index 76% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/HttpCondition.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/HttpCondition.java index 749c6223b..820c28627 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/HttpCondition.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/HttpCondition.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; -import com.ocpsoft.rewrite.config.ConditionBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.config.ConditionBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * A condition that only applies to {@link HttpServletRewrite} events. @@ -28,7 +28,7 @@ public abstract class HttpCondition extends ConditionBuilder { /** - * Evaluate this condition against the given {@link HttpServletRewrite} event. If this condition does not apply to + * Evaluate this condition against the given {@link org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite} event. If this condition does not apply to * the given event, it must return false. If the condition applies and is satisfied, return true. */ public abstract boolean evaluateHttp(final HttpServletRewrite event, EvaluationContext context); diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationProvider.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationProvider.java similarity index 87% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationProvider.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationProvider.java index 8d57bfb4e..c4f0ff804 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationProvider.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationProvider.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.ConfigurationProvider; +import org.ocpsoft.rewrite.config.ConfigurationProvider; /** * Configuration provider for HTTP/Servlet environments. * - * @see ConfigurationProvider + * @see org.ocpsoft.rewrite.config.ConfigurationProvider * @author Lincoln Baxter, III * */ diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/HttpOperation.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/HttpOperation.java similarity index 81% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/HttpOperation.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/HttpOperation.java index b1ed3688f..58f8be331 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/HttpOperation.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/HttpOperation.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.config.OperationBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.config.OperationBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** - * An {@link Operation} that is only performed if the current {@link Rewrite} event is an instance of + * An {@link Operation} that is only performed if the current {@link org.ocpsoft.rewrite.event.Rewrite} event is an instance of * {@link HttpServletRewrite} * * @author Lincoln Baxter, III diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/BaseRewrite.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/BaseRewrite.java similarity index 87% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/BaseRewrite.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/BaseRewrite.java index 040ed70c0..ac1e3c17e 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/BaseRewrite.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/BaseRewrite.java @@ -13,17 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.event; +package org.ocpsoft.rewrite.servlet.event; import javax.servlet.RequestDispatcher; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import com.ocpsoft.rewrite.config.Rule; -import com.ocpsoft.rewrite.context.Context; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.exception.RewriteException; -import com.ocpsoft.rewrite.servlet.RewriteLifecycleContext; +import org.ocpsoft.rewrite.context.Context; +import org.ocpsoft.rewrite.exception.RewriteException; +import org.ocpsoft.rewrite.servlet.RewriteLifecycleContext; /** * Base implementation of {@link InboundServletRewriteEvent} @@ -59,7 +57,7 @@ public void abort() } /** - * Continue processing {@link Rule} definitions for the current {@link ServletRequest}, even if a call to + * Continue processing {@link org.ocpsoft.rewrite.config.Rule} definitions for the current {@link ServletRequest}, even if a call to * {@link #abort()}, {@link #handled()}, {@link #forward(String)}, or any other life-cycle control method has * previously been made. */ @@ -69,7 +67,7 @@ public void proceed() } /** - * Stop processing {@link Rule} definitions and pass control of the the current {@link ServletRequest} to the + * Stop processing {@link org.ocpsoft.rewrite.config.Rule} definitions and pass control of the the current {@link ServletRequest} to the * underlying application, even if a call to {@link #abort()}, {@link #proceed()}, {@link #forward(String)}, or any * other life-cycle control method has previously been made. */ @@ -79,7 +77,7 @@ public void handled() } /** - * Once {@link Rule} processing has completed, perform a + * Once {@link org.ocpsoft.rewrite.config.Rule} processing has completed, perform a * {@link RequestDispatcher#include(ServletRequest, ServletResponse)} of the given resource target. */ public void include(final String resource) @@ -89,7 +87,7 @@ public void include(final String resource) } /** - * Once {@link Rule} processing has completed, perform a + * Once {@link org.ocpsoft.rewrite.config.Rule} processing has completed, perform a * {@link RequestDispatcher#forward(ServletRequest, ServletResponse)} to the given resource target. */ public void forward(final String resource) @@ -235,7 +233,7 @@ public String toString() } /** - * Get the {@link Context} for the current {@link Rewrite}. + * Get the {@link org.ocpsoft.rewrite.context.Context} for the current {@link org.ocpsoft.rewrite.event.Rewrite}. */ public Context getRewriteContext() { diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/InboundServletRewrite.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/InboundServletRewrite.java similarity index 87% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/InboundServletRewrite.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/InboundServletRewrite.java index 9ef5c55f8..f626f285b 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/InboundServletRewrite.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/InboundServletRewrite.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.event; +package org.ocpsoft.rewrite.servlet.event; import javax.servlet.RequestDispatcher; import javax.servlet.ServletRequest; @@ -21,18 +21,17 @@ import javax.servlet.ServletResponse; import javax.servlet.ServletResponseWrapper; -import com.ocpsoft.rewrite.event.InboundRewrite; -import com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; -import com.ocpsoft.rewrite.spi.RewriteProvider; +import org.ocpsoft.rewrite.event.InboundRewrite; +import org.ocpsoft.rewrite.spi.RewriteProvider; /** - * Immutable event propagated to registered {@link RewriteLifecycleListener} and {@link RewriteProvider} instances when + * Immutable event propagated to registered {@link org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener} and {@link RewriteProvider} instances when * an inbound as the rewrite lifecycle is executed. * * @author Lincoln Baxter, III */ public interface InboundServletRewrite extends - InboundRewrite, ServletRewrite + InboundRewrite, ServletRewrite { /** diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/OutboundServletRewrite.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/OutboundServletRewrite.java similarity index 86% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/OutboundServletRewrite.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/OutboundServletRewrite.java index 32f9a121e..2f8220a29 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/OutboundServletRewrite.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/OutboundServletRewrite.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.event; +package org.ocpsoft.rewrite.servlet.event; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import com.ocpsoft.rewrite.event.OutboundRewrite; +import org.ocpsoft.rewrite.event.OutboundRewrite; /** * @author Lincoln Baxter, III */ public interface OutboundServletRewrite extends - OutboundRewrite, ServletRewrite + OutboundRewrite, ServletRewrite { } diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/ServletRewrite.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/ServletRewrite.java similarity index 93% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/ServletRewrite.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/ServletRewrite.java index a243e2d03..68b0345df 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/event/ServletRewrite.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/event/ServletRewrite.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.event; +package org.ocpsoft.rewrite.servlet.event; import javax.servlet.FilterChain; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.event.BaseRewrite.Flow; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.event.BaseRewrite.Flow; /** * @author Lincoln Baxter, III diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/HttpRequestCycleWrapper.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/HttpRequestCycleWrapper.java similarity index 83% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/HttpRequestCycleWrapper.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/HttpRequestCycleWrapper.java index e5e64ae4c..e1853ff05 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/HttpRequestCycleWrapper.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/HttpRequestCycleWrapper.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.http; +package org.ocpsoft.rewrite.servlet.http; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; -import com.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper; /** * @author Lincoln Baxter, III diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/HttpRewriteLifecycleListener.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/HttpRewriteLifecycleListener.java similarity index 85% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/HttpRewriteLifecycleListener.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/HttpRewriteLifecycleListener.java index 6ede557d8..301a92c16 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/HttpRewriteLifecycleListener.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/HttpRewriteLifecycleListener.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.http; +package org.ocpsoft.rewrite.servlet.http; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; -import com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; /** * A {@link RewriteLifecycleListener} that only listens on {@link HttpServletRequest} and {@link HttpServletResponse} diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/HttpRewriteProvider.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/HttpRewriteProvider.java similarity index 74% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/HttpRewriteProvider.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/HttpRewriteProvider.java index 8854ef983..e24a490a5 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/HttpRewriteProvider.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/HttpRewriteProvider.java @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.http; +package org.ocpsoft.rewrite.servlet.http; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.ServletRewriteProvider; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; -import com.ocpsoft.rewrite.spi.RewriteProvider; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.ServletRewriteProvider; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** - * A {@link RewriteProvider} that only operates on {@link HttpServletRequest} and {@link HttpServletResponse} request + * A {@link org.ocpsoft.rewrite.spi.RewriteProvider} that only operates on {@link HttpServletRequest} and {@link HttpServletResponse} request * cycle types. * * @author Lincoln Baxter, III diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/event/HttpInboundServletRewrite.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/event/HttpInboundServletRewrite.java similarity index 96% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/event/HttpInboundServletRewrite.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/event/HttpInboundServletRewrite.java index 8ac56e1db..3c6edba71 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/event/HttpInboundServletRewrite.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/event/HttpInboundServletRewrite.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.http.event; +package org.ocpsoft.rewrite.servlet.http.event; import java.io.OutputStream; @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ocpsoft.rewrite.servlet.event.InboundServletRewrite; +import org.ocpsoft.rewrite.servlet.event.InboundServletRewrite; /** * Rewrite event for an {@link HttpServletRequest}, {@link HttpServletResponse} lifecycle. diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/event/HttpOutboundServletRewrite.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/event/HttpOutboundServletRewrite.java similarity index 84% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/event/HttpOutboundServletRewrite.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/event/HttpOutboundServletRewrite.java index 11ff8a7d0..63715b5db 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/event/HttpOutboundServletRewrite.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/event/HttpOutboundServletRewrite.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.http.event; +package org.ocpsoft.rewrite.servlet.http.event; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ocpsoft.rewrite.servlet.event.OutboundServletRewrite; +import org.ocpsoft.rewrite.servlet.event.OutboundServletRewrite; /** * @author Lincoln Baxter, III */ public interface HttpOutboundServletRewrite extends - OutboundServletRewrite, HttpServletRewrite + OutboundServletRewrite, HttpServletRewrite { /** * Get the outbound URL to be rewritten. diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/event/HttpServletRewrite.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/event/HttpServletRewrite.java similarity index 92% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/event/HttpServletRewrite.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/event/HttpServletRewrite.java index 8837700d6..34f205fe4 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/http/event/HttpServletRewrite.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/http/event/HttpServletRewrite.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.http.event; +package org.ocpsoft.rewrite.servlet.http.event; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ocpsoft.rewrite.servlet.event.ServletRewrite; +import org.ocpsoft.rewrite.servlet.event.ServletRewrite; /** * @author Lincoln Baxter, III * */ public interface HttpServletRewrite extends - ServletRewrite + ServletRewrite { /** * Return the application context root {@link HttpServletRequest#getContextPath()} diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/ContextListener.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/ContextListener.java similarity index 95% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/ContextListener.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/ContextListener.java index 9b45c59c9..81861d638 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/ContextListener.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/ContextListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.spi; +package org.ocpsoft.rewrite.servlet.spi; import javax.servlet.ServletContextEvent; diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/InboundRewriteProducer.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/InboundRewriteProducer.java similarity index 91% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/InboundRewriteProducer.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/InboundRewriteProducer.java index 1a8a6baba..6b3dd77d1 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/InboundRewriteProducer.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/InboundRewriteProducer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.spi; +package org.ocpsoft.rewrite.servlet.spi; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -21,7 +21,7 @@ import org.ocpsoft.common.pattern.Specialized; import org.ocpsoft.common.pattern.Weighted; -import com.ocpsoft.rewrite.servlet.event.InboundServletRewrite; +import org.ocpsoft.rewrite.servlet.event.InboundServletRewrite; /** * @author Lincoln Baxter, III diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/OutboundRewriteProducer.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/OutboundRewriteProducer.java similarity index 91% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/OutboundRewriteProducer.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/OutboundRewriteProducer.java index 066dd6e6d..a9b8f0dbc 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/OutboundRewriteProducer.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/OutboundRewriteProducer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.spi; +package org.ocpsoft.rewrite.servlet.spi; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -21,7 +21,7 @@ import org.ocpsoft.common.pattern.Specialized; import org.ocpsoft.common.pattern.Weighted; -import com.ocpsoft.rewrite.servlet.event.OutboundServletRewrite; +import org.ocpsoft.rewrite.servlet.event.OutboundServletRewrite; /** * @author Lincoln Baxter, III diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RequestCycleWrapper.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RequestCycleWrapper.java similarity index 93% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RequestCycleWrapper.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RequestCycleWrapper.java index 8039767a0..da6e1b3db 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RequestCycleWrapper.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RequestCycleWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.spi; +package org.ocpsoft.rewrite.servlet.spi; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -21,7 +21,7 @@ import org.ocpsoft.common.pattern.Specialized; import org.ocpsoft.common.pattern.Weighted; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RequestListener.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RequestListener.java similarity index 95% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RequestListener.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RequestListener.java index 1648fbc06..27a93a852 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RequestListener.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RequestListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.spi; +package org.ocpsoft.rewrite.servlet.spi; import javax.servlet.ServletRequestEvent; diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RequestParameterProvider.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RequestParameterProvider.java similarity index 97% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RequestParameterProvider.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RequestParameterProvider.java index d9422f0c1..8d13dec03 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RequestParameterProvider.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RequestParameterProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.spi; +package org.ocpsoft.rewrite.servlet.spi; import java.util.Map; diff --git a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RewriteLifecycleListener.java b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RewriteLifecycleListener.java similarity index 74% rename from api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RewriteLifecycleListener.java rename to api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RewriteLifecycleListener.java index 7b2838cd3..0409ce3f9 100644 --- a/api-servlet/src/main/java/com/ocpsoft/rewrite/servlet/spi/RewriteLifecycleListener.java +++ b/api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/spi/RewriteLifecycleListener.java @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.spi; +package org.ocpsoft.rewrite.servlet.spi; import javax.servlet.FilterChain; import org.ocpsoft.common.pattern.Specialized; import org.ocpsoft.common.pattern.Weighted; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.spi.RewriteProvider; +import org.ocpsoft.rewrite.event.Rewrite; /** - * Listens to {@link Rewrite} life-cycle events. + * Listens to {@link org.ocpsoft.rewrite.event.Rewrite} life-cycle events. * * @author Lincoln Baxter, III */ @@ -36,24 +35,24 @@ public interface RewriteLifecycleListener extends Specialized void beforeInboundLifecycle(T event); /** - * Invoked after {@link RequestCycleWrapper} services are processed, but before {@link RewriteProvider} services are + * Invoked after {@link RequestCycleWrapper} services are processed, but before {@link org.ocpsoft.rewrite.spi.RewriteProvider} services are * processed for inbound {@link Rewrite} requests. */ void beforeInboundRewrite(T event); /** - * Invoked after {@link RewriteProvider} services are processed on inbound {@link Rewrite} requests, but before + * Invoked after {@link org.ocpsoft.rewrite.spi.RewriteProvider} services are processed on inbound {@link Rewrite} requests, but before * control of the request cycle is passed to the application via {@link FilterChain#doFilter(IN, OUT)} */ void afterInboundRewrite(T event); /** - * Invoked before {@link RewriteProvider} services are processed on outbound {@link Rewrite} events. + * Invoked before {@link org.ocpsoft.rewrite.spi.RewriteProvider} services are processed on outbound {@link Rewrite} events. */ void beforeOutboundRewrite(T event); /** - * Invoked after {@link RewriteProvider} services are processed on outbound {@link Rewrite} events. + * Invoked after {@link org.ocpsoft.rewrite.spi.RewriteProvider} services are processed on outbound {@link Rewrite} events. */ void afterOutboundRewrite(T event); diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/config/NullValueConfigurationProvider.java b/api-tests/src/test/java/com/ocpsoft/rewrite/config/NullValueConfigurationProvider.java deleted file mode 100644 index 547a9f091..000000000 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/config/NullValueConfigurationProvider.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.config; - - -/** - * @author Lincoln Baxter, III - * - */ -public class NullValueConfigurationProvider implements ConfigurationProvider -{ - - public int priority() - { - return 0; - } - - @Override - public boolean handles(final Object payload) - { - return true; - } - - @Override - public Configuration getConfiguration(final Object context) - { - return null; - } - -} diff --git a/api/src/test/java/com/ocpsoft/rewrite/Root.java b/api-tests/src/test/java/org/ocpsoft/rewrite/Root.java similarity index 96% rename from api/src/test/java/com/ocpsoft/rewrite/Root.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/Root.java index 361911b97..3b9b39689 100644 --- a/api/src/test/java/com/ocpsoft/rewrite/Root.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/Root.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite; +package org.ocpsoft.rewrite; /** * Marker interface declaring the root package of this project. diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/bind/BindingsTest.java b/api-tests/src/test/java/org/ocpsoft/rewrite/bind/BindingsTest.java similarity index 96% rename from api-tests/src/test/java/com/ocpsoft/rewrite/bind/BindingsTest.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/bind/BindingsTest.java index 8cf96ee15..dfc05fca1 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/bind/BindingsTest.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/bind/BindingsTest.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.mock.MockBinding; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.mock.MockRewrite; +import org.ocpsoft.rewrite.config.Condition; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.mock.MockBinding; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.mock.MockRewrite; /** * @author Lincoln Baxter, III diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/config/AndTest.java b/api-tests/src/test/java/org/ocpsoft/rewrite/config/AndTest.java similarity index 97% rename from api-tests/src/test/java/com/ocpsoft/rewrite/config/AndTest.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/config/AndTest.java index aba576b85..93e8f5181 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/config/AndTest.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/config/AndTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import org.junit.Assert; import org.junit.Test; diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/config/ConfigurationBuilderTest.java b/api-tests/src/test/java/org/ocpsoft/rewrite/config/ConfigurationBuilderTest.java similarity index 87% rename from api-tests/src/test/java/com/ocpsoft/rewrite/config/ConfigurationBuilderTest.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/config/ConfigurationBuilderTest.java index a6bf6ed5a..21b361dee 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/config/ConfigurationBuilderTest.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/config/ConfigurationBuilderTest.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import junit.framework.Assert; import org.junit.Test; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.InboundRewrite; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.InboundRewrite; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; /** * @author Lincoln Baxter, III diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/config/ConfigurationLoaderTest.java b/api-tests/src/test/java/org/ocpsoft/rewrite/config/ConfigurationLoaderTest.java similarity index 80% rename from api-tests/src/test/java/com/ocpsoft/rewrite/config/ConfigurationLoaderTest.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/config/ConfigurationLoaderTest.java index 965d1f3e6..490bc59d3 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/config/ConfigurationLoaderTest.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/config/ConfigurationLoaderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; @@ -22,9 +22,9 @@ import org.junit.Assert; import org.junit.Test; -import com.ocpsoft.rewrite.Root; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.Root; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -38,8 +38,8 @@ public static WebArchive getDeployment() { WebArchive deployment = RewriteTestBase.getDeployment() .addPackages(true, Root.class.getPackage()) - .addAsResource(new StringAsset("com.ocpsoft.rewrite.config.NullValueConfigurationProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + .addAsResource(new StringAsset("NullValueConfigurationProvider"), + "/META-INF/services/ConfigurationProvider"); return deployment; } diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/config/DirectionTest.java b/api-tests/src/test/java/org/ocpsoft/rewrite/config/DirectionTest.java similarity index 94% rename from api-tests/src/test/java/com/ocpsoft/rewrite/config/DirectionTest.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/config/DirectionTest.java index 06a5f5d08..9748451ef 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/config/DirectionTest.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/config/DirectionTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import org.junit.Assert; import org.junit.Test; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; /** * @author Lincoln Baxter, III diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/config/MockInboundRewrite.java b/api-tests/src/test/java/org/ocpsoft/rewrite/config/MockInboundRewrite.java similarity index 87% rename from api-tests/src/test/java/com/ocpsoft/rewrite/config/MockInboundRewrite.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/config/MockInboundRewrite.java index c8234341f..44c2750ef 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/config/MockInboundRewrite.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/config/MockInboundRewrite.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.Context; -import com.ocpsoft.rewrite.event.InboundRewrite; +import org.ocpsoft.rewrite.context.Context; +import org.ocpsoft.rewrite.event.InboundRewrite; /** * @author Lincoln Baxter, III diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/config/MockOutboundRewrite.java b/api-tests/src/test/java/org/ocpsoft/rewrite/config/MockOutboundRewrite.java similarity index 87% rename from api-tests/src/test/java/com/ocpsoft/rewrite/config/MockOutboundRewrite.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/config/MockOutboundRewrite.java index 860746456..c3b59cfa9 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/config/MockOutboundRewrite.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/config/MockOutboundRewrite.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.Context; -import com.ocpsoft.rewrite.event.OutboundRewrite; +import org.ocpsoft.rewrite.context.Context; +import org.ocpsoft.rewrite.event.OutboundRewrite; /** * @author Lincoln Baxter, III diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/config/MockRewrite.java b/api-tests/src/test/java/org/ocpsoft/rewrite/config/MockRewrite.java similarity index 87% rename from api-tests/src/test/java/com/ocpsoft/rewrite/config/MockRewrite.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/config/MockRewrite.java index 507bf035b..1cfde69f1 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/config/MockRewrite.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/config/MockRewrite.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.Context; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.Context; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/config/MockRewriteContext.java b/api-tests/src/test/java/org/ocpsoft/rewrite/config/MockRewriteContext.java similarity index 90% rename from api-tests/src/test/java/com/ocpsoft/rewrite/config/MockRewriteContext.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/config/MockRewriteContext.java index ad2f0591d..50ca354eb 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/config/MockRewriteContext.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/config/MockRewriteContext.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.ContextBase; +import org.ocpsoft.rewrite.context.ContextBase; /** * @author Lincoln Baxter, III diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/config/NotTest.java b/api-tests/src/test/java/org/ocpsoft/rewrite/config/NotTest.java similarity index 93% rename from api-tests/src/test/java/com/ocpsoft/rewrite/config/NotTest.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/config/NotTest.java index da6e0e416..d290ff0a8 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/config/NotTest.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/config/NotTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import org.junit.Assert; import org.junit.Test; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; /** * @author Lincoln Baxter, III diff --git a/api-tests/src/test/java/org/ocpsoft/rewrite/config/NullValueConfigurationProvider.java b/api-tests/src/test/java/org/ocpsoft/rewrite/config/NullValueConfigurationProvider.java new file mode 100644 index 000000000..94b107651 --- /dev/null +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/config/NullValueConfigurationProvider.java @@ -0,0 +1,28 @@ +package org.ocpsoft.rewrite.config; + + +/** + * @author Lincoln Baxter, III + * + */ +public class NullValueConfigurationProvider implements ConfigurationProvider +{ + + public int priority() + { + return 0; + } + + @Override + public boolean handles(final Object payload) + { + return true; + } + + @Override + public Configuration getConfiguration(final Object context) + { + return null; + } + +} diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/config/OrTest.java b/api-tests/src/test/java/org/ocpsoft/rewrite/config/OrTest.java similarity index 93% rename from api-tests/src/test/java/com/ocpsoft/rewrite/config/OrTest.java rename to api-tests/src/test/java/org/ocpsoft/rewrite/config/OrTest.java index 3326a62e7..607c24bac 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/config/OrTest.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/config/OrTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import org.junit.Assert; import org.junit.Test; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; /** * @author Lincoln Baxter, III diff --git a/api-tests/src/test/resources/META-INF/services/com.ocpsoft.rewrite.services.DummyService b/api-tests/src/test/resources/META-INF/services/com.ocpsoft.rewrite.services.DummyService deleted file mode 100644 index b6bed66da..000000000 --- a/api-tests/src/test/resources/META-INF/services/com.ocpsoft.rewrite.services.DummyService +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.services.DummyServiceImpl \ No newline at end of file diff --git a/api/src/main/java/com/ocpsoft/rewrite/param/Constraint.java b/api/src/main/java/com/ocpsoft/rewrite/param/Constraint.java deleted file mode 100644 index 52a647769..000000000 --- a/api/src/main/java/com/ocpsoft/rewrite/param/Constraint.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.param; - -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; - -/** - * @author Lincoln Baxter, III - * - */ -public interface Constraint -{ - /** - * Return true if this {@link Constraint} is satisfied by the given value; otherwise, return false. - */ - boolean isSatisfiedBy(Rewrite event, EvaluationContext context, String value); -} diff --git a/api/src/main/java/com/ocpsoft/rewrite/param/Transform.java b/api/src/main/java/com/ocpsoft/rewrite/param/Transform.java deleted file mode 100644 index 52eecdddd..000000000 --- a/api/src/main/java/com/ocpsoft/rewrite/param/Transform.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.param; - -import com.ocpsoft.rewrite.bind.Converter; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; - -/** - * Used to perform operations on values (Cannot be used to change the type of the value, for that, see the - * {@link Converter} API.) - * - * @author Lincoln Baxter, III - * - */ -public interface Transform -{ - /** - * Perform an operation on the given value. - */ - S transform(Rewrite event, EvaluationContext context, S value); -} diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/Bindable.java b/api/src/main/java/org/ocpsoft/rewrite/bind/Bindable.java similarity index 96% rename from api/src/main/java/com/ocpsoft/rewrite/bind/Bindable.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/Bindable.java index 1f8214d50..8a3627e47 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/Bindable.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/Bindable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; import java.util.List; diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/Binding.java b/api/src/main/java/org/ocpsoft/rewrite/bind/Binding.java similarity index 97% rename from api/src/main/java/com/ocpsoft/rewrite/bind/Binding.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/Binding.java index f3f242889..485f3b816 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/Binding.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/Binding.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; /** * Interface declaring the common tasks that must be performed when evaluating any {@link Binding} diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/BindingBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/bind/BindingBuilder.java similarity index 96% rename from api/src/main/java/com/ocpsoft/rewrite/bind/BindingBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/BindingBuilder.java index 9ca910e65..45536df24 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/BindingBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/BindingBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; import java.lang.reflect.Array; import java.util.Collection; @@ -21,9 +21,9 @@ import org.ocpsoft.common.services.ServiceLoader; import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.exception.RewriteException; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.exception.RewriteException; /** * @author Lincoln Baxter, III diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/Bindings.java b/api/src/main/java/org/ocpsoft/rewrite/bind/Bindings.java similarity index 96% rename from api/src/main/java/com/ocpsoft/rewrite/bind/Bindings.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/Bindings.java index 67a572b94..7260151e1 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/Bindings.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/Bindings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -21,12 +21,12 @@ import java.util.Map; import java.util.Map.Entry; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.config.ConditionBuilder; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.exception.RewriteException; +import org.ocpsoft.rewrite.config.Condition; +import org.ocpsoft.rewrite.config.ConditionBuilder; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.exception.RewriteException; /** * Utility class for interacting with {@link Bindable} instances. @@ -52,7 +52,7 @@ public static void enqueueSubmission(final Rewrite event, final EvaluationContex /** * Submit the given value to all registered {@link Binding} instances of all given {@link Bindable} instances. * Perform this by adding individual {@link BindingOperation} instances via - * {@link EvaluationContext#addPreOperation(Operation)} + * {@link EvaluationContext#addPreOperation(org.ocpsoft.rewrite.config.Operation)} * * @return false if validation fails. */ diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/Converter.java b/api/src/main/java/org/ocpsoft/rewrite/bind/Converter.java similarity index 88% rename from api/src/main/java/com/ocpsoft/rewrite/bind/Converter.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/Converter.java index 9c668cc5b..bf6b8715b 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/Converter.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/Converter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * A converter for {@link Binding} instances. diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/DefaultBindable.java b/api/src/main/java/org/ocpsoft/rewrite/bind/DefaultBindable.java similarity index 97% rename from api/src/main/java/com/ocpsoft/rewrite/bind/DefaultBindable.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/DefaultBindable.java index 07a6f40b2..b79e0e7ad 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/DefaultBindable.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/DefaultBindable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; import java.util.LinkedList; import java.util.List; diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/DefaultConverter.java b/api/src/main/java/org/ocpsoft/rewrite/bind/DefaultConverter.java similarity index 88% rename from api/src/main/java/com/ocpsoft/rewrite/bind/DefaultConverter.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/DefaultConverter.java index 89874f7f3..ae3798909 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/DefaultConverter.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/DefaultConverter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * A no-operation {@link Converter} that always returns the given value unchanged. diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/DefaultValidator.java b/api/src/main/java/org/ocpsoft/rewrite/bind/DefaultValidator.java similarity index 88% rename from api/src/main/java/com/ocpsoft/rewrite/bind/DefaultValidator.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/DefaultValidator.java index 6cc4b069b..373703776 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/DefaultValidator.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/DefaultValidator.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * A no-operation {@link Validator} that returns true for any given value. diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/El.java b/api/src/main/java/org/ocpsoft/rewrite/bind/El.java similarity index 97% rename from api/src/main/java/com/ocpsoft/rewrite/bind/El.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/El.java index fdebe5db5..532a95d10 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/El.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/El.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; import java.util.List; @@ -21,11 +21,11 @@ import org.ocpsoft.common.util.Iterators; import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.exception.RewriteException; -import com.ocpsoft.rewrite.exception.UnsupportedEvaluationException; -import com.ocpsoft.rewrite.spi.ExpressionLanguageProvider; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.exception.RewriteException; +import org.ocpsoft.rewrite.exception.UnsupportedEvaluationException; +import org.ocpsoft.rewrite.spi.ExpressionLanguageProvider; /** * Responsible for binding to EL expressions. diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/Evaluation.java b/api/src/main/java/org/ocpsoft/rewrite/bind/Evaluation.java similarity index 95% rename from api/src/main/java/com/ocpsoft/rewrite/bind/Evaluation.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/Evaluation.java index c60a4d4e6..0483371bd 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/Evaluation.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/Evaluation.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; import java.util.Arrays; import java.util.List; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * // TODO arquillian test diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/Retrieval.java b/api/src/main/java/org/ocpsoft/rewrite/bind/Retrieval.java similarity index 88% rename from api/src/main/java/com/ocpsoft/rewrite/bind/Retrieval.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/Retrieval.java index b9ca4b248..69a5de903 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/Retrieval.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/Retrieval.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * Defines the methods necessary to perform {@link Binding} value retrieval. diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/RetrievalBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/bind/RetrievalBuilder.java similarity index 96% rename from api/src/main/java/com/ocpsoft/rewrite/bind/RetrievalBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/RetrievalBuilder.java index 81fd5fe53..4834d32e8 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/RetrievalBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/RetrievalBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; /** * Defines methods used when building {@link Retrieval} objects. diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/Submission.java b/api/src/main/java/org/ocpsoft/rewrite/bind/Submission.java similarity index 91% rename from api/src/main/java/com/ocpsoft/rewrite/bind/Submission.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/Submission.java index 37126af02..3d5406add 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/Submission.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/Submission.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * Defines the methods necessary to perform, converted, validated {@link Binding} value submission. diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/SubmissionBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/bind/SubmissionBuilder.java similarity index 96% rename from api/src/main/java/com/ocpsoft/rewrite/bind/SubmissionBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/SubmissionBuilder.java index 3e7d4e5c1..53cc8704a 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/SubmissionBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/SubmissionBuilder.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; /** * Defines methods used when building {@link Submission} objects. diff --git a/api/src/main/java/com/ocpsoft/rewrite/bind/Validator.java b/api/src/main/java/org/ocpsoft/rewrite/bind/Validator.java similarity index 86% rename from api/src/main/java/com/ocpsoft/rewrite/bind/Validator.java rename to api/src/main/java/org/ocpsoft/rewrite/bind/Validator.java index 5ac59ad8a..41a0e9ac8 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/bind/Validator.java +++ b/api/src/main/java/org/ocpsoft/rewrite/bind/Validator.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/And.java b/api/src/main/java/org/ocpsoft/rewrite/config/And.java similarity index 93% rename from api/src/main/java/com/ocpsoft/rewrite/config/And.java rename to api/src/main/java/org/ocpsoft/rewrite/config/And.java index 79f402395..8d547468e 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/And.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/And.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import java.util.Arrays; import java.util.List; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * Evaluates all provided conditions. If all provided conditions return true, this condition returns true. If any diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/Condition.java b/api/src/main/java/org/ocpsoft/rewrite/config/Condition.java similarity index 81% rename from api/src/main/java/com/ocpsoft/rewrite/config/Condition.java rename to api/src/main/java/org/ocpsoft/rewrite/config/Condition.java index 98545f4b0..ce1996047 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/Condition.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/Condition.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * A condition that must be met in order for evaluation to return true. You may create custom {@link Condition} @@ -28,7 +28,7 @@ public interface Condition { /** - * Evaluate this condition against the given {@link Rewrite} event. If this condition does not apply to the given + * Evaluate this condition against the given {@link org.ocpsoft.rewrite.event.Rewrite} event. If this condition does not apply to the given * event, it must return false. If the condition applies and is satisfied, return true. */ boolean evaluate(Rewrite event, EvaluationContext context); diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/ConditionBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/config/ConditionBuilder.java similarity index 98% rename from api/src/main/java/com/ocpsoft/rewrite/config/ConditionBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/config/ConditionBuilder.java index 559459520..84adac77b 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/ConditionBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/ConditionBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; /** * Used as a base class to create fluent relationships between {@link Condition} objects; this class adds logical diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/Configuration.java b/api/src/main/java/org/ocpsoft/rewrite/config/Configuration.java similarity index 96% rename from api/src/main/java/com/ocpsoft/rewrite/config/Configuration.java rename to api/src/main/java/org/ocpsoft/rewrite/config/Configuration.java index 15e3c9ee0..6505acc71 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/Configuration.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/Configuration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import java.util.List; diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationBuilder.java similarity index 97% rename from api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationBuilder.java index 57d3760cf..ee8856b7a 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationLoader.java b/api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationLoader.java similarity index 98% rename from api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationLoader.java rename to api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationLoader.java index bede04fce..0d8245875 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationLoader.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationLoader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import java.util.Collections; import java.util.List; diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationProvider.java b/api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationProvider.java similarity index 91% rename from api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationProvider.java rename to api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationProvider.java index 32ce29db2..f19ff582f 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationProvider.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import org.ocpsoft.common.pattern.Specialized; import org.ocpsoft.common.pattern.Weighted; @@ -24,7 +24,7 @@ * Additional configuration providers my be specified by providing a service activator file containing the name of your * implementations: *

- * /META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider
+ * /META-INF/services/ConfigurationProvider
* * --------------
* com.example.ConfigurationProviderImpl diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationRuleBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationRuleBuilder.java similarity index 98% rename from api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationRuleBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationRuleBuilder.java index d0c1e5a81..f1eb52578 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/ConfigurationRuleBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/ConfigurationRuleBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import java.util.List; diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/Direction.java b/api/src/main/java/org/ocpsoft/rewrite/config/Direction.java similarity index 79% rename from api/src/main/java/com/ocpsoft/rewrite/config/Direction.java rename to api/src/main/java/org/ocpsoft/rewrite/config/Direction.java index 13cead4d5..badf18812 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/Direction.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/Direction.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.InboundRewrite; -import com.ocpsoft.rewrite.event.OutboundRewrite; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.InboundRewrite; +import org.ocpsoft.rewrite.event.OutboundRewrite; +import org.ocpsoft.rewrite.event.Rewrite; /** - * Responsible for evaluating {@link Rewrite} events on whether they are {@link InboundRewrite} or + * Responsible for evaluating {@link Rewrite} events on whether they are {@link org.ocpsoft.rewrite.event.InboundRewrite} or * {@link OutboundRewrite} events. * * @author Lincoln Baxter, III @@ -29,7 +29,7 @@ public abstract class Direction extends ConditionBuilder { /** - * Returns a new {@link Condition} that returns true when operating on an {@link InboundRewrite} event. + * Returns a new {@link Condition} that returns true when operating on an {@link org.ocpsoft.rewrite.event.InboundRewrite} event. */ public static Direction isInbound() { @@ -37,7 +37,7 @@ public static Direction isInbound() } /** - * Returns a new {@link Condition} that returns true when operating on an {@link OutboundRewrite} event. + * Returns a new {@link Condition} that returns true when operating on an {@link org.ocpsoft.rewrite.event.OutboundRewrite} event. */ public static Direction isOutbound() { diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/False.java b/api/src/main/java/org/ocpsoft/rewrite/config/False.java similarity index 87% rename from api/src/main/java/com/ocpsoft/rewrite/config/False.java rename to api/src/main/java/org/ocpsoft/rewrite/config/False.java index 84c793d87..e7af8818e 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/False.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/False.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * Condition that always returns false. diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/InboundOperation.java b/api/src/main/java/org/ocpsoft/rewrite/config/InboundOperation.java similarity index 76% rename from api/src/main/java/com/ocpsoft/rewrite/config/InboundOperation.java rename to api/src/main/java/org/ocpsoft/rewrite/config/InboundOperation.java index 5281331f8..0b3677ebc 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/InboundOperation.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/InboundOperation.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.InboundRewrite; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.InboundRewrite; +import org.ocpsoft.rewrite.event.Rewrite; /** - * An operation that is only performed if the current {@link Rewrite} event is an {@link InboundRewrite} event. + * An operation that is only performed if the current {@link org.ocpsoft.rewrite.event.Rewrite} event is an {@link org.ocpsoft.rewrite.event.InboundRewrite} event. * * @author Lincoln Baxter, III * diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/Invoke.java b/api/src/main/java/org/ocpsoft/rewrite/config/Invoke.java similarity index 89% rename from api/src/main/java/com/ocpsoft/rewrite/config/Invoke.java rename to api/src/main/java/org/ocpsoft/rewrite/config/Invoke.java index eaefbc272..00545107b 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/Invoke.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/Invoke.java @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import org.ocpsoft.common.services.ServiceLoader; import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.bind.Retrieval; -import com.ocpsoft.rewrite.bind.Submission; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.spi.InvocationResultHandler; +import org.ocpsoft.rewrite.bind.Retrieval; +import org.ocpsoft.rewrite.bind.Submission; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.spi.InvocationResultHandler; /** - * Builds {@link Operation} instances used to directly invoke {@link Binding} submission or retrieval on {@link Rewrite} + * Builds {@link Operation} instances used to directly invoke {@link org.ocpsoft.rewrite.bind.Binding} submission or retrieval on {@link org.ocpsoft.rewrite.event.Rewrite} * events. * * @author Lincoln Baxter, III diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/Not.java b/api/src/main/java/org/ocpsoft/rewrite/config/Not.java similarity index 90% rename from api/src/main/java/com/ocpsoft/rewrite/config/Not.java rename to api/src/main/java/org/ocpsoft/rewrite/config/Not.java index cba0ce6f7..53fecf862 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/Not.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/Not.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * Evaluates all conditions. diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/Operation.java b/api/src/main/java/org/ocpsoft/rewrite/config/Operation.java similarity index 79% rename from api/src/main/java/com/ocpsoft/rewrite/config/Operation.java rename to api/src/main/java/org/ocpsoft/rewrite/config/Operation.java index 380b12618..703fd9857 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/Operation.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/Operation.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** - * Defines an operation to be performed during a {@link Rewrite} event. + * Defines an operation to be performed during a {@link org.ocpsoft.rewrite.event.Rewrite} event. * * @author Lincoln Baxter, III * diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/OperationBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/config/OperationBuilder.java similarity index 92% rename from api/src/main/java/com/ocpsoft/rewrite/config/OperationBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/config/OperationBuilder.java index c50cbf19a..eb8403e7c 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/OperationBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/OperationBuilder.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * Abstract builder for fluently defining new composite {@link Operation} instances. diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/Or.java b/api/src/main/java/org/ocpsoft/rewrite/config/Or.java similarity index 92% rename from api/src/main/java/com/ocpsoft/rewrite/config/Or.java rename to api/src/main/java/org/ocpsoft/rewrite/config/Or.java index 14c01bc2f..3c0c4ee9b 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/Or.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/Or.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import java.util.Arrays; import java.util.List; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * Evaluates all provided conditions. If any return true, this condition returns true. diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/OutboundOperation.java b/api/src/main/java/org/ocpsoft/rewrite/config/OutboundOperation.java similarity index 78% rename from api/src/main/java/com/ocpsoft/rewrite/config/OutboundOperation.java rename to api/src/main/java/org/ocpsoft/rewrite/config/OutboundOperation.java index 8a717b5b5..7df361f71 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/OutboundOperation.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/OutboundOperation.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.OutboundRewrite; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.OutboundRewrite; +import org.ocpsoft.rewrite.event.Rewrite; /** - * An operation that is only performed if the current {@link Rewrite} event is an {@link OutboundRewrite} event. + * An operation that is only performed if the current {@link org.ocpsoft.rewrite.event.Rewrite} event is an {@link OutboundRewrite} event. * * @author Lincoln Baxter, III * diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/Rule.java b/api/src/main/java/org/ocpsoft/rewrite/config/Rule.java similarity index 90% rename from api/src/main/java/com/ocpsoft/rewrite/config/Rule.java rename to api/src/main/java/org/ocpsoft/rewrite/config/Rule.java index 77ba8ac6c..d37b474d3 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/Rule.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/Rule.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * Encapsulates correlated {@link Condition} and {@link Operation} instances. diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/RuleBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/config/RuleBuilder.java similarity index 94% rename from api/src/main/java/com/ocpsoft/rewrite/config/RuleBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/config/RuleBuilder.java index dc21b84f1..b1cdebde7 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/RuleBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/RuleBuilder.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * Builder for fluently defining new composite {@link Rule} instances. diff --git a/api/src/main/java/com/ocpsoft/rewrite/config/True.java b/api/src/main/java/org/ocpsoft/rewrite/config/True.java similarity index 87% rename from api/src/main/java/com/ocpsoft/rewrite/config/True.java rename to api/src/main/java/org/ocpsoft/rewrite/config/True.java index 03c96926d..b9da386e7 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/config/True.java +++ b/api/src/main/java/org/ocpsoft/rewrite/config/True.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * Condition that always returns true. diff --git a/api/src/main/java/com/ocpsoft/rewrite/context/Context.java b/api/src/main/java/org/ocpsoft/rewrite/context/Context.java similarity index 96% rename from api/src/main/java/com/ocpsoft/rewrite/context/Context.java rename to api/src/main/java/org/ocpsoft/rewrite/context/Context.java index 1cc168bc9..c1dc771cf 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/context/Context.java +++ b/api/src/main/java/org/ocpsoft/rewrite/context/Context.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.context; +package org.ocpsoft.rewrite.context; /** * @author Lincoln Baxter, III diff --git a/api/src/main/java/com/ocpsoft/rewrite/context/ContextBase.java b/api/src/main/java/org/ocpsoft/rewrite/context/ContextBase.java similarity index 97% rename from api/src/main/java/com/ocpsoft/rewrite/context/ContextBase.java rename to api/src/main/java/org/ocpsoft/rewrite/context/ContextBase.java index 948321a18..daba3eda1 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/context/ContextBase.java +++ b/api/src/main/java/org/ocpsoft/rewrite/context/ContextBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.context; +package org.ocpsoft.rewrite.context; import java.util.HashMap; import java.util.Map; diff --git a/api/src/main/java/com/ocpsoft/rewrite/context/EvaluationContext.java b/api/src/main/java/org/ocpsoft/rewrite/context/EvaluationContext.java similarity index 73% rename from api/src/main/java/com/ocpsoft/rewrite/context/EvaluationContext.java rename to api/src/main/java/org/ocpsoft/rewrite/context/EvaluationContext.java index 356fa2664..6e446d945 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/context/EvaluationContext.java +++ b/api/src/main/java/org/ocpsoft/rewrite/context/EvaluationContext.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.context; +package org.ocpsoft.rewrite.context; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.config.Condition; +import org.ocpsoft.rewrite.config.Operation; /** * Context object spanning the lifecycle of a single rule evaluation. This includes both {@link Condition} evaluation @@ -27,13 +27,13 @@ public interface EvaluationContext extends Context { /** - * Add a new {@link Operation} to be performed if all conditions of this rule are met. Pre-Operation instances are + * Add a new {@link org.ocpsoft.rewrite.config.Operation} to be performed if all conditions of this rule are met. Pre-Operation instances are * performed before the standard {@link Operation}. */ void addPreOperation(Operation operation); /** - * Add a new {@link Operation} to be performed if all conditions of this rule are met. Post-Operation instances are + * Add a new {@link org.ocpsoft.rewrite.config.Operation} to be performed if all conditions of this rule are met. Post-Operation instances are * performed after the standard {@link Operation}. */ void addPostOperation(Operation operation); diff --git a/api/src/main/java/com/ocpsoft/rewrite/convert/IntegerConverter.java b/api/src/main/java/org/ocpsoft/rewrite/convert/IntegerConverter.java similarity index 86% rename from api/src/main/java/com/ocpsoft/rewrite/convert/IntegerConverter.java rename to api/src/main/java/org/ocpsoft/rewrite/convert/IntegerConverter.java index 4ec7a8061..862473f4b 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/convert/IntegerConverter.java +++ b/api/src/main/java/org/ocpsoft/rewrite/convert/IntegerConverter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.convert; +package org.ocpsoft.rewrite.convert; -import com.ocpsoft.rewrite.bind.Converter; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.bind.Converter; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/api/src/main/java/com/ocpsoft/rewrite/event/InboundRewrite.java b/api/src/main/java/org/ocpsoft/rewrite/event/InboundRewrite.java similarity index 96% rename from api/src/main/java/com/ocpsoft/rewrite/event/InboundRewrite.java rename to api/src/main/java/org/ocpsoft/rewrite/event/InboundRewrite.java index a39208ea1..a817494ab 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/event/InboundRewrite.java +++ b/api/src/main/java/org/ocpsoft/rewrite/event/InboundRewrite.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.event; +package org.ocpsoft.rewrite.event; /** * Defines a {@link Rewrite} event that is in the inbound direction. diff --git a/api/src/main/java/com/ocpsoft/rewrite/event/OutboundRewrite.java b/api/src/main/java/org/ocpsoft/rewrite/event/OutboundRewrite.java similarity index 96% rename from api/src/main/java/com/ocpsoft/rewrite/event/OutboundRewrite.java rename to api/src/main/java/org/ocpsoft/rewrite/event/OutboundRewrite.java index e7d79a941..f0e0272f6 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/event/OutboundRewrite.java +++ b/api/src/main/java/org/ocpsoft/rewrite/event/OutboundRewrite.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.event; +package org.ocpsoft.rewrite.event; /** * Defines a {@link Rewrite} event that is in the outbound direction. diff --git a/api/src/main/java/com/ocpsoft/rewrite/event/Rewrite.java b/api/src/main/java/org/ocpsoft/rewrite/event/Rewrite.java similarity index 77% rename from api/src/main/java/com/ocpsoft/rewrite/event/Rewrite.java rename to api/src/main/java/org/ocpsoft/rewrite/event/Rewrite.java index 9684e0cba..45e7c5010 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/event/Rewrite.java +++ b/api/src/main/java/org/ocpsoft/rewrite/event/Rewrite.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.event; +package org.ocpsoft.rewrite.event; -import com.ocpsoft.rewrite.context.Context; -import com.ocpsoft.rewrite.spi.RewriteProvider; +import org.ocpsoft.rewrite.context.Context; /** - * Event propagated to registered {@link RewriteLifecycleListener} and {@link RewriteProvider} instances when the + * Event propagated to registered {@link RewriteLifecycleListener} and {@link org.ocpsoft.rewrite.spi.RewriteProvider} instances when the * rewrite lifecycle is executed. * * @author Lincoln Baxter, III @@ -27,7 +26,7 @@ public interface Rewrite { /** - * Get the {@link Context} object associated with the current {@link Rewrite} event. This {@link Context} is created + * Get the {@link org.ocpsoft.rewrite.context.Context} object associated with the current {@link Rewrite} event. This {@link Context} is created * at the start of a {@link Rewrite} event, and is destroyed once the {@link Rewrite} event is complete. */ public Context getRewriteContext(); diff --git a/api/src/main/java/com/ocpsoft/rewrite/exception/RewriteException.java b/api/src/main/java/org/ocpsoft/rewrite/exception/RewriteException.java similarity index 96% rename from api/src/main/java/com/ocpsoft/rewrite/exception/RewriteException.java rename to api/src/main/java/org/ocpsoft/rewrite/exception/RewriteException.java index 859280e92..f98d5e904 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/exception/RewriteException.java +++ b/api/src/main/java/org/ocpsoft/rewrite/exception/RewriteException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.exception; +package org.ocpsoft.rewrite.exception; /** * @author Lincoln Baxter, III diff --git a/api/src/main/java/com/ocpsoft/rewrite/exception/UnsupportedEvaluationException.java b/api/src/main/java/org/ocpsoft/rewrite/exception/UnsupportedEvaluationException.java similarity index 87% rename from api/src/main/java/com/ocpsoft/rewrite/exception/UnsupportedEvaluationException.java rename to api/src/main/java/org/ocpsoft/rewrite/exception/UnsupportedEvaluationException.java index 8b8ab9d34..1cd448a94 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/exception/UnsupportedEvaluationException.java +++ b/api/src/main/java/org/ocpsoft/rewrite/exception/UnsupportedEvaluationException.java @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.exception; - -import com.ocpsoft.rewrite.spi.ExpressionLanguageProvider; +package org.ocpsoft.rewrite.exception; /** - * Thrown when an {@link ExpressionLanguageProvider} cannot handle an expression. + * Thrown when an {@link org.ocpsoft.rewrite.spi.ExpressionLanguageProvider} cannot handle an expression. * * @author Lincoln Baxter, III * diff --git a/api/src/main/java/com/ocpsoft/rewrite/param/ConditionParameterBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/param/ConditionParameterBuilder.java similarity index 87% rename from api/src/main/java/com/ocpsoft/rewrite/param/ConditionParameterBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/param/ConditionParameterBuilder.java index d6b80d8b6..470322987 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/param/ConditionParameterBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/param/ConditionParameterBuilder.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.param; +package org.ocpsoft.rewrite.param; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.config.ConditionBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.config.Condition; +import org.ocpsoft.rewrite.config.ConditionBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III @@ -49,7 +49,7 @@ public P constrainedBy(final Constraint constraint) /** * Apply the given {@link Transform} to this {@link Parameter}; it will be applied in the order in which it was - * added. All transforms are applied before {@link Binding} occurs. + * added. All transforms are applied before {@link org.ocpsoft.rewrite.bind.Binding} occurs. */ @SuppressWarnings("unchecked") public P transformedBy(final Transform constraint) @@ -59,7 +59,7 @@ public P transformedBy(final Transform constraint) } /** - * The {@link Parameter} binds to the given {@link Binding}. + * The {@link Parameter} binds to the given {@link org.ocpsoft.rewrite.bind.Binding}. */ @SuppressWarnings("unchecked") public P bindsTo(final Binding binding) diff --git a/api/src/main/java/org/ocpsoft/rewrite/param/Constraint.java b/api/src/main/java/org/ocpsoft/rewrite/param/Constraint.java new file mode 100644 index 000000000..688de5624 --- /dev/null +++ b/api/src/main/java/org/ocpsoft/rewrite/param/Constraint.java @@ -0,0 +1,16 @@ +package org.ocpsoft.rewrite.param; + +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; + +/** + * @author Lincoln Baxter, III + * + */ +public interface Constraint +{ + /** + * Return true if this {@link Constraint} is satisfied by the given value; otherwise, return false. + */ + boolean isSatisfiedBy(Rewrite event, EvaluationContext context, String value); +} diff --git a/api/src/main/java/com/ocpsoft/rewrite/param/OperationParameterBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/param/OperationParameterBuilder.java similarity index 91% rename from api/src/main/java/com/ocpsoft/rewrite/param/OperationParameterBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/param/OperationParameterBuilder.java index 25f83783e..71f95393d 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/param/OperationParameterBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/param/OperationParameterBuilder.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.param; +package org.ocpsoft.rewrite.param; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.config.OperationBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.config.OperationBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/api/src/main/java/com/ocpsoft/rewrite/param/Parameter.java b/api/src/main/java/org/ocpsoft/rewrite/param/Parameter.java similarity index 91% rename from api/src/main/java/com/ocpsoft/rewrite/param/Parameter.java rename to api/src/main/java/org/ocpsoft/rewrite/param/Parameter.java index e8c60777d..6de1794df 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/param/Parameter.java +++ b/api/src/main/java/org/ocpsoft/rewrite/param/Parameter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.param; +package org.ocpsoft.rewrite.param; import java.util.List; -import com.ocpsoft.rewrite.bind.Bindable; +import org.ocpsoft.rewrite.bind.Bindable; /** - * An {@link String} specific {@link Bindable}. + * An {@link String} specific {@link org.ocpsoft.rewrite.bind.Bindable}. * * @author Lincoln Baxter, III */ diff --git a/api/src/main/java/com/ocpsoft/rewrite/param/ParameterBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/param/ParameterBuilder.java similarity index 95% rename from api/src/main/java/com/ocpsoft/rewrite/param/ParameterBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/param/ParameterBuilder.java index 8cd6c1455..9cf0ad487 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/param/ParameterBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/param/ParameterBuilder.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.param; +package org.ocpsoft.rewrite.param; import java.util.ArrayList; import java.util.List; -import com.ocpsoft.rewrite.bind.DefaultBindable; +import org.ocpsoft.rewrite.bind.DefaultBindable; /** * An base implementation of {@link Parameter} diff --git a/api/src/main/java/com/ocpsoft/rewrite/param/Parameterized.java b/api/src/main/java/org/ocpsoft/rewrite/param/Parameterized.java similarity index 81% rename from api/src/main/java/com/ocpsoft/rewrite/param/Parameterized.java rename to api/src/main/java/org/ocpsoft/rewrite/param/Parameterized.java index dded056fb..1616b8b9c 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/param/Parameterized.java +++ b/api/src/main/java/org/ocpsoft/rewrite/param/Parameterized.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.param; +package org.ocpsoft.rewrite.param; -import com.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.bind.Binding; /** * Represents an object which may be parameterized and bound. @@ -28,7 +28,7 @@ public interface Parameterized

, T> /** * Select the parameter with the given name. *

- * See also: {@link #where(String, String)}, {@link #where(String, String, Binding)}, {@link #where(String, Binding)} + * See also: {@link #where(String, String)}, {@link #where(String, String, org.ocpsoft.rewrite.bind.Binding)}, {@link #where(String, org.ocpsoft.rewrite.bind.Binding)} */ P where(String param); @@ -36,15 +36,15 @@ public interface Parameterized

, T> * Select the parameter with the given name. Assign a pattern to which the parameter must match in order to be * considered valid. *

- * See also: {@link #where(String, T)}, {@link #where(String, T, Binding)}, {@link #where(String, Binding)} + * See also: {@link #where(String, T)}, {@link #where(String, T, org.ocpsoft.rewrite.bind.Binding)}, {@link #where(String, org.ocpsoft.rewrite.bind.Binding)} */ P where(String param, T pattern); /** * Select the parameter with the given name. Assign a pattern to which the parameter must match in order to be - * considered valid. Bind the result of a successful parameter match to the given {@link Binding} + * considered valid. Bind the result of a successful parameter match to the given {@link org.ocpsoft.rewrite.bind.Binding} *

- * See also: {@link #where(String, String)}, {@link #where(String, String, Binding)}, {@link #where(String, Binding)} + * See also: {@link #where(String, String)}, {@link #where(String, String, org.ocpsoft.rewrite.bind.Binding)}, {@link #where(String, org.ocpsoft.rewrite.bind.Binding)} */ P where(String param, T pattern, Binding binding); diff --git a/api/src/main/java/com/ocpsoft/rewrite/param/ParameterizedCondition.java b/api/src/main/java/org/ocpsoft/rewrite/param/ParameterizedCondition.java similarity index 86% rename from api/src/main/java/com/ocpsoft/rewrite/param/ParameterizedCondition.java rename to api/src/main/java/org/ocpsoft/rewrite/param/ParameterizedCondition.java index c195d5b14..a0be08992 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/param/ParameterizedCondition.java +++ b/api/src/main/java/org/ocpsoft/rewrite/param/ParameterizedCondition.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.param; +package org.ocpsoft.rewrite.param; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.config.ConditionBuilder; +import org.ocpsoft.rewrite.config.Condition; +import org.ocpsoft.rewrite.config.ConditionBuilder; /** * Interface used to declare a given {@link Condition} as being capable of supporting parameterization. @@ -40,7 +40,7 @@ public interface ParameterizedCondition

, ConditionBuilder andNot(Condition condition); /** - * Chain this {@link Condition} with another {@link Condition} to be performed in series; only one must evaluate to + * Chain this {@link org.ocpsoft.rewrite.config.Condition} with another {@link Condition} to be performed in series; only one must evaluate to * true. */ ConditionBuilder or(Condition condition); diff --git a/api/src/main/java/com/ocpsoft/rewrite/param/ParameterizedOperation.java b/api/src/main/java/org/ocpsoft/rewrite/param/ParameterizedOperation.java similarity index 89% rename from api/src/main/java/com/ocpsoft/rewrite/param/ParameterizedOperation.java rename to api/src/main/java/org/ocpsoft/rewrite/param/ParameterizedOperation.java index 3a0fd53fa..1c9d143fb 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/param/ParameterizedOperation.java +++ b/api/src/main/java/org/ocpsoft/rewrite/param/ParameterizedOperation.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.param; +package org.ocpsoft.rewrite.param; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.config.OperationBuilder; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.config.OperationBuilder; /** * Defines the interface for an {@link Operation} that wishes to parameterize portions of its behavior. diff --git a/api/src/main/java/com/ocpsoft/rewrite/param/ParameterizedParameterBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/param/ParameterizedParameterBuilder.java similarity index 94% rename from api/src/main/java/com/ocpsoft/rewrite/param/ParameterizedParameterBuilder.java rename to api/src/main/java/org/ocpsoft/rewrite/param/ParameterizedParameterBuilder.java index a45bbd342..fb941a372 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/param/ParameterizedParameterBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/param/ParameterizedParameterBuilder.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.param; +package org.ocpsoft.rewrite.param; -import com.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.bind.Binding; /** * Used to build {@link Parameterized} instances. @@ -54,7 +54,7 @@ public ParameterizedParameterBuilder transformedBy(final Transform constra } /** - * The {@link Parameter} binds to the given {@link Binding} + * The {@link Parameter} binds to the given {@link org.ocpsoft.rewrite.bind.Binding} */ public ParameterizedParameterBuilder bindsTo(final Binding binding) { diff --git a/api/src/main/java/org/ocpsoft/rewrite/param/Transform.java b/api/src/main/java/org/ocpsoft/rewrite/param/Transform.java new file mode 100644 index 000000000..a77561e11 --- /dev/null +++ b/api/src/main/java/org/ocpsoft/rewrite/param/Transform.java @@ -0,0 +1,19 @@ +package org.ocpsoft.rewrite.param; + +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; + +/** + * Used to perform operations on values (Cannot be used to change the type of the value, for that, see the + * {@link org.ocpsoft.rewrite.bind.Converter} API.) + * + * @author Lincoln Baxter, III + * + */ +public interface Transform +{ + /** + * Perform an operation on the given value. + */ + S transform(Rewrite event, EvaluationContext context, S value); +} diff --git a/api/src/main/java/com/ocpsoft/rewrite/spi/ExpressionLanguageProvider.java b/api/src/main/java/org/ocpsoft/rewrite/spi/ExpressionLanguageProvider.java similarity index 94% rename from api/src/main/java/com/ocpsoft/rewrite/spi/ExpressionLanguageProvider.java rename to api/src/main/java/org/ocpsoft/rewrite/spi/ExpressionLanguageProvider.java index 0d4b081a4..7be2a7679 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/spi/ExpressionLanguageProvider.java +++ b/api/src/main/java/org/ocpsoft/rewrite/spi/ExpressionLanguageProvider.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.spi; +package org.ocpsoft.rewrite.spi; -import com.ocpsoft.rewrite.exception.UnsupportedEvaluationException; +import org.ocpsoft.rewrite.exception.UnsupportedEvaluationException; /** * Defines a service interface to provide EL support. diff --git a/api/src/main/java/com/ocpsoft/rewrite/spi/InvocationResultHandler.java b/api/src/main/java/org/ocpsoft/rewrite/spi/InvocationResultHandler.java similarity index 79% rename from api/src/main/java/com/ocpsoft/rewrite/spi/InvocationResultHandler.java rename to api/src/main/java/org/ocpsoft/rewrite/spi/InvocationResultHandler.java index b198d9fc8..45ebf79b0 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/spi/InvocationResultHandler.java +++ b/api/src/main/java/org/ocpsoft/rewrite/spi/InvocationResultHandler.java @@ -13,25 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.spi; +package org.ocpsoft.rewrite.spi; import org.ocpsoft.common.pattern.Specialized; import org.ocpsoft.common.pattern.Weighted; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.config.Invoke; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** - * Handles return values from {@link Binding} results obtained during an {@link Invoke} operation. + * Handles return values from {@link Binding} results obtained during an {@link org.ocpsoft.rewrite.config.Invoke} operation. * * @author Lincoln Baxter, III */ public interface InvocationResultHandler extends Weighted, Specialized { /** - * Handle return value from {@link Binding} result obtained during an {@link Invoke} operation. + * Handle return value from {@link Binding} result obtained during an {@link org.ocpsoft.rewrite.config.Invoke} operation. */ void handle(Rewrite event, EvaluationContext context, Object result); } diff --git a/api/src/main/java/com/ocpsoft/rewrite/spi/RewriteProvider.java b/api/src/main/java/org/ocpsoft/rewrite/spi/RewriteProvider.java similarity index 92% rename from api/src/main/java/com/ocpsoft/rewrite/spi/RewriteProvider.java rename to api/src/main/java/org/ocpsoft/rewrite/spi/RewriteProvider.java index 20b828354..790061b7d 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/spi/RewriteProvider.java +++ b/api/src/main/java/org/ocpsoft/rewrite/spi/RewriteProvider.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.spi; +package org.ocpsoft.rewrite.spi; import org.ocpsoft.common.pattern.Specialized; import org.ocpsoft.common.pattern.Weighted; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/api/src/main/java/com/ocpsoft/rewrite/util/ServiceLogger.java b/api/src/main/java/org/ocpsoft/rewrite/util/ServiceLogger.java similarity index 97% rename from api/src/main/java/com/ocpsoft/rewrite/util/ServiceLogger.java rename to api/src/main/java/org/ocpsoft/rewrite/util/ServiceLogger.java index 87ddd6899..fe8f29ce1 100644 --- a/api/src/main/java/com/ocpsoft/rewrite/util/ServiceLogger.java +++ b/api/src/main/java/org/ocpsoft/rewrite/util/ServiceLogger.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.util; +package org.ocpsoft.rewrite.util; import java.util.List; diff --git a/api/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.LogAdapterFactory b/api/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.LogAdapterFactory deleted file mode 100644 index 1d0bc964b..000000000 --- a/api/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.LogAdapterFactory +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.logging.JDKLogAdapterFactory \ No newline at end of file diff --git a/api/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.LogAdapterFactory b/api/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.LogAdapterFactory new file mode 100644 index 000000000..ea8913857 --- /dev/null +++ b/api/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.LogAdapterFactory @@ -0,0 +1 @@ +org.ocpsoft.rewrite.logging.JDKLogAdapterFactory \ No newline at end of file diff --git a/api-tests/src/test/java/com/ocpsoft/rewrite/Root.java b/api/src/test/java/org/ocpsoft/rewrite/Root.java similarity index 96% rename from api-tests/src/test/java/com/ocpsoft/rewrite/Root.java rename to api/src/test/java/org/ocpsoft/rewrite/Root.java index 361911b97..3b9b39689 100644 --- a/api-tests/src/test/java/com/ocpsoft/rewrite/Root.java +++ b/api/src/test/java/org/ocpsoft/rewrite/Root.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite; +package org.ocpsoft.rewrite; /** * Marker interface declaring the root package of this project. diff --git a/api/src/test/java/com/ocpsoft/rewrite/config/ConditionBuilderTest.java b/api/src/test/java/org/ocpsoft/rewrite/config/ConditionBuilderTest.java similarity index 98% rename from api/src/test/java/com/ocpsoft/rewrite/config/ConditionBuilderTest.java rename to api/src/test/java/org/ocpsoft/rewrite/config/ConditionBuilderTest.java index e4616c445..ce6c23a5b 100644 --- a/api/src/test/java/com/ocpsoft/rewrite/config/ConditionBuilderTest.java +++ b/api/src/test/java/org/ocpsoft/rewrite/config/ConditionBuilderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import org.junit.Assert; import org.junit.Test; diff --git a/api/src/test/java/com/ocpsoft/rewrite/config/OperationBuilderTest.java b/api/src/test/java/org/ocpsoft/rewrite/config/OperationBuilderTest.java similarity index 92% rename from api/src/test/java/com/ocpsoft/rewrite/config/OperationBuilderTest.java rename to api/src/test/java/org/ocpsoft/rewrite/config/OperationBuilderTest.java index 0cf665a24..79eefc6e4 100644 --- a/api/src/test/java/com/ocpsoft/rewrite/config/OperationBuilderTest.java +++ b/api/src/test/java/org/ocpsoft/rewrite/config/OperationBuilderTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import org.junit.Assert; import org.junit.Test; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/api/src/test/java/com/ocpsoft/rewrite/config/RuleBuilderTest.java b/api/src/test/java/org/ocpsoft/rewrite/config/RuleBuilderTest.java similarity index 96% rename from api/src/test/java/com/ocpsoft/rewrite/config/RuleBuilderTest.java rename to api/src/test/java/org/ocpsoft/rewrite/config/RuleBuilderTest.java index d64ea1c08..1ab295d37 100644 --- a/api/src/test/java/com/ocpsoft/rewrite/config/RuleBuilderTest.java +++ b/api/src/test/java/org/ocpsoft/rewrite/config/RuleBuilderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config; +package org.ocpsoft.rewrite.config; import org.junit.Assert; import org.junit.Test; diff --git a/api/src/test/java/com/ocpsoft/rewrite/logging/JDKLogAdapterFactoryTest.java b/api/src/test/java/org/ocpsoft/rewrite/logging/JDKLogAdapterFactoryTest.java similarity index 92% rename from api/src/test/java/com/ocpsoft/rewrite/logging/JDKLogAdapterFactoryTest.java rename to api/src/test/java/org/ocpsoft/rewrite/logging/JDKLogAdapterFactoryTest.java index 6cdf3e0e0..17530a0e4 100644 --- a/api/src/test/java/com/ocpsoft/rewrite/logging/JDKLogAdapterFactoryTest.java +++ b/api/src/test/java/org/ocpsoft/rewrite/logging/JDKLogAdapterFactoryTest.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.logging; +package org.ocpsoft.rewrite.logging; import static junit.framework.Assert.assertEquals; diff --git a/api/src/test/java/com/ocpsoft/rewrite/logging/JDKLogAdapterTest.java b/api/src/test/java/org/ocpsoft/rewrite/logging/JDKLogAdapterTest.java similarity index 98% rename from api/src/test/java/com/ocpsoft/rewrite/logging/JDKLogAdapterTest.java rename to api/src/test/java/org/ocpsoft/rewrite/logging/JDKLogAdapterTest.java index c2f8c7eef..dcba27d58 100644 --- a/api/src/test/java/com/ocpsoft/rewrite/logging/JDKLogAdapterTest.java +++ b/api/src/test/java/org/ocpsoft/rewrite/logging/JDKLogAdapterTest.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.logging; +package org.ocpsoft.rewrite.logging; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; diff --git a/api/src/test/java/com/ocpsoft/rewrite/logging/LogTest.java b/api/src/test/java/org/ocpsoft/rewrite/logging/LogTest.java similarity index 98% rename from api/src/test/java/com/ocpsoft/rewrite/logging/LogTest.java rename to api/src/test/java/org/ocpsoft/rewrite/logging/LogTest.java index ac129a02d..b5395b1a4 100644 --- a/api/src/test/java/com/ocpsoft/rewrite/logging/LogTest.java +++ b/api/src/test/java/org/ocpsoft/rewrite/logging/LogTest.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.logging; +package org.ocpsoft.rewrite.logging; import static org.junit.Assert.assertEquals; diff --git a/api/src/test/resources/META-INF/services/com.ocpsoft.rewrite.services.DummyService b/api/src/test/resources/META-INF/services/com.ocpsoft.rewrite.services.DummyService deleted file mode 100644 index b6bed66da..000000000 --- a/api/src/test/resources/META-INF/services/com.ocpsoft.rewrite.services.DummyService +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.services.DummyServiceImpl \ No newline at end of file diff --git a/config-jodatime/src/main/java/com/ocpsoft/rewrite/config/jodatime/JodaTime.java b/config-jodatime/src/main/java/org/ocpsoft/rewrite/config/jodatime/JodaTime.java similarity index 85% rename from config-jodatime/src/main/java/com/ocpsoft/rewrite/config/jodatime/JodaTime.java rename to config-jodatime/src/main/java/org/ocpsoft/rewrite/config/jodatime/JodaTime.java index f72297515..f38cf5e67 100644 --- a/config-jodatime/src/main/java/com/ocpsoft/rewrite/config/jodatime/JodaTime.java +++ b/config-jodatime/src/main/java/org/ocpsoft/rewrite/config/jodatime/JodaTime.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config.jodatime; +package org.ocpsoft.rewrite.config.jodatime; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.config.ConditionBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.config.Condition; +import org.ocpsoft.rewrite.config.ConditionBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * A {@link Condition} used to evaluate temporal statements using Joda Time @@ -57,7 +57,7 @@ public JodaTime(final TimeCondition condition, final DateTimeZone zone) * Configurators */ /** - * Create a new {@link JodaTime} condition that, for each {@link Rewrite}, evaluates the given {@link TimeCondition} + * Create a new {@link JodaTime} condition that, for each {@link org.ocpsoft.rewrite.event.Rewrite}, evaluates the given {@link TimeCondition} * again the system's current {@link DateTime} */ public static JodaTime matches(final TimeCondition condition) @@ -66,7 +66,7 @@ public static JodaTime matches(final TimeCondition condition) } /** - * Create a new {@link JodaTime} condition that, for each {@link Rewrite}, evaluates the given {@link TimeCondition} + * Create a new {@link JodaTime} condition that, for each {@link org.ocpsoft.rewrite.event.Rewrite}, evaluates the given {@link TimeCondition} * again the system's current {@link DateTime} using the provided {@link DateTimeZone} */ public static JodaTime matches(final TimeCondition condition, final DateTimeZone zone) diff --git a/config-jodatime/src/main/java/com/ocpsoft/rewrite/config/jodatime/TimeCondition.java b/config-jodatime/src/main/java/org/ocpsoft/rewrite/config/jodatime/TimeCondition.java similarity index 95% rename from config-jodatime/src/main/java/com/ocpsoft/rewrite/config/jodatime/TimeCondition.java rename to config-jodatime/src/main/java/org/ocpsoft/rewrite/config/jodatime/TimeCondition.java index 47a7caf07..5819ee713 100644 --- a/config-jodatime/src/main/java/com/ocpsoft/rewrite/config/jodatime/TimeCondition.java +++ b/config-jodatime/src/main/java/org/ocpsoft/rewrite/config/jodatime/TimeCondition.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config.jodatime; +package org.ocpsoft.rewrite.config.jodatime; import org.joda.time.DateTime; diff --git a/config-jodatime/src/test/java/com/ocpsoft/rewrite/config/jodatime/JodaTimeTest.java b/config-jodatime/src/test/java/org/ocpsoft/rewrite/config/jodatime/JodaTimeTest.java similarity index 91% rename from config-jodatime/src/test/java/com/ocpsoft/rewrite/config/jodatime/JodaTimeTest.java rename to config-jodatime/src/test/java/org/ocpsoft/rewrite/config/jodatime/JodaTimeTest.java index 968fa3ae3..73171e59d 100644 --- a/config-jodatime/src/test/java/com/ocpsoft/rewrite/config/jodatime/JodaTimeTest.java +++ b/config-jodatime/src/test/java/org/ocpsoft/rewrite/config/jodatime/JodaTimeTest.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config.jodatime; +package org.ocpsoft.rewrite.config.jodatime; import junit.framework.Assert; import org.joda.time.DateTime; import org.junit.Test; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.mock.MockRewrite; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.mock.MockRewrite; /** * @author Lincoln Baxter, III diff --git a/config-tuckey/README.md b/config-tuckey/README.md index 5373cb147..b045655a0 100644 --- a/config-tuckey/README.md +++ b/config-tuckey/README.md @@ -14,7 +14,7 @@ How to use * Include OCPSoft Rewrite in your application's POM file: - com.ocpsoft.rewrite + org.ocpsoft.rewrite rewrite-config-tuckey ${rewrite.version} diff --git a/config-tuckey/src/main/java/com/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProvider.java b/config-tuckey/src/main/java/org/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProvider.java similarity index 94% rename from config-tuckey/src/main/java/com/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProvider.java rename to config-tuckey/src/main/java/org/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProvider.java index bfa2d6c35..f70e94033 100644 --- a/config-tuckey/src/main/java/com/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProvider.java +++ b/config-tuckey/src/main/java/org/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config.tuckey; +package org.ocpsoft.rewrite.config.tuckey; import java.io.InputStream; import java.net.MalformedURLException; @@ -22,12 +22,12 @@ import javax.servlet.ServletContext; import org.ocpsoft.logging.Logger; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; import org.tuckey.web.filters.urlrewrite.Conf; import org.tuckey.web.filters.urlrewrite.UrlRewriter; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.config.Configuration; /** * @author Lincoln Baxter, III diff --git a/config-tuckey/src/main/java/com/ocpsoft/rewrite/config/tuckey/TuckeyRewriteRuleAdaptor.java b/config-tuckey/src/main/java/org/ocpsoft/rewrite/config/tuckey/TuckeyRewriteRuleAdaptor.java similarity index 86% rename from config-tuckey/src/main/java/com/ocpsoft/rewrite/config/tuckey/TuckeyRewriteRuleAdaptor.java rename to config-tuckey/src/main/java/org/ocpsoft/rewrite/config/tuckey/TuckeyRewriteRuleAdaptor.java index 31aa133b5..da1eb6f88 100644 --- a/config-tuckey/src/main/java/com/ocpsoft/rewrite/config/tuckey/TuckeyRewriteRuleAdaptor.java +++ b/config-tuckey/src/main/java/org/ocpsoft/rewrite/config/tuckey/TuckeyRewriteRuleAdaptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config.tuckey; +package org.ocpsoft.rewrite.config.tuckey; import java.io.IOException; @@ -22,15 +22,15 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.config.Rule; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.config.HttpOperation; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; import org.tuckey.web.filters.urlrewrite.UrlRewriter; -import com.ocpsoft.rewrite.config.Direction; -import com.ocpsoft.rewrite.config.Rule; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.exception.RewriteException; -import com.ocpsoft.rewrite.servlet.config.HttpOperation; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.exception.RewriteException; /** * @author Lincoln Baxter, III diff --git a/config-tuckey/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider b/config-tuckey/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider deleted file mode 100644 index 3e8e0fdf1..000000000 --- a/config-tuckey/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.config.tuckey.TuckeyConfigurationProvider \ No newline at end of file diff --git a/config-tuckey/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider b/config-tuckey/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider new file mode 100644 index 000000000..224a024ad --- /dev/null +++ b/config-tuckey/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider @@ -0,0 +1 @@ +org.ocpsoft.rewrite.config.tuckey.TuckeyConfigurationProvider \ No newline at end of file diff --git a/config-tuckey/src/test/java/com/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProviderTest.java b/config-tuckey/src/test/java/org/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProviderTest.java similarity index 95% rename from config-tuckey/src/test/java/com/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProviderTest.java rename to config-tuckey/src/test/java/org/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProviderTest.java index eef90d9fa..929021e53 100644 --- a/config-tuckey/src/test/java/com/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProviderTest.java +++ b/config-tuckey/src/test/java/org/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProviderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config.tuckey; +package org.ocpsoft.rewrite.config.tuckey; import junit.framework.Assert; @@ -24,8 +24,8 @@ import org.junit.Test; import org.junit.runner.RunWith; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III diff --git a/config-tuckey/src/test/java/com/ocpsoft/rewrite/config/tuckey/TuckeyRoot.java b/config-tuckey/src/test/java/org/ocpsoft/rewrite/config/tuckey/TuckeyRoot.java similarity index 94% rename from config-tuckey/src/test/java/com/ocpsoft/rewrite/config/tuckey/TuckeyRoot.java rename to config-tuckey/src/test/java/org/ocpsoft/rewrite/config/tuckey/TuckeyRoot.java index e944e1a2d..7904c7f30 100644 --- a/config-tuckey/src/test/java/com/ocpsoft/rewrite/config/tuckey/TuckeyRoot.java +++ b/config-tuckey/src/test/java/org/ocpsoft/rewrite/config/tuckey/TuckeyRoot.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.config.tuckey; +package org.ocpsoft.rewrite.config.tuckey; /** * @author Lincoln Baxter, III diff --git a/impl-config/README.md b/impl-config/README.md index 79fc2e71b..5f7d59aae 100644 --- a/impl-config/README.md +++ b/impl-config/README.md @@ -7,7 +7,7 @@ Get Started 1. Include OCPSoft Rewrite in your application's POM file: - com.ocpsoft.rewrite + org.ocpsoft.rewrite rewrite-impl-servlet ${rewrite.version} diff --git a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/RegexConditionParameterBuilder.java b/impl-config/src/main/java/com/ocpsoft/rewrite/bind/RegexConditionParameterBuilder.java deleted file mode 100644 index a1651019e..000000000 --- a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/RegexConditionParameterBuilder.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.bind; - -import com.ocpsoft.rewrite.param.ConditionParameterBuilder; -import com.ocpsoft.rewrite.param.ParameterizedCondition; - -/** - * @author Lincoln Baxter, III - * - */ -public class RegexConditionParameterBuilder extends ConditionParameterBuilder -{ - private final RegexParameter parameter; - - public RegexConditionParameterBuilder( - ParameterizedCondition, String> parent, - RegexParameter parameter) - { - super(parent, parameter); - this.parameter = parameter; - } - - public RegexConditionParameterBuilder matches(String pattern) - { - parameter.matches(pattern); - return this; - } - -} diff --git a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/RegexOperationParameterBuilder.java b/impl-config/src/main/java/com/ocpsoft/rewrite/bind/RegexOperationParameterBuilder.java deleted file mode 100644 index d1541ba8b..000000000 --- a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/RegexOperationParameterBuilder.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.bind; - -import com.ocpsoft.rewrite.param.OperationParameterBuilder; -import com.ocpsoft.rewrite.param.ParameterizedOperation; - -/** - * @author Lincoln Baxter, III - * - */ -public class RegexOperationParameterBuilder extends OperationParameterBuilder -{ - private final RegexParameter parameter; - - public RegexOperationParameterBuilder( - ParameterizedOperation, String> parent, - RegexParameter parameter) - { - super(parent, parameter); - this.parameter = parameter; - } - - public RegexOperationParameterBuilder matches(String pattern) - { - parameter.matches(pattern); - return this; - } - -} diff --git a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/ParameterizedPattern.java b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/ParameterizedPattern.java similarity index 93% rename from impl-config/src/main/java/com/ocpsoft/rewrite/bind/ParameterizedPattern.java rename to impl-config/src/main/java/org/ocpsoft/rewrite/bind/ParameterizedPattern.java index ef3bb43a2..754efdef6 100644 --- a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/ParameterizedPattern.java +++ b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/ParameterizedPattern.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; import java.util.ArrayList; import java.util.Arrays; @@ -25,19 +25,18 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.ocpsoft.rewrite.bind.parse.CaptureType; -import com.ocpsoft.rewrite.bind.parse.CapturingGroup; -import com.ocpsoft.rewrite.bind.parse.ParseTools; -import com.ocpsoft.rewrite.bind.util.Maps; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.param.Constraint; -import com.ocpsoft.rewrite.param.Parameter; -import com.ocpsoft.rewrite.param.Parameterized; -import com.ocpsoft.rewrite.param.Transform; +import org.ocpsoft.rewrite.bind.parse.CaptureType; +import org.ocpsoft.rewrite.bind.parse.CapturingGroup; +import org.ocpsoft.rewrite.bind.parse.ParseTools; +import org.ocpsoft.rewrite.bind.util.Maps; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.param.Constraint; +import org.ocpsoft.rewrite.param.Parameter; +import org.ocpsoft.rewrite.param.Transform; /** - * An {@link Parameterized} regular expression {@link Pattern}. + * An {@link org.ocpsoft.rewrite.param.Parameterized} regular expression {@link Pattern}. * * @author Lincoln Baxter, III */ @@ -49,7 +48,7 @@ public class ParameterizedPattern private final Map params = new LinkedHashMap(); /** - * Create a new {@link ParameterizedPattern} instance with the default {@link CaptureType#BRACE} and parameter + * Create a new {@link ParameterizedPattern} instance with the default {@link org.ocpsoft.rewrite.bind.parse.CaptureType#BRACE} and parameter * pattern of ".*". */ public ParameterizedPattern(final String pattern) @@ -108,7 +107,7 @@ public ParameterizedPattern(final CaptureType type, final String parameterPatter } /** - * Get all {@link Parameter} instances detected during expression parsing. + * Get all {@link org.ocpsoft.rewrite.param.Parameter} instances detected during expression parsing. */ public Map getParameters() { @@ -302,7 +301,7 @@ else if (last == null) } /** - * Parses the given string if it matches this expression. Returns a {@link Parameter}-value map of parsed values. + * Parses the given string if it matches this expression. Returns a {@link org.ocpsoft.rewrite.param.Parameter}-value map of parsed values. */ public Map parse(final Rewrite event, final EvaluationContext context, final String path) { @@ -375,7 +374,7 @@ private String applyTransforms(final Rewrite event, final EvaluationContext cont } /** - * Get the {@link Parameter} with the given name. Return null if no such {@link Parameter} exists. + * Get the {@link org.ocpsoft.rewrite.param.Parameter} with the given name. Return null if no such {@link org.ocpsoft.rewrite.param.Parameter} exists. */ public RegexParameter getParameter(final String name) { diff --git a/impl-config/src/main/java/org/ocpsoft/rewrite/bind/RegexConditionParameterBuilder.java b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/RegexConditionParameterBuilder.java new file mode 100644 index 000000000..2e940879c --- /dev/null +++ b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/RegexConditionParameterBuilder.java @@ -0,0 +1,28 @@ +package org.ocpsoft.rewrite.bind; + +import org.ocpsoft.rewrite.param.ConditionParameterBuilder; +import org.ocpsoft.rewrite.param.ParameterizedCondition; + +/** + * @author Lincoln Baxter, III + * + */ +public class RegexConditionParameterBuilder extends ConditionParameterBuilder +{ + private final RegexParameter parameter; + + public RegexConditionParameterBuilder( + ParameterizedCondition, String> parent, + RegexParameter parameter) + { + super(parent, parameter); + this.parameter = parameter; + } + + public RegexConditionParameterBuilder matches(String pattern) + { + parameter.matches(pattern); + return this; + } + +} diff --git a/impl-config/src/main/java/org/ocpsoft/rewrite/bind/RegexOperationParameterBuilder.java b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/RegexOperationParameterBuilder.java new file mode 100644 index 000000000..79d82651b --- /dev/null +++ b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/RegexOperationParameterBuilder.java @@ -0,0 +1,28 @@ +package org.ocpsoft.rewrite.bind; + +import org.ocpsoft.rewrite.param.OperationParameterBuilder; +import org.ocpsoft.rewrite.param.ParameterizedOperation; + +/** + * @author Lincoln Baxter, III + * + */ +public class RegexOperationParameterBuilder extends OperationParameterBuilder +{ + private final RegexParameter parameter; + + public RegexOperationParameterBuilder( + ParameterizedOperation, String> parent, + RegexParameter parameter) + { + super(parent, parameter); + this.parameter = parameter; + } + + public RegexOperationParameterBuilder matches(String pattern) + { + parameter.matches(pattern); + return this; + } + +} diff --git a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/RegexParameter.java b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/RegexParameter.java similarity index 92% rename from impl-config/src/main/java/com/ocpsoft/rewrite/bind/RegexParameter.java rename to impl-config/src/main/java/org/ocpsoft/rewrite/bind/RegexParameter.java index 8c58f7b6a..1afcb9049 100644 --- a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/RegexParameter.java +++ b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/RegexParameter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind; +package org.ocpsoft.rewrite.bind; -import com.ocpsoft.rewrite.bind.parse.CapturingGroup; -import com.ocpsoft.rewrite.param.ParameterBuilder; +import org.ocpsoft.rewrite.bind.parse.CapturingGroup; +import org.ocpsoft.rewrite.param.ParameterBuilder; /** * An {@link String} specific implementation of {@link Bindable} diff --git a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/parse/CaptureType.java b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/parse/CaptureType.java similarity index 90% rename from impl-config/src/main/java/com/ocpsoft/rewrite/bind/parse/CaptureType.java rename to impl-config/src/main/java/org/ocpsoft/rewrite/bind/parse/CaptureType.java index 250320c29..b643556ed 100644 --- a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/parse/CaptureType.java +++ b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/parse/CaptureType.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.bind.parse; +package org.ocpsoft.rewrite.bind.parse; public enum CaptureType { diff --git a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/parse/CapturingGroup.java b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/parse/CapturingGroup.java similarity index 97% rename from impl-config/src/main/java/com/ocpsoft/rewrite/bind/parse/CapturingGroup.java rename to impl-config/src/main/java/org/ocpsoft/rewrite/bind/parse/CapturingGroup.java index 81e33688f..bc2aeda8d 100644 --- a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/parse/CapturingGroup.java +++ b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/parse/CapturingGroup.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind.parse; +package org.ocpsoft.rewrite.bind.parse; import java.util.Arrays; diff --git a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/parse/ParseTools.java b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/parse/ParseTools.java similarity index 98% rename from impl-config/src/main/java/com/ocpsoft/rewrite/bind/parse/ParseTools.java rename to impl-config/src/main/java/org/ocpsoft/rewrite/bind/parse/ParseTools.java index 5e5aba36b..dea97668f 100644 --- a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/parse/ParseTools.java +++ b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/parse/ParseTools.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind.parse; +package org.ocpsoft.rewrite.bind.parse; import org.ocpsoft.common.util.Assert; diff --git a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/util/Maps.java b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/util/Maps.java similarity index 98% rename from impl-config/src/main/java/com/ocpsoft/rewrite/bind/util/Maps.java rename to impl-config/src/main/java/org/ocpsoft/rewrite/bind/util/Maps.java index 81606d6b0..973d17699 100644 --- a/impl-config/src/main/java/com/ocpsoft/rewrite/bind/util/Maps.java +++ b/impl-config/src/main/java/org/ocpsoft/rewrite/bind/util/Maps.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.bind.util; +package org.ocpsoft.rewrite.bind.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/impl-config/src/test/java/com/ocpsoft/rewrite/parameters/ParameterizedPatternTest.java b/impl-config/src/test/java/org/ocpsoft/rewrite/parameters/ParameterizedPatternTest.java similarity index 93% rename from impl-config/src/test/java/com/ocpsoft/rewrite/parameters/ParameterizedPatternTest.java rename to impl-config/src/test/java/org/ocpsoft/rewrite/parameters/ParameterizedPatternTest.java index 7b023073f..5640a9713 100644 --- a/impl-config/src/test/java/com/ocpsoft/rewrite/parameters/ParameterizedPatternTest.java +++ b/impl-config/src/test/java/org/ocpsoft/rewrite/parameters/ParameterizedPatternTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.parameters; +package org.ocpsoft.rewrite.parameters; import java.util.LinkedHashMap; import java.util.List; @@ -23,12 +23,12 @@ import org.junit.Assert; import org.junit.Test; -import com.ocpsoft.rewrite.bind.ParameterizedPattern; -import com.ocpsoft.rewrite.bind.RegexParameter; -import com.ocpsoft.rewrite.bind.parse.CaptureType; -import com.ocpsoft.rewrite.bind.util.Maps; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.mock.MockRewrite; +import org.ocpsoft.rewrite.bind.ParameterizedPattern; +import org.ocpsoft.rewrite.bind.RegexParameter; +import org.ocpsoft.rewrite.bind.parse.CaptureType; +import org.ocpsoft.rewrite.bind.util.Maps; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.mock.MockRewrite; /** * @author Lincoln Baxter, III diff --git a/impl-config/src/test/java/com/ocpsoft/rewrite/parameters/parse/ParseToolsTest.java b/impl-config/src/test/java/org/ocpsoft/rewrite/parameters/parse/ParseToolsTest.java similarity index 94% rename from impl-config/src/test/java/com/ocpsoft/rewrite/parameters/parse/ParseToolsTest.java rename to impl-config/src/test/java/org/ocpsoft/rewrite/parameters/parse/ParseToolsTest.java index 953ab1388..91373b981 100644 --- a/impl-config/src/test/java/com/ocpsoft/rewrite/parameters/parse/ParseToolsTest.java +++ b/impl-config/src/test/java/org/ocpsoft/rewrite/parameters/parse/ParseToolsTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.parameters.parse; +package org.ocpsoft.rewrite.parameters.parse; import org.junit.Assert; import org.junit.Test; -import com.ocpsoft.rewrite.bind.parse.CaptureType; -import com.ocpsoft.rewrite.bind.parse.CapturingGroup; -import com.ocpsoft.rewrite.bind.parse.ParseTools; +import org.ocpsoft.rewrite.bind.parse.CaptureType; +import org.ocpsoft.rewrite.bind.parse.CapturingGroup; +import org.ocpsoft.rewrite.bind.parse.ParseTools; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/README.md b/impl-servlet/README.md index 79fc2e71b..5f7d59aae 100644 --- a/impl-servlet/README.md +++ b/impl-servlet/README.md @@ -7,7 +7,7 @@ Get Started 1. Include OCPSoft Rewrite in your application's POM file: - com.ocpsoft.rewrite + org.ocpsoft.rewrite rewrite-impl-servlet ${rewrite.version} diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/RewriteFilter.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/RewriteFilter.java similarity index 86% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/RewriteFilter.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/RewriteFilter.java index 81886c86c..5273fce87 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/RewriteFilter.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/RewriteFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet; +package org.ocpsoft.rewrite.servlet; import java.io.IOException; import java.util.Collections; @@ -33,25 +33,25 @@ import org.ocpsoft.common.util.Iterators; import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.config.ConfigurationProvider; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.event.BaseRewrite.Flow; -import com.ocpsoft.rewrite.servlet.event.InboundServletRewrite; -import com.ocpsoft.rewrite.servlet.impl.RewriteContextImpl; -import com.ocpsoft.rewrite.servlet.spi.ContextListener; -import com.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer; -import com.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer; -import com.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper; -import com.ocpsoft.rewrite.servlet.spi.RequestListener; -import com.ocpsoft.rewrite.servlet.spi.RequestParameterProvider; -import com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; -import com.ocpsoft.rewrite.spi.ExpressionLanguageProvider; -import com.ocpsoft.rewrite.spi.InvocationResultHandler; -import com.ocpsoft.rewrite.spi.RewriteProvider; -import com.ocpsoft.rewrite.util.ServiceLogger; +import org.ocpsoft.rewrite.config.ConfigurationProvider; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.event.InboundServletRewrite; +import org.ocpsoft.rewrite.servlet.impl.RewriteContextImpl; +import org.ocpsoft.rewrite.servlet.spi.ContextListener; +import org.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer; +import org.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer; +import org.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper; +import org.ocpsoft.rewrite.servlet.spi.RequestListener; +import org.ocpsoft.rewrite.servlet.spi.RequestParameterProvider; +import org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; +import org.ocpsoft.rewrite.spi.ExpressionLanguageProvider; +import org.ocpsoft.rewrite.spi.InvocationResultHandler; +import org.ocpsoft.rewrite.spi.RewriteProvider; +import org.ocpsoft.rewrite.util.ServiceLogger; +import org.ocpsoft.rewrite.servlet.event.BaseRewrite; /** - * {@link Filter} responsible for handling all inbound {@link Rewrite} events. + * {@link Filter} responsible for handling all inbound {@link org.ocpsoft.rewrite.event.Rewrite} events. * * @author Lincoln Baxter, III */ @@ -166,7 +166,7 @@ public void doFilter(final ServletRequest request, final ServletResponse respons rewrite(event); - if (!event.getFlow().is(Flow.ABORT_REQUEST)) + if (!event.getFlow().is(BaseRewrite.Flow.ABORT_REQUEST)) { log.debug("RewriteFilter passing control of request to underlying application."); chain.doFilter(event.getRequest(), event.getResponse()); @@ -210,7 +210,7 @@ private void rewrite(final InboundServletRewriteLincoln Baxter, III */ public class Domain extends HttpCondition implements -ParameterizedCondition, String> + ParameterizedCondition, String> { private final ParameterizedPattern expression; @@ -68,7 +67,7 @@ private Domain(final String pattern) * ... and so on * *

- * By default, matching parameter values are bound to the {@link EvaluationContext}. See also {@link #where(String)} + * By default, matching parameter values are bound to the {@link org.ocpsoft.rewrite.context.EvaluationContext}. See also {@link #where(String)} */ public static Domain matches(final String pattern) { diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/EncodeQuery.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/EncodeQuery.java similarity index 74% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/EncodeQuery.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/EncodeQuery.java index 0e71c4279..42a4bb7f5 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/EncodeQuery.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/EncodeQuery.java @@ -1,42 +1,21 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.config.OperationBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.config.encodequery.Base64EncodingStrategy; -import com.ocpsoft.rewrite.servlet.config.encodequery.ChecksumStrategy; -import com.ocpsoft.rewrite.servlet.config.encodequery.EncodingStrategy; -import com.ocpsoft.rewrite.servlet.config.encodequery.HashCodeChecksumStrategy; -import com.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; -import com.ocpsoft.rewrite.servlet.util.QueryStringBuilder; -import com.ocpsoft.rewrite.servlet.util.URLBuilder; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.config.OperationBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.config.encodequery.Base64EncodingStrategy; +import org.ocpsoft.rewrite.servlet.config.encodequery.EncodingStrategy; +import org.ocpsoft.rewrite.servlet.config.encodequery.ChecksumStrategy; +import org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; +import org.ocpsoft.rewrite.servlet.util.QueryStringBuilder; +import org.ocpsoft.rewrite.servlet.util.URLBuilder; +import org.ocpsoft.rewrite.servlet.config.encodequery.HashCodeChecksumStrategy; /** * Encodes any or many query-parameters into a single parameter using the given {@link ChecksumStrategy} and diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Forward.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Forward.java similarity index 76% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Forward.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Forward.java index 8adb13ae1..12e2dada2 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Forward.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Forward.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.net.URL; @@ -21,26 +21,25 @@ import org.ocpsoft.common.util.Assert; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.bind.ParameterizedPattern; -import com.ocpsoft.rewrite.bind.RegexOperationParameterBuilder; -import com.ocpsoft.rewrite.bind.parse.CaptureType; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.param.OperationParameterBuilder; -import com.ocpsoft.rewrite.param.Parameter; -import com.ocpsoft.rewrite.param.ParameterizedOperation; -import com.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.bind.ParameterizedPattern; +import org.ocpsoft.rewrite.bind.RegexOperationParameterBuilder; +import org.ocpsoft.rewrite.bind.parse.CaptureType; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.param.OperationParameterBuilder; +import org.ocpsoft.rewrite.param.Parameter; +import org.ocpsoft.rewrite.param.ParameterizedOperation; +import org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** - * An {@link Operation} that performs forwards via {@link HttpInboundServletRewrite#forward(String)} + * An {@link org.ocpsoft.rewrite.config.Operation} that performs forwards via {@link org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite#forward(String)} * * @author Lincoln Baxter, III */ public class Forward extends HttpOperation implements -ParameterizedOperation, String> + ParameterizedOperation, String> { private final ParameterizedPattern location; @@ -67,7 +66,7 @@ private Forward(final String location) * *

* Parameters may be bound. By default, matching parameter values are extracted from bindings in the - * {@link EvaluationContext}. + * {@link org.ocpsoft.rewrite.context.EvaluationContext}. *

* See also {@link #where(String)} */ diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Header.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Header.java similarity index 91% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Header.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Header.java index 7a3ae35c0..e13fefe40 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Header.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Header.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.util.Collections; import java.util.Map; @@ -22,12 +22,12 @@ import org.ocpsoft.common.util.Assert; -import com.ocpsoft.rewrite.bind.Bindings; -import com.ocpsoft.rewrite.bind.ParameterizedPattern; -import com.ocpsoft.rewrite.bind.RegexParameter; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Bindings; +import org.ocpsoft.rewrite.bind.ParameterizedPattern; +import org.ocpsoft.rewrite.bind.RegexParameter; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * Responsible for asserting on {@link HttpServletRequest#getHeader(String)} values. diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Lifecycle.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Lifecycle.java similarity index 80% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Lifecycle.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Lifecycle.java index 920d1b0d8..8ac82bd6f 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Lifecycle.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Lifecycle.java @@ -1,9 +1,9 @@ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.servlet.event.ServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.event.ServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * Responsible for controlling the Rewrite life-cycle itself. diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Method.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Method.java similarity index 90% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Method.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Method.java index 5ed090d16..add07478b 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Method.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Method.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.util.List; import javax.servlet.http.HttpServletRequest; -import com.ocpsoft.rewrite.bind.Bindable; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.bind.Bindings; -import com.ocpsoft.rewrite.bind.DefaultBindable; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Bindable; +import org.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.bind.Bindings; +import org.ocpsoft.rewrite.bind.DefaultBindable; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * Responsible for asserting on the {@link HttpServletRequest#getMethod()} property. diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Path.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Path.java similarity index 77% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Path.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Path.java index f92f09aa8..c39504707 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Path.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Path.java @@ -13,34 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.util.Map; import org.ocpsoft.common.util.Assert; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.bind.Bindings; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.bind.ParameterizedPattern; -import com.ocpsoft.rewrite.bind.RegexConditionParameterBuilder; -import com.ocpsoft.rewrite.bind.RegexParameter; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.param.ConditionParameterBuilder; -import com.ocpsoft.rewrite.param.Parameter; -import com.ocpsoft.rewrite.param.ParameterizedCondition; -import com.ocpsoft.rewrite.servlet.config.bind.Request; -import com.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.bind.Bindings; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.bind.ParameterizedPattern; +import org.ocpsoft.rewrite.bind.RegexConditionParameterBuilder; +import org.ocpsoft.rewrite.bind.RegexParameter; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.param.ConditionParameterBuilder; +import org.ocpsoft.rewrite.param.Parameter; +import org.ocpsoft.rewrite.param.ParameterizedCondition; +import org.ocpsoft.rewrite.servlet.config.bind.Request; +import org.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** - * A {@link Condition} that inspects the value of {@link HttpServletRewrite#getRequestPath()} + * A {@link org.ocpsoft.rewrite.config.Condition} that inspects the value of {@link org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite#getRequestPath()} * * @author Lincoln Baxter, III */ public class Path extends HttpCondition implements -ParameterizedCondition, String> + ParameterizedCondition, String> { private final ParameterizedPattern expression; @@ -65,7 +64,7 @@ private Path(final String pattern) * ... and so on * *

- * By default, matching parameter values are bound to the {@link EvaluationContext}. See also {@link #where(String)} + * By default, matching parameter values are bound to the {@link org.ocpsoft.rewrite.context.EvaluationContext}. See also {@link #where(String)} */ public static Path matches(final String pattern) { @@ -74,7 +73,7 @@ public static Path matches(final String pattern) /** * Bind each path parameter to the corresponding request parameter by name. By default, matching values are bound to - * the {@link EvaluationContext}. + * the {@link org.ocpsoft.rewrite.context.EvaluationContext}. *

* See also {@link #where(String)} */ diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/QueryString.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/QueryString.java similarity index 83% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/QueryString.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/QueryString.java index e2f390e2d..e781f61bc 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/QueryString.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/QueryString.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.util.ArrayList; import java.util.Arrays; @@ -26,21 +26,20 @@ import org.ocpsoft.common.util.Assert; -import com.ocpsoft.rewrite.bind.Bindable; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.bind.Bindings; -import com.ocpsoft.rewrite.bind.DefaultBindable; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.bind.util.Maps; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.InboundRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; -import com.ocpsoft.rewrite.servlet.util.QueryStringBuilder; +import org.ocpsoft.rewrite.bind.Bindable; +import org.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.bind.Bindings; +import org.ocpsoft.rewrite.bind.DefaultBindable; +import org.ocpsoft.rewrite.bind.util.Maps; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.InboundRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.servlet.util.QueryStringBuilder; +import org.ocpsoft.rewrite.bind.Evaluation; /** - * A {@link Condition} that inspects the value of {@link HttpServletRewrite#getRequestQueryString()} + * A {@link org.ocpsoft.rewrite.config.Condition} that inspects the value of {@link org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite#getRequestQueryString()} * * @author Lincoln Baxter, III */ @@ -66,7 +65,7 @@ public List getBindings() } /** - * Return a new {@link Condition} matching against the entire {@link HttpServletRequest#getQueryString()} + * Return a new {@link org.ocpsoft.rewrite.config.Condition} matching against the entire {@link HttpServletRequest#getQueryString()} *

* This value may be bound. *

@@ -99,11 +98,11 @@ else if (event instanceof HttpOutboundServletRewrite) } /** - * Return a new {@link Condition} matching against the existence of specific parameters within + * Return a new {@link org.ocpsoft.rewrite.config.Condition} matching against the existence of specific parameters within * {@link HttpServletRequest#getQueryString()} *

* The values of all matching parameters may be bound. By default, matching values are bound to the - * {@link EvaluationContext}. + * {@link org.ocpsoft.rewrite.context.EvaluationContext}. *

* See also: {@link #bindsTo(Binding)} */ @@ -147,7 +146,7 @@ public boolean evaluateHttp(final HttpServletRewrite event, final EvaluationCont } /** - * Return a new {@link Condition} matching against the existence of a parameter values within + * Return a new {@link org.ocpsoft.rewrite.config.Condition} matching against the existence of a parameter values within * {@link HttpServletRequest#getQueryString()} *

* The values of all matching parameter values may be bound. By default, matching values are bound to the diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Redirect.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Redirect.java similarity index 83% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Redirect.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Redirect.java index 29008eb4e..10c2253ca 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Redirect.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Redirect.java @@ -13,33 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.net.URL; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletResponse; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.bind.ParameterizedPattern; -import com.ocpsoft.rewrite.bind.RegexOperationParameterBuilder; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.param.OperationParameterBuilder; -import com.ocpsoft.rewrite.param.Parameter; -import com.ocpsoft.rewrite.param.ParameterizedOperation; -import com.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.bind.ParameterizedPattern; +import org.ocpsoft.rewrite.bind.RegexOperationParameterBuilder; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.param.OperationParameterBuilder; +import org.ocpsoft.rewrite.param.Parameter; +import org.ocpsoft.rewrite.param.ParameterizedOperation; +import org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Binding; /** * An {@link Operation} that performs redirects via {@link HttpInboundServletRewrite#redirectPermanent(String)} and - * {@link HttpInboundServletRewrite#redirectTemporary(String)} + * {@link org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite#redirectTemporary(String)} * * @author Lincoln Baxter, III */ public class Redirect extends HttpOperation implements - ParameterizedOperation, String> + ParameterizedOperation, String> { private final RedirectType type; @@ -89,7 +89,7 @@ public void performHttp(final HttpServletRewrite event, final EvaluationContext * ... and so on * *

- * By default, matching parameter values are bound to the {@link EvaluationContext}. + * By default, matching parameter values are bound to the {@link org.ocpsoft.rewrite.context.EvaluationContext}. *

* See also {@link #where(String)} */ diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/RequestParameter.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/RequestParameter.java similarity index 88% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/RequestParameter.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/RequestParameter.java index 193e0aeab..9b8cc5c7f 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/RequestParameter.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/RequestParameter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.util.ArrayList; import java.util.Arrays; @@ -25,13 +25,13 @@ import org.ocpsoft.common.util.Assert; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.bind.Bindings; -import com.ocpsoft.rewrite.bind.DefaultBindable; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.*; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.config.Condition; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.bind.Bindings; /** * A {@link Condition} that inspects values returned by {@link HttpServletRequest#getParameterMap()} @@ -61,7 +61,7 @@ private RequestParameter(final String name, final String nameRegex, final String } /** - * Bind the values of this {@link RequestParameter} query to the given {@link Binding}. + * Bind the values of this {@link RequestParameter} query to the given {@link org.ocpsoft.rewrite.bind.Binding}. */ public RequestParameter bindsTo(final Binding binding) { @@ -72,7 +72,7 @@ public RequestParameter bindsTo(final Binding binding) /** * Return a {@link RequestParameter} condition that matches against both parameter name and values. *

- * Matched parameter values may be bound. By default, matching values are bound to the {@link EvaluationContext}. + * Matched parameter values may be bound. By default, matching values are bound to the {@link org.ocpsoft.rewrite.context.EvaluationContext}. *

* See also: {@link #bindsTo(Binding)} * @@ -89,7 +89,7 @@ public static RequestParameter matches(final String nameRegex, final String valu * name. The parameter value is ignored. *

* Values of the matching parameter may be bound. By default, matching values are bound to the - * {@link EvaluationContext}. + * {@link org.ocpsoft.rewrite.context.EvaluationContext}. *

* See also: {@link #bindsTo(Binding)} * @@ -104,7 +104,7 @@ public static RequestParameter exists(final String name) * Return a {@link RequestParameter} condition that matches only against the existence of a parameter with a name * matching the given pattern. The parameter value is ignored. *

- * Values of matching parameters may be bound. By default, matching values are bound to the {@link EvaluationContext}. + * Values of matching parameters may be bound. By default, matching values are bound to the {@link org.ocpsoft.rewrite.context.EvaluationContext}. *

* See also: {@link #bindsTo(Binding)} * @@ -119,7 +119,7 @@ public static RequestParameter existsMatching(final String nameRegex) * Return a {@link RequestParameter} condition that matches only against the existence of a parameter with value * matching the given pattern. The parameter name is ignored. *

- * Matching values may be bound. By default, matching values are bound to the {@link EvaluationContext}. + * Matching values may be bound. By default, matching values are bound to the {@link org.ocpsoft.rewrite.context.EvaluationContext}. *

* See also: {@link #bindsTo(Binding)} * @@ -159,7 +159,7 @@ else if (nameRegex.matcher(parameter).matches() && matchesValue(request, paramet if (matchedParameter != null) { - Bindings.enqueueSubmission(event, context, bindable, values.toArray(new String[] {})); + Bindings.enqueueSubmission(event, context, bindable, values.toArray(new String[]{})); return true; } diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Resource.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Resource.java similarity index 82% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Resource.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Resource.java index 947948422..e2b22d368 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Resource.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Resource.java @@ -31,21 +31,20 @@ * Optionally, Customers may choose a Commercial License. For additional * details, contact an OCPsoft representative (sales@ocpsoft.com) */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.net.MalformedURLException; import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.bind.ParameterizedPattern; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.param.Parameter; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.bind.ParameterizedPattern; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.param.Parameter; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** - * A {@link Condition} responsible for determining existence of resources within the web root of the servlet container. + * A {@link org.ocpsoft.rewrite.config.Condition} responsible for determining existence of resources within the web root of the servlet container. * * @author Lincoln Baxter, III */ @@ -81,7 +80,7 @@ public boolean evaluateHttp(final HttpServletRewrite event, final EvaluationCont } /** - * Create a new {@link Condition} that returns true if the given resource exists relative to the web root of the + * Create a new {@link org.ocpsoft.rewrite.config.Condition} that returns true if the given resource exists relative to the web root of the * current application. */ public static Resource exists(final String resource) diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Response.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Response.java similarity index 80% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Response.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Response.java index 6a14db192..1cdb8b880 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Response.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Response.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * Responsible for adding various properties such as headers and cookies to the {@link HttpServletResponse} @@ -30,7 +29,7 @@ public abstract class Response extends HttpOperation { /** - * Create an {@link Operation} that adds a header to the {@link HttpServletResponse} + * Create an {@link org.ocpsoft.rewrite.config.Operation} that adds a header to the {@link HttpServletResponse} */ public static Response addHeader(final String name, final String value) { @@ -44,7 +43,7 @@ public void performHttp(final HttpServletRewrite event, final EvaluationContext } /** - * Create an {@link Operation} that adds a date header to the {@link HttpServletResponse} + * Create an {@link org.ocpsoft.rewrite.config.Operation} that adds a date header to the {@link HttpServletResponse} */ public static Response addDateHeader(final String name, final long value) { @@ -58,7 +57,7 @@ public void performHttp(final HttpServletRewrite event, final EvaluationContext } /** - * Create an {@link Operation} that adds an int header to the {@link HttpServletResponse} + * Create an {@link org.ocpsoft.rewrite.config.Operation} that adds an int header to the {@link HttpServletResponse} */ public static Response addIntHeader(final String name, final int value) { @@ -72,7 +71,7 @@ public void performHttp(final HttpServletRewrite event, final EvaluationContext } /** - * Create an {@link Operation} that adds a {@link Cookie} to the {@link HttpServletResponse} + * Create an {@link org.ocpsoft.rewrite.config.Operation} that adds a {@link Cookie} to the {@link HttpServletResponse} */ public static Response addCookie(final Cookie cookie) { diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/SendStatus.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/SendStatus.java similarity index 90% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/SendStatus.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/SendStatus.java index 2eb3cfd67..1befb3e38 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/SendStatus.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/SendStatus.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.http.HttpServletResponse; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * Responsible for sending status codes via {@link HttpServletResponse#setStatus(int)} and diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/ServerPort.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/ServerPort.java similarity index 92% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/ServerPort.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/ServerPort.java index 86b696bab..c951bbc0c 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/ServerPort.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/ServerPort.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.http.HttpServletRequest; import org.ocpsoft.common.util.Assert; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * Responsible for asserting on the {@link HttpServletRequest#getServerPort()} diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/ServletMapping.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/ServletMapping.java similarity index 84% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/ServletMapping.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/ServletMapping.java index fb86c8afd..ae0d449a1 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/ServletMapping.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/ServletMapping.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.net.MalformedURLException; import java.util.Collection; @@ -9,15 +9,14 @@ import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.bind.ParameterizedPattern; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.param.Parameter; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.bind.ParameterizedPattern; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.param.Parameter; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** - * A {@link Condition} responsible for comparing URLs to Servlet Mappings. + * A {@link org.ocpsoft.rewrite.config.Condition} responsible for comparing URLs to Servlet Mappings. * * @author Lincoln Baxter, III */ diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Substitute.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Substitute.java similarity index 79% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Substitute.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Substitute.java index 692f40d03..8a59630d7 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/Substitute.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Substitute.java @@ -13,28 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import org.ocpsoft.common.util.Assert; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.bind.ParameterizedPattern; -import com.ocpsoft.rewrite.bind.RegexOperationParameterBuilder; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.InboundRewrite; -import com.ocpsoft.rewrite.event.OutboundRewrite; -import com.ocpsoft.rewrite.param.OperationParameterBuilder; -import com.ocpsoft.rewrite.param.Parameter; -import com.ocpsoft.rewrite.param.ParameterizedOperation; -import com.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.bind.ParameterizedPattern; +import org.ocpsoft.rewrite.bind.RegexOperationParameterBuilder; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.param.OperationParameterBuilder; +import org.ocpsoft.rewrite.param.Parameter; +import org.ocpsoft.rewrite.param.ParameterizedOperation; +import org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Binding; /** - * Responsible for substituting inbound/outbound URLs with a replacement. For {@link InboundRewrite} events, this - * {@link Operation} calls {@link HttpInboundServletRewrite#forward(String)}, and for {@link OutboundRewrite} events, + * Responsible for substituting inbound/outbound URLs with a replacement. For {@link org.ocpsoft.rewrite.event.InboundRewrite} events, this + * {@link Operation} calls {@link HttpInboundServletRewrite#forward(String)}, and for {@link org.ocpsoft.rewrite.event.OutboundRewrite} events, * this method calls {@link HttpOutboundServletRewrite#setOutboundURL(String)} * * @author Lincoln Baxter, III @@ -66,7 +64,7 @@ private Substitute(final String location) * *

* Parameters may be bound. By default, matching parameter values are extracted from bindings in the - * {@link EvaluationContext}. + * {@link org.ocpsoft.rewrite.context.EvaluationContext}. *

* See also {@link #where(String)} */ diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/bind/Request.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/bind/Request.java similarity index 87% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/bind/Request.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/bind/Request.java index 05d9272b3..f4664b0dc 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/bind/Request.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/bind/Request.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config.bind; +package org.ocpsoft.rewrite.servlet.config.bind; import java.util.Map; import javax.servlet.ServletRequest; -import com.ocpsoft.rewrite.bind.BindingBuilder; -import com.ocpsoft.rewrite.bind.Converter; -import com.ocpsoft.rewrite.bind.Validator; -import com.ocpsoft.rewrite.bind.util.Maps; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.event.ServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; -import com.ocpsoft.rewrite.servlet.impl.HttpRewriteWrappedRequest; +import org.ocpsoft.rewrite.bind.BindingBuilder; +import org.ocpsoft.rewrite.bind.Converter; +import org.ocpsoft.rewrite.bind.Validator; +import org.ocpsoft.rewrite.bind.util.Maps; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.event.ServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.servlet.impl.HttpRewriteWrappedRequest; /** * Responsible for binding to {@link ServletRequest#setAttribute(String, Object)} and @@ -47,7 +47,7 @@ public static BindingBuilder attribute(final String property) } /** - * Bind a value to the {@link ServletRequest#setAttribute(String, Object)} map. Use the given {@link Converter} when + * Bind a value to the {@link ServletRequest#setAttribute(String, Object)} map. Use the given {@link org.ocpsoft.rewrite.bind.Converter} when * retrieving any values. */ public static BindingBuilder attribute(final String property, final Class> type) @@ -56,7 +56,7 @@ public static BindingBuilder attribute(final String property, final Class> converterType, @@ -83,7 +83,7 @@ public static BindingBuilder parameter(final String property, final Class> converterType, diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/Base64.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/Base64.java similarity index 99% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/Base64.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/Base64.java index 076989fb2..96000c8e2 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/Base64.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/Base64.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config.encodequery; +package org.ocpsoft.rewrite.servlet.config.encodequery; import java.io.IOException; diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/Base64EncodingStrategy.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/Base64EncodingStrategy.java similarity index 95% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/Base64EncodingStrategy.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/Base64EncodingStrategy.java index 0b90f67b1..a67f62c32 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/Base64EncodingStrategy.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/Base64EncodingStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config.encodequery; +package org.ocpsoft.rewrite.servlet.config.encodequery; /** * Simple {@link Base64} encoding strategy. diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/ChecksumStrategy.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/ChecksumStrategy.java similarity index 95% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/ChecksumStrategy.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/ChecksumStrategy.java index 58832c297..1d24117dd 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/ChecksumStrategy.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/ChecksumStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config.encodequery; +package org.ocpsoft.rewrite.servlet.config.encodequery; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/EncodingStrategy.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/EncodingStrategy.java similarity index 94% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/EncodingStrategy.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/EncodingStrategy.java index 148277cbd..77b8ec078 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/EncodingStrategy.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/EncodingStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config.encodequery; +package org.ocpsoft.rewrite.servlet.config.encodequery; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/HashCodeChecksumStrategy.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/HashCodeChecksumStrategy.java similarity index 96% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/HashCodeChecksumStrategy.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/HashCodeChecksumStrategy.java index 5604318c3..8f9af26a0 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/encodequery/HashCodeChecksumStrategy.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/encodequery/HashCodeChecksumStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config.encodequery; +package org.ocpsoft.rewrite.servlet.config.encodequery; /** * Checksum strategy based on Java String hashCode() equality diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/rule/Join.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/rule/Join.java similarity index 88% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/rule/Join.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/rule/Join.java index af65f7460..138e38d06 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/rule/Join.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/rule/Join.java @@ -13,37 +13,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config.rule; +package org.ocpsoft.rewrite.servlet.config.rule; import java.util.List; import javax.servlet.http.HttpServletRequest; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.bind.RegexParameter; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.config.ConditionBuilder; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.config.Rule; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.param.Constraint; -import com.ocpsoft.rewrite.param.Parameter; -import com.ocpsoft.rewrite.param.Parameterized; -import com.ocpsoft.rewrite.param.Transform; -import com.ocpsoft.rewrite.servlet.config.DispatchType; -import com.ocpsoft.rewrite.servlet.config.Forward; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.QueryString; -import com.ocpsoft.rewrite.servlet.config.Redirect; -import com.ocpsoft.rewrite.servlet.config.Substitute; -import com.ocpsoft.rewrite.servlet.config.rule.Join.JoinParameterBuilder; -import com.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; -import com.ocpsoft.rewrite.servlet.util.QueryStringBuilder; +import org.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.bind.RegexParameter; +import org.ocpsoft.rewrite.config.Condition; +import org.ocpsoft.rewrite.config.ConditionBuilder; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.config.Rule; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.param.Constraint; +import org.ocpsoft.rewrite.param.Parameter; +import org.ocpsoft.rewrite.param.Parameterized; +import org.ocpsoft.rewrite.param.Transform; +import org.ocpsoft.rewrite.servlet.config.DispatchType; +import org.ocpsoft.rewrite.servlet.config.*; +import org.ocpsoft.rewrite.servlet.config.Redirect; +import org.ocpsoft.rewrite.servlet.config.Substitute; +import org.ocpsoft.rewrite.servlet.config.rule.Join.JoinParameterBuilder; +import org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; +import org.ocpsoft.rewrite.servlet.util.QueryStringBuilder; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.servlet.config.QueryString; /** - * {@link Rule} that creates a bi-directional rewrite rule between an externally facing URL and an internal server + * {@link org.ocpsoft.rewrite.config.Rule} that creates a bi-directional rewrite rule between an externally facing URL and an internal server * resource URL * * @author Lincoln Baxter, III @@ -122,7 +122,7 @@ else if (inboundCorrection } } context.addPreOperation(Redirect.permanent(((HttpInboundServletRewrite) event).getContextPath() - + pattern)); + + pattern)); return true; } } diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/rule/TrailingSlash.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/rule/TrailingSlash.java similarity index 85% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/rule/TrailingSlash.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/rule/TrailingSlash.java index 0f3439076..58e6ee29e 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/config/rule/TrailingSlash.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/rule/TrailingSlash.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config.rule; - -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.config.Direction; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.config.Rule; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.InboundRewrite; -import com.ocpsoft.rewrite.event.OutboundRewrite; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.Redirect; -import com.ocpsoft.rewrite.servlet.config.Substitute; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +package org.ocpsoft.rewrite.servlet.config.rule; + +import org.ocpsoft.rewrite.config.Condition; +import org.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.config.Rule; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.InboundRewrite; +import org.ocpsoft.rewrite.event.OutboundRewrite; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.servlet.config.Redirect; +import org.ocpsoft.rewrite.servlet.config.Substitute; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** - * {@link Rule} that creates a bi-directional rewrite rule handling appending or removal of the trailing slash character + * {@link org.ocpsoft.rewrite.config.Rule} that creates a bi-directional rewrite rule handling appending or removal of the trailing slash character * in paths. * * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/CompileException.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/CompileException.java similarity index 96% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/CompileException.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/CompileException.java index ba9eb0720..f0d1f1004 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/CompileException.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/CompileException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/DefaultHttpRewriteProvider.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/DefaultHttpRewriteProvider.java similarity index 82% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/DefaultHttpRewriteProvider.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/DefaultHttpRewriteProvider.java index 7fd365448..b05469c6b 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/DefaultHttpRewriteProvider.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/DefaultHttpRewriteProvider.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import org.ocpsoft.common.services.NonEnriching; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationLoader; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.config.Rule; -import com.ocpsoft.rewrite.servlet.event.BaseRewrite.Flow; -import com.ocpsoft.rewrite.servlet.http.HttpRewriteProvider; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.*; +import org.ocpsoft.rewrite.servlet.event.BaseRewrite.Flow; +import org.ocpsoft.rewrite.servlet.http.HttpRewriteProvider; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.config.Rule; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/EvaluationContextImpl.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/EvaluationContextImpl.java similarity index 90% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/EvaluationContextImpl.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/EvaluationContextImpl.java index 3b22f9e89..d81c686a2 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/EvaluationContextImpl.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/EvaluationContextImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.context.ContextBase; -import com.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.context.ContextBase; +import org.ocpsoft.rewrite.context.EvaluationContext; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteImpl.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteImpl.java similarity index 94% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteImpl.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteImpl.java index 287f2563a..65f1f441c 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteImpl.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import java.io.IOException; @@ -22,11 +22,11 @@ import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.exception.RewriteException; -import com.ocpsoft.rewrite.servlet.event.BaseRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; -import com.ocpsoft.rewrite.servlet.util.QueryStringBuilder; -import com.ocpsoft.rewrite.servlet.util.URLBuilder; +import org.ocpsoft.rewrite.exception.RewriteException; +import org.ocpsoft.rewrite.servlet.event.BaseRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; +import org.ocpsoft.rewrite.servlet.util.QueryStringBuilder; +import org.ocpsoft.rewrite.servlet.util.URLBuilder; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteProducer.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteProducer.java similarity index 86% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteProducer.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteProducer.java index ef495ee50..61d05572c 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteProducer.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpInboundRewriteProducer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -22,15 +22,15 @@ import org.ocpsoft.common.services.NonEnriching; -import com.ocpsoft.rewrite.servlet.event.InboundServletRewrite; -import com.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer; +import org.ocpsoft.rewrite.servlet.event.InboundServletRewrite; +import org.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer; /** * @author Lincoln Baxter, III * */ public class HttpInboundRewriteProducer implements -InboundRewriteProducer, + InboundRewriteProducer, NonEnriching { @Override diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteImpl.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteImpl.java similarity index 92% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteImpl.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteImpl.java index 672ac88c3..356dc87ef 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteImpl.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ocpsoft.rewrite.servlet.event.BaseRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; +import org.ocpsoft.rewrite.servlet.event.BaseRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; /** * @author Lincoln Baxter, III * */ public class HttpOutboundRewriteImpl extends BaseRewrite implements - HttpOutboundServletRewrite + HttpOutboundServletRewrite { private String url; diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteProducer.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteProducer.java similarity index 86% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteProducer.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteProducer.java index 71ef0a673..5e5101bc2 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteProducer.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpOutboundRewriteProducer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -22,15 +22,15 @@ import org.ocpsoft.common.services.NonEnriching; -import com.ocpsoft.rewrite.servlet.event.OutboundServletRewrite; -import com.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer; +import org.ocpsoft.rewrite.servlet.event.OutboundServletRewrite; +import org.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer; /** * @author Lincoln Baxter, III * */ public class HttpOutboundRewriteProducer implements -OutboundRewriteProducer, + OutboundRewriteProducer, NonEnriching { @Override diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpRewriteRequestCycleWrapper.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteRequestCycleWrapper.java similarity index 92% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpRewriteRequestCycleWrapper.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteRequestCycleWrapper.java index 4621a9103..742709e51 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpRewriteRequestCycleWrapper.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteRequestCycleWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import java.util.HashMap; import java.util.Map; @@ -24,8 +24,8 @@ import org.ocpsoft.common.services.NonEnriching; import org.ocpsoft.common.services.ServiceLoader; -import com.ocpsoft.rewrite.servlet.http.HttpRequestCycleWrapper; -import com.ocpsoft.rewrite.servlet.spi.RequestParameterProvider; +import org.ocpsoft.rewrite.servlet.http.HttpRequestCycleWrapper; +import org.ocpsoft.rewrite.servlet.spi.RequestParameterProvider; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedRequest.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedRequest.java similarity index 98% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedRequest.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedRequest.java index 40067678c..cae83ae00 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedRequest.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import java.util.Collections; import java.util.Enumeration; diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java similarity index 88% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java index 417bcc483..084ceef4e 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.RewriteLifecycleContext; -import com.ocpsoft.rewrite.servlet.event.BaseRewrite.Flow; -import com.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; -import com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; -import com.ocpsoft.rewrite.spi.RewriteProvider; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.RewriteLifecycleContext; +import org.ocpsoft.rewrite.servlet.event.BaseRewrite.Flow; +import org.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; +import org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; +import org.ocpsoft.rewrite.spi.RewriteProvider; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/RewriteContextImpl.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/RewriteContextImpl.java similarity index 87% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/RewriteContextImpl.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/RewriteContextImpl.java index dfd7e5f20..a2f3a5cd4 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/RewriteContextImpl.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/RewriteContextImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import java.util.HashMap; import java.util.List; @@ -22,13 +22,13 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.RewriteLifecycleContext; -import com.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer; -import com.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer; -import com.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper; -import com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; -import com.ocpsoft.rewrite.spi.RewriteProvider; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.RewriteLifecycleContext; +import org.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer; +import org.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer; +import org.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper; +import org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; +import org.ocpsoft.rewrite.spi.RewriteProvider; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/RewriteServletContextListener.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/RewriteServletContextListener.java similarity index 94% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/RewriteServletContextListener.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/RewriteServletContextListener.java index d82b2f6bd..4f2b781ea 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/RewriteServletContextListener.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/RewriteServletContextListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import java.util.List; @@ -23,7 +23,7 @@ import org.ocpsoft.common.services.ServiceLoader; import org.ocpsoft.common.util.Iterators; -import com.ocpsoft.rewrite.servlet.spi.ContextListener; +import org.ocpsoft.rewrite.servlet.spi.ContextListener; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/RewriteServletRequestListener.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/RewriteServletRequestListener.java similarity index 94% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/RewriteServletRequestListener.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/RewriteServletRequestListener.java index c3137cc05..1a1c7e1a1 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/impl/RewriteServletRequestListener.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/RewriteServletRequestListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.impl; +package org.ocpsoft.rewrite.servlet.impl; import java.util.List; @@ -23,7 +23,7 @@ import org.ocpsoft.common.services.ServiceLoader; import org.ocpsoft.common.util.Iterators; -import com.ocpsoft.rewrite.servlet.spi.RequestListener; +import org.ocpsoft.rewrite.servlet.spi.RequestListener; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/util/Metadata.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/util/Metadata.java similarity index 98% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/util/Metadata.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/util/Metadata.java index f16e2a018..8e6230272 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/util/Metadata.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/util/Metadata.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.util; +package org.ocpsoft.rewrite.servlet.util; import java.util.Iterator; import java.util.List; diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/util/QueryStringBuilder.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilder.java similarity index 99% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/util/QueryStringBuilder.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilder.java index 9a19542c7..dde50f0e0 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/util/QueryStringBuilder.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.util; +package org.ocpsoft.rewrite.servlet.util; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -31,7 +31,7 @@ import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.exception.RewriteException; +import org.ocpsoft.rewrite.exception.RewriteException; /** * Utility for building URL query strings. diff --git a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/util/URLBuilder.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/util/URLBuilder.java similarity index 99% rename from impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/util/URLBuilder.java rename to impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/util/URLBuilder.java index cc4b1cfc0..bdce114f8 100644 --- a/impl-servlet/src/main/java/com/ocpsoft/rewrite/servlet/util/URLBuilder.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/util/URLBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.util; +package org.ocpsoft.rewrite.servlet.util; import java.net.URI; import java.net.URISyntaxException; diff --git a/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer b/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer deleted file mode 100644 index 7e08c976c..000000000 --- a/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteProducer \ No newline at end of file diff --git a/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer b/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer deleted file mode 100644 index 73546c97c..000000000 --- a/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.servlet.impl.HttpOutboundRewriteProducer \ No newline at end of file diff --git a/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper b/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper deleted file mode 100644 index 83d67c310..000000000 --- a/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.servlet.impl.HttpRewriteRequestCycleWrapper \ No newline at end of file diff --git a/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.RewriteProvider b/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.RewriteProvider deleted file mode 100644 index d6576a90f..000000000 --- a/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.RewriteProvider +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.servlet.impl.DefaultHttpRewriteProvider \ No newline at end of file diff --git a/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer b/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer new file mode 100644 index 000000000..2e9388bbc --- /dev/null +++ b/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.InboundRewriteProducer @@ -0,0 +1 @@ +org.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteProducer \ No newline at end of file diff --git a/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer b/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer new file mode 100644 index 000000000..6f01e4f81 --- /dev/null +++ b/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.OutboundRewriteProducer @@ -0,0 +1 @@ +org.ocpsoft.rewrite.servlet.impl.HttpOutboundRewriteProducer \ No newline at end of file diff --git a/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper b/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper new file mode 100644 index 000000000..2f3fe79ab --- /dev/null +++ b/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper @@ -0,0 +1 @@ +org.ocpsoft.rewrite.servlet.impl.HttpRewriteRequestCycleWrapper \ No newline at end of file diff --git a/impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.RewriteLifecycleListener b/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.RewriteLifecycleListener similarity index 100% rename from impl-servlet/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.RewriteLifecycleListener rename to impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.RewriteLifecycleListener diff --git a/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.RewriteProvider b/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.RewriteProvider new file mode 100644 index 000000000..5a7fdc671 --- /dev/null +++ b/impl-servlet/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.RewriteProvider @@ -0,0 +1 @@ +org.ocpsoft.rewrite.servlet.impl.DefaultHttpRewriteProvider \ No newline at end of file diff --git a/impl-servlet/src/main/resources/META-INF/web-fragment.xml b/impl-servlet/src/main/resources/META-INF/web-fragment.xml index ca55d7d45..a009c29ff 100644 --- a/impl-servlet/src/main/resources/META-INF/web-fragment.xml +++ b/impl-servlet/src/main/resources/META-INF/web-fragment.xml @@ -15,16 +15,16 @@ - com.ocpsoft.rewrite.servlet.impl.RewriteServletRequestListener + org.ocpsoft.rewrite.servlet.impl.RewriteServletRequestListener - com.ocpsoft.rewrite.servlet.impl.RewriteServletContextListener + org.ocpsoft.rewrite.servlet.impl.RewriteServletContextListener OCPSoft Rewrite Filter - com.ocpsoft.rewrite.servlet.RewriteFilter + org.ocpsoft.rewrite.servlet.RewriteFilter true diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/ServletRoot.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/ServletRoot.java similarity index 95% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/ServletRoot.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/ServletRoot.java index f34a16b24..ffb919c98 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/ServletRoot.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/ServletRoot.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet; +package org.ocpsoft.rewrite.servlet; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/DomainTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/DomainTest.java similarity index 87% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/DomainTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/DomainTest.java index 5604b11e2..68486a500 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/DomainTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/DomainTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.http.HttpServletRequest; @@ -22,12 +22,12 @@ import org.junit.Test; import org.mockito.Mockito; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.servlet.config.bind.Request; -import com.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; -import com.ocpsoft.rewrite.servlet.impl.HttpOutboundRewriteImpl; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.servlet.config.bind.Request; +import org.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; +import org.ocpsoft.rewrite.servlet.impl.HttpOutboundRewriteImpl; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationProvider.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationProvider.java similarity index 87% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationProvider.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationProvider.java index c2d6b6907..f0dbda4b4 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationProvider.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationProvider.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Direction; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationTest.java similarity index 86% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationTest.java index 604ecee0a..67c3205a2 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import junit.framework.Assert; @@ -24,10 +24,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.servlet.ServletRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.servlet.ServletRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -43,8 +42,8 @@ public static WebArchive getDeployment() .addPackages(true, ServletRoot.class.getPackage()) .addAsResource( new StringAsset( - "com.ocpsoft.rewrite.servlet.config.EncodeQueryConfigurationProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + "org.ocpsoft.rewrite.servlet.config.EncodeQueryConfigurationProvider"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HeaderAndPathTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HeaderAndPathTest.java similarity index 92% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HeaderAndPathTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HeaderAndPathTest.java index febf0f928..fe67bea1a 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HeaderAndPathTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HeaderAndPathTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.util.Arrays; import java.util.Collections; @@ -25,9 +25,9 @@ import org.junit.Test; import org.mockito.Mockito; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HeaderTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HeaderTest.java similarity index 92% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HeaderTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HeaderTest.java index 62a9730d7..1b98a8d66 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HeaderTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HeaderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.util.Arrays; import java.util.Collections; @@ -26,10 +26,10 @@ import org.junit.Test; import org.mockito.Mockito; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.mock.MockRewrite; -import com.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.mock.MockRewrite; +import org.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationOrderTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationOrderTest.java similarity index 81% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationOrderTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationOrderTest.java index aa9bf0870..8c8706356 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationOrderTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationOrderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import junit.framework.Assert; @@ -24,10 +24,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.servlet.ServletRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.servlet.ServletRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -43,10 +42,10 @@ public static WebArchive getDeployment() .addPackages(true, ServletRoot.class.getPackage()) .addAsResource( new StringAsset( - "com.ocpsoft.rewrite.servlet.config.HttpConfigurationTestProvider" + + "org.ocpsoft.rewrite.servlet.config.HttpConfigurationTestProvider" + "\n" + - "com.ocpsoft.rewrite.servlet.config.HttpConfigurationTestProviderTwo"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + "org.ocpsoft.rewrite.servlet.config.HttpConfigurationTestProviderTwo"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationTest.java similarity index 87% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationTest.java index 2401f2d06..087933333 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import junit.framework.Assert; @@ -24,10 +24,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.servlet.ServletRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.servlet.ServletRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -40,8 +39,8 @@ public static WebArchive getDeployment() { WebArchive deployment = RewriteTestBase.getDeployment() .addPackages(true, ServletRoot.class.getPackage()) - .addAsResource(new StringAsset("com.ocpsoft.rewrite.servlet.config.HttpConfigurationTestProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + .addAsResource(new StringAsset("org.ocpsoft.rewrite.servlet.config.HttpConfigurationTestProvider"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProvider.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProvider.java similarity index 88% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProvider.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProvider.java index e30eb098f..3150999cf 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProvider.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProvider.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.Direction; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProviderTwo.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProviderTwo.java similarity index 86% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProviderTwo.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProviderTwo.java index cd17aee59..0f7a3d9bb 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProviderTwo.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/HttpConfigurationTestProviderTwo.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Direction; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/JoinConfigurationProvider.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinConfigurationProvider.java similarity index 91% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/JoinConfigurationProvider.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinConfigurationProvider.java index 80ced2603..4b40b7282 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/JoinConfigurationProvider.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinConfigurationProvider.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Direction; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.servlet.config.rule.Join; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.config.rule.Join; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/JoinConfigurationTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinConfigurationTest.java similarity index 91% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/JoinConfigurationTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinConfigurationTest.java index 88596b69a..a316df3e9 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/JoinConfigurationTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinConfigurationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import junit.framework.Assert; @@ -24,10 +24,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.servlet.ServletRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.servlet.ServletRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -43,8 +42,8 @@ public static WebArchive getDeployment() .addPackages(true, ServletRoot.class.getPackage()) .addAsResource( new StringAsset( - "com.ocpsoft.rewrite.servlet.config.JoinConfigurationProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + "org.ocpsoft.rewrite.servlet.config.JoinConfigurationProvider"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/LifecycleControlConfigurationProvider.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/LifecycleControlConfigurationProvider.java similarity index 91% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/LifecycleControlConfigurationProvider.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/LifecycleControlConfigurationProvider.java index 05552b9c7..3ec16c12f 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/LifecycleControlConfigurationProvider.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/LifecycleControlConfigurationProvider.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/LifecycleControlTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/LifecycleControlTest.java similarity index 88% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/LifecycleControlTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/LifecycleControlTest.java index 5a24413e2..11e879e68 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/LifecycleControlTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/LifecycleControlTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import junit.framework.Assert; @@ -24,10 +24,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.servlet.ServletRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.servlet.ServletRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -43,8 +42,8 @@ public static WebArchive getDeployment() .addPackages(true, ServletRoot.class.getPackage()) .addAsResource( new StringAsset( - "com.ocpsoft.rewrite.servlet.config.LifecycleControlConfigurationProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + "org.ocpsoft.rewrite.servlet.config.LifecycleControlConfigurationProvider"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/MethodTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/MethodTest.java similarity index 87% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/MethodTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/MethodTest.java index a18c241e0..f33988734 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/MethodTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/MethodTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.http.HttpServletRequest; @@ -22,9 +22,9 @@ import org.junit.Test; import org.mockito.Mockito; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/ParameterConfigurationProvider.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ParameterConfigurationProvider.java similarity index 82% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/ParameterConfigurationProvider.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ParameterConfigurationProvider.java index f05df182c..0732b2244 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/ParameterConfigurationProvider.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ParameterConfigurationProvider.java @@ -13,24 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Direction; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.mock.MockFailedBinding; -import com.ocpsoft.rewrite.servlet.config.Forward; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.HttpOperation; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.RequestParameter; -import com.ocpsoft.rewrite.servlet.config.Response; -import com.ocpsoft.rewrite.servlet.config.SendStatus; -import com.ocpsoft.rewrite.servlet.config.bind.Request; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.mock.MockFailedBinding; +import org.ocpsoft.rewrite.servlet.config.bind.Request; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/ParameterConfigurationTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ParameterConfigurationTest.java similarity index 89% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/ParameterConfigurationTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ParameterConfigurationTest.java index 700fb5588..353567d0c 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/ParameterConfigurationTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ParameterConfigurationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import junit.framework.Assert; @@ -24,10 +24,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.servlet.ServletRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.servlet.ServletRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -43,8 +42,8 @@ public static WebArchive getDeployment() .addPackages(true, ServletRoot.class.getPackage()) .addAsResource( new StringAsset( - "com.ocpsoft.rewrite.servlet.config.ParameterConfigurationProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + "org.ocpsoft.rewrite.servlet.config.ParameterConfigurationProvider"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/PathTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/PathTest.java similarity index 87% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/PathTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/PathTest.java index abf3499db..97cbeed7e 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/PathTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/PathTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.util.List; @@ -24,14 +24,14 @@ import org.junit.Test; import org.mockito.Mockito; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.mock.MockBinding; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.mock.MockRewrite; -import com.ocpsoft.rewrite.param.ConditionParameterBuilder; -import com.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.mock.MockBinding; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.mock.MockRewrite; +import org.ocpsoft.rewrite.param.ConditionParameterBuilder; +import org.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/PortTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/PortTest.java similarity index 92% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/PortTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/PortTest.java index 3c7a5952c..577b07e81 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/PortTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/PortTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.http.HttpServletRequest; @@ -22,9 +22,9 @@ import org.junit.Test; import org.mockito.Mockito; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/QueryStringEncodingTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/QueryStringEncodingTest.java similarity index 92% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/QueryStringEncodingTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/QueryStringEncodingTest.java index 4e323708e..9ed558198 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/QueryStringEncodingTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/QueryStringEncodingTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.util.List; @@ -24,12 +24,12 @@ import org.junit.Test; import org.mockito.Mockito; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.mock.MockBinding; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.mock.MockRewrite; -import com.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.mock.MockBinding; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.mock.MockRewrite; +import org.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/QueryStringSimpleTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/QueryStringSimpleTest.java similarity index 91% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/QueryStringSimpleTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/QueryStringSimpleTest.java index 4c1bd922d..69cd773c4 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/QueryStringSimpleTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/QueryStringSimpleTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.http.HttpServletRequest; @@ -22,10 +22,9 @@ import org.junit.Test; import org.mockito.Mockito; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.servlet.config.QueryString; -import com.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestBindingProvider.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestBindingProvider.java similarity index 85% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestBindingProvider.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestBindingProvider.java index 593bcb268..1c5d29c5a 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestBindingProvider.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestBindingProvider.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.servlet.config.bind.Request; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.config.bind.Request; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestBindingTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestBindingTest.java similarity index 85% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestBindingTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestBindingTest.java index c2eb68e17..b4cf924cb 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestBindingTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestBindingTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import junit.framework.Assert; @@ -24,10 +24,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.servlet.ServletRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.servlet.ServletRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -43,8 +42,8 @@ public static WebArchive getDeployment() .addPackages(true, ServletRoot.class.getPackage()) .addAsResource( new StringAsset( - "com.ocpsoft.rewrite.servlet.config.RequestBindingProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + "org.ocpsoft.rewrite.servlet.config.RequestBindingProvider"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestConstraintTransformProvider.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestConstraintTransformProvider.java similarity index 85% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestConstraintTransformProvider.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestConstraintTransformProvider.java index 9648aca9f..e3392aec6 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestConstraintTransformProvider.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestConstraintTransformProvider.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Direction; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.param.Constraint; -import com.ocpsoft.rewrite.param.Transform; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.param.Constraint; +import org.ocpsoft.rewrite.param.Transform; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestConstraintTransformTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestConstraintTransformTest.java similarity index 89% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestConstraintTransformTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestConstraintTransformTest.java index 15b7ee695..481fb81af 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestConstraintTransformTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestConstraintTransformTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import junit.framework.Assert; @@ -24,10 +24,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.servlet.ServletRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.servlet.ServletRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -43,8 +42,8 @@ public static WebArchive getDeployment() .addPackages(true, ServletRoot.class.getPackage()) .addAsResource( new StringAsset( - "com.ocpsoft.rewrite.servlet.config.RequestConstraintTransformProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + "org.ocpsoft.rewrite.servlet.config.RequestConstraintTransformProvider"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestParameterTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestParameterTest.java similarity index 93% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestParameterTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestParameterTest.java index 04cd3044a..8d79f8f7b 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/config/RequestParameterTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestParameterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import java.util.Arrays; import java.util.Collections; @@ -26,10 +26,10 @@ import org.junit.Test; import org.mockito.Mockito; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.mock.MockEvaluationContext; -import com.ocpsoft.rewrite.mock.MockRewrite; -import com.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.mock.MockEvaluationContext; +import org.ocpsoft.rewrite.mock.MockRewrite; +import org.ocpsoft.rewrite.servlet.impl.HttpInboundRewriteImpl; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java similarity index 99% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java index 03bc095fb..e84a0cc64 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.util; +package org.ocpsoft.rewrite.servlet.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/util/URLBuilderTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/URLBuilderTest.java similarity index 99% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/util/URLBuilderTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/URLBuilderTest.java index 473baf899..43b0c7c7e 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/util/URLBuilderTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/URLBuilderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.util; +package org.ocpsoft.rewrite.servlet.util; import static org.junit.Assert.assertEquals; diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/validate/BindingValidationTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/validate/BindingValidationTest.java similarity index 87% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/validate/BindingValidationTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/validate/BindingValidationTest.java index f7650ad9e..240486e6d 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/validate/BindingValidationTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/validate/BindingValidationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.validate; +package org.ocpsoft.rewrite.servlet.validate; import junit.framework.Assert; @@ -24,10 +24,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.servlet.ServletRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.servlet.ServletRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -40,8 +39,8 @@ public static WebArchive getDeployment() { WebArchive deployment = RewriteTestBase.getDeployment() .addPackages(true, ServletRoot.class.getPackage()) - .addAsResource(new StringAsset("com.ocpsoft.rewrite.servlet.validate.BindingValidationTestProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + .addAsResource(new StringAsset("org.ocpsoft.rewrite.servlet.validate.BindingValidationTestProvider"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/validate/BindingValidationTestProvider.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/validate/BindingValidationTestProvider.java similarity index 78% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/validate/BindingValidationTestProvider.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/validate/BindingValidationTestProvider.java index 087472347..bb9b0e9b6 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/validate/BindingValidationTestProvider.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/validate/BindingValidationTestProvider.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.validate; +package org.ocpsoft.rewrite.servlet.validate; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.bind.Validator; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Direction; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.SendStatus; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.bind.Validator; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.servlet.config.SendStatus; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/wrapper/HttpForwardConfigurationTestProvider.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/wrapper/HttpForwardConfigurationTestProvider.java similarity index 79% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/wrapper/HttpForwardConfigurationTestProvider.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/wrapper/HttpForwardConfigurationTestProvider.java index 262c3976c..05b13619d 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/wrapper/HttpForwardConfigurationTestProvider.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/wrapper/HttpForwardConfigurationTestProvider.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.wrapper; +package org.ocpsoft.rewrite.servlet.wrapper; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Direction; -import com.ocpsoft.rewrite.servlet.config.Forward; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.RequestParameter; -import com.ocpsoft.rewrite.servlet.config.SendStatus; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.servlet.config.Forward; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.servlet.config.*; +import org.ocpsoft.rewrite.servlet.config.SendStatus; /** * @author Lincoln Baxter, III diff --git a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/wrapper/HttpForwardingWithNewQueryParamsTest.java b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/wrapper/HttpForwardingWithNewQueryParamsTest.java similarity index 86% rename from impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/wrapper/HttpForwardingWithNewQueryParamsTest.java rename to impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/wrapper/HttpForwardingWithNewQueryParamsTest.java index f23e86d5a..5fc387b15 100644 --- a/impl-servlet/src/test/java/com/ocpsoft/rewrite/servlet/wrapper/HttpForwardingWithNewQueryParamsTest.java +++ b/impl-servlet/src/test/java/org/ocpsoft/rewrite/servlet/wrapper/HttpForwardingWithNewQueryParamsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.wrapper; +package org.ocpsoft.rewrite.servlet.wrapper; import junit.framework.Assert; @@ -24,10 +24,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.servlet.ServletRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.servlet.ServletRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -42,8 +41,8 @@ public static WebArchive getDeployment() .getDeployment() .addPackages(true, ServletRoot.class.getPackage()) .addAsResource( - new StringAsset("com.ocpsoft.rewrite.servlet.wrapper.HttpForwardConfigurationTestProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + new StringAsset("org.ocpsoft.rewrite.servlet.wrapper.HttpForwardConfigurationTestProvider"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } diff --git a/integration-cdi/README.md b/integration-cdi/README.md index 91c58b10c..2c8f295d5 100644 --- a/integration-cdi/README.md +++ b/integration-cdi/README.md @@ -9,7 +9,7 @@ Get Started 1. Include OCPSoft Rewrite in your application's POM file: - com.ocpsoft.rewrite + org.ocpsoft.rewrite rewrite-integation-cdi ${rewrite.version} diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/CdiExpressionLanguageProvider.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/CdiExpressionLanguageProvider.java similarity index 97% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/CdiExpressionLanguageProvider.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/CdiExpressionLanguageProvider.java index 459f4dd6f..45523dc19 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/CdiExpressionLanguageProvider.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/CdiExpressionLanguageProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi; +package org.ocpsoft.rewrite.cdi; import javax.el.ELContext; import javax.el.ELException; @@ -23,7 +23,7 @@ import org.jboss.solder.el.Expressions; -import com.ocpsoft.rewrite.spi.ExpressionLanguageProvider; +import org.ocpsoft.rewrite.spi.ExpressionLanguageProvider; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/CdiServiceEnricher.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/CdiServiceEnricher.java similarity index 98% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/CdiServiceEnricher.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/CdiServiceEnricher.java index fb62485a4..3e3b63b8b 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/CdiServiceEnricher.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/CdiServiceEnricher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi; +package org.ocpsoft.rewrite.cdi; import java.util.ArrayList; import java.util.Collection; diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/CdiServiceLocator.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/CdiServiceLocator.java similarity index 98% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/CdiServiceLocator.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/CdiServiceLocator.java index e6f0ae17b..a6f7b5e1d 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/CdiServiceLocator.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/CdiServiceLocator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi; +package org.ocpsoft.rewrite.cdi; import java.lang.annotation.Annotation; import java.util.ArrayList; diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/bridge/RequestCycleWrapperBridge.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/bridge/RequestCycleWrapperBridge.java similarity index 88% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/bridge/RequestCycleWrapperBridge.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/bridge/RequestCycleWrapperBridge.java index 3e6bd5e8e..a3f7d2847 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/bridge/RequestCycleWrapperBridge.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/bridge/RequestCycleWrapperBridge.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.bridge; +package org.ocpsoft.rewrite.cdi.bridge; import javax.enterprise.inject.spi.BeanManager; import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ocpsoft.rewrite.cdi.events.WrapRequest; -import com.ocpsoft.rewrite.cdi.events.WrapResponse; -import com.ocpsoft.rewrite.servlet.http.HttpRequestCycleWrapper; +import org.ocpsoft.rewrite.cdi.events.WrapRequest; +import org.ocpsoft.rewrite.cdi.events.WrapResponse; +import org.ocpsoft.rewrite.servlet.http.HttpRequestCycleWrapper; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventBridge.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventBridge.java similarity index 81% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventBridge.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventBridge.java index 96df9892e..14da4d16f 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventBridge.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventBridge.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.bridge; +package org.ocpsoft.rewrite.cdi.bridge; import javax.enterprise.inject.spi.BeanManager; import javax.inject.Inject; -import com.ocpsoft.rewrite.cdi.events.AfterRewrite; -import com.ocpsoft.rewrite.cdi.events.AfterRewriteLifecycle; -import com.ocpsoft.rewrite.cdi.events.BeforeRewrite; -import com.ocpsoft.rewrite.cdi.events.BeforeRewriteLifecycle; -import com.ocpsoft.rewrite.servlet.http.HttpRewriteLifecycleListener; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; -import com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; +import org.ocpsoft.rewrite.cdi.events.AfterRewrite; +import org.ocpsoft.rewrite.cdi.events.AfterRewriteLifecycle; +import org.ocpsoft.rewrite.cdi.events.BeforeRewrite; +import org.ocpsoft.rewrite.cdi.events.BeforeRewriteLifecycle; +import org.ocpsoft.rewrite.servlet.http.HttpRewriteLifecycleListener; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener; /** * Propagates events from {@link RewriteLifecycleListener} to CDI Event bus. diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/bridge/RewriteProviderBridge.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/bridge/RewriteProviderBridge.java similarity index 88% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/bridge/RewriteProviderBridge.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/bridge/RewriteProviderBridge.java index c29f13523..24a0d5628 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/bridge/RewriteProviderBridge.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/bridge/RewriteProviderBridge.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.bridge; +package org.ocpsoft.rewrite.cdi.bridge; import javax.enterprise.inject.spi.BeanManager; import javax.inject.Inject; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import com.ocpsoft.rewrite.servlet.ServletRewriteProvider; -import com.ocpsoft.rewrite.servlet.event.ServletRewrite; +import org.ocpsoft.rewrite.servlet.ServletRewriteProvider; +import org.ocpsoft.rewrite.servlet.event.ServletRewrite; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterInboundRewrite.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterInboundRewrite.java similarity index 91% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterInboundRewrite.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterInboundRewrite.java index fd25e86e1..013273858 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterInboundRewrite.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterInboundRewrite.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.events; +package org.ocpsoft.rewrite.cdi.events; -import com.ocpsoft.rewrite.event.InboundRewrite; +import org.ocpsoft.rewrite.event.InboundRewrite; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterOutboundRewrite.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterOutboundRewrite.java similarity index 91% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterOutboundRewrite.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterOutboundRewrite.java index a557bec0f..cbdc83ac6 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterOutboundRewrite.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterOutboundRewrite.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.events; +package org.ocpsoft.rewrite.cdi.events; -import com.ocpsoft.rewrite.event.OutboundRewrite; +import org.ocpsoft.rewrite.event.OutboundRewrite; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterRewrite.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterRewrite.java similarity index 92% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterRewrite.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterRewrite.java index 1de3b3582..1d20ea21d 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterRewrite.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterRewrite.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.events; +package org.ocpsoft.rewrite.cdi.events; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterRewriteLifecycle.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterRewriteLifecycle.java similarity index 92% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterRewriteLifecycle.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterRewriteLifecycle.java index bfb32677e..5e01ab0e0 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/AfterRewriteLifecycle.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/AfterRewriteLifecycle.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.events; +package org.ocpsoft.rewrite.cdi.events; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/BeforeInboundRewrite.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/BeforeInboundRewrite.java similarity index 88% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/BeforeInboundRewrite.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/BeforeInboundRewrite.java index 48feb7e3b..7d8692bb6 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/BeforeInboundRewrite.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/BeforeInboundRewrite.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.events; +package org.ocpsoft.rewrite.cdi.events; -import com.ocpsoft.rewrite.event.InboundRewrite; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.event.InboundRewrite; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/BeforeRewrite.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/BeforeRewrite.java similarity index 92% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/BeforeRewrite.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/BeforeRewrite.java index 34dcfd78b..36f84261e 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/BeforeRewrite.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/BeforeRewrite.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.events; +package org.ocpsoft.rewrite.cdi.events; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/BeforeRewriteLifecycle.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/BeforeRewriteLifecycle.java similarity index 92% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/BeforeRewriteLifecycle.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/BeforeRewriteLifecycle.java index 98e6d2db0..8b7b327f3 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/BeforeRewriteLifecycle.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/BeforeRewriteLifecycle.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.events; +package org.ocpsoft.rewrite.cdi.events; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/WrapRequest.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/WrapRequest.java similarity index 97% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/WrapRequest.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/WrapRequest.java index 35ccb2226..e85d98a77 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/WrapRequest.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/WrapRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.events; +package org.ocpsoft.rewrite.cdi.events; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/WrapResponse.java b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/WrapResponse.java similarity index 97% rename from integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/WrapResponse.java rename to integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/WrapResponse.java index 4502df5be..a55b248f7 100644 --- a/integration-cdi/src/main/java/com/ocpsoft/rewrite/cdi/events/WrapResponse.java +++ b/integration-cdi/src/main/java/org/ocpsoft/rewrite/cdi/events/WrapResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.events; +package org.ocpsoft.rewrite.cdi.events; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper b/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper deleted file mode 100644 index 8bb3c2fd9..000000000 --- a/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.cdi.bridge.RequestCycleWrapperBridge \ No newline at end of file diff --git a/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener b/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener deleted file mode 100644 index 5fbc277d8..000000000 --- a/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.cdi.bridge.RewriteLifecycleEventBridge \ No newline at end of file diff --git a/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.ExpressionLanguageProvider b/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.ExpressionLanguageProvider deleted file mode 100644 index 62c7c1e73..000000000 --- a/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.ExpressionLanguageProvider +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.cdi.CdiExpressionLanguageProvider \ No newline at end of file diff --git a/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.RewriteProvider b/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.RewriteProvider deleted file mode 100644 index 01e439a06..000000000 --- a/integration-cdi/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.RewriteProvider +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.cdi.bridge.RewriteProviderBridge \ No newline at end of file diff --git a/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceEnricher b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceEnricher index 4f479bbd8..cb917c6b6 100644 --- a/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceEnricher +++ b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceEnricher @@ -1 +1 @@ -com.ocpsoft.rewrite.cdi.CdiServiceEnricher \ No newline at end of file +org.ocpsoft.rewrite.cdi.CdiServiceEnricher \ No newline at end of file diff --git a/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceLocator b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceLocator index 24b9da8a9..6d0d6aaaf 100644 --- a/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceLocator +++ b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceLocator @@ -1 +1 @@ -com.ocpsoft.rewrite.cdi.CdiServiceLocator \ No newline at end of file +org.ocpsoft.rewrite.cdi.CdiServiceLocator \ No newline at end of file diff --git a/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper new file mode 100644 index 000000000..044a05d39 --- /dev/null +++ b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RequestCycleWrapper @@ -0,0 +1 @@ +org.ocpsoft.rewrite.cdi.bridge.RequestCycleWrapperBridge \ No newline at end of file diff --git a/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener new file mode 100644 index 000000000..7f5f47c39 --- /dev/null +++ b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener @@ -0,0 +1 @@ +org.ocpsoft.rewrite.cdi.bridge.RewriteLifecycleEventBridge \ No newline at end of file diff --git a/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.ExpressionLanguageProvider b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.ExpressionLanguageProvider new file mode 100644 index 000000000..2d98e0f0f --- /dev/null +++ b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.ExpressionLanguageProvider @@ -0,0 +1 @@ +org.ocpsoft.rewrite.cdi.CdiExpressionLanguageProvider \ No newline at end of file diff --git a/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.RewriteProvider b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.RewriteProvider new file mode 100644 index 000000000..0f8d32815 --- /dev/null +++ b/integration-cdi/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.RewriteProvider @@ -0,0 +1 @@ +org.ocpsoft.rewrite.cdi.bridge.RewriteProviderBridge \ No newline at end of file diff --git a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/MockBean.java b/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/MockBean.java deleted file mode 100644 index 0a24603c4..000000000 --- a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/MockBean.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.cdi.bridge; - -/** - * @author Lincoln Baxter, III - * - */ -public class MockBean -{ - // Intentionally empty -} diff --git a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/CDIRoot.java b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/CDIRoot.java similarity index 95% rename from integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/CDIRoot.java rename to integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/CDIRoot.java index cc8bc5b4e..2db2637a0 100644 --- a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/CDIRoot.java +++ b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/CDIRoot.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi; +package org.ocpsoft.rewrite.cdi; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bind/BindingBean.java b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bind/BindingBean.java similarity index 97% rename from integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bind/BindingBean.java rename to integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bind/BindingBean.java index 2d300e067..ad69ad4c8 100644 --- a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bind/BindingBean.java +++ b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bind/BindingBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.bind; +package org.ocpsoft.rewrite.cdi.bind; import javax.enterprise.context.RequestScoped; import javax.inject.Named; diff --git a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bind/ExpressionLanguageTestConfigurationProvider.java b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bind/ExpressionLanguageTestConfigurationProvider.java similarity index 80% rename from integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bind/ExpressionLanguageTestConfigurationProvider.java rename to integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bind/ExpressionLanguageTestConfigurationProvider.java index 152f357d4..1db12015f 100644 --- a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bind/ExpressionLanguageTestConfigurationProvider.java +++ b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bind/ExpressionLanguageTestConfigurationProvider.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.bind; +package org.ocpsoft.rewrite.cdi.bind; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.bind.El; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Invoke; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.Redirect; -import com.ocpsoft.rewrite.servlet.config.SendStatus; +import org.ocpsoft.rewrite.bind.El; +import org.ocpsoft.rewrite.config.Invoke; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.servlet.config.Redirect; +import org.ocpsoft.rewrite.servlet.config.SendStatus; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/CdiMultipleFeaturesTest.java b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/CdiMultipleFeaturesTest.java similarity index 94% rename from integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/CdiMultipleFeaturesTest.java rename to integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/CdiMultipleFeaturesTest.java index 1dfb23ff1..1b9f7b3e4 100644 --- a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/CdiMultipleFeaturesTest.java +++ b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/CdiMultipleFeaturesTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.bridge; +package org.ocpsoft.rewrite.cdi.bridge; import junit.framework.Assert; @@ -24,9 +24,9 @@ import org.junit.Test; import org.junit.runner.RunWith; -import com.ocpsoft.rewrite.cdi.CDIRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.cdi.CDIRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/MockBean.java b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/MockBean.java new file mode 100644 index 000000000..778eeedc2 --- /dev/null +++ b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/MockBean.java @@ -0,0 +1,10 @@ +package org.ocpsoft.rewrite.cdi.bridge; + +/** + * @author Lincoln Baxter, III + * + */ +public class MockBean +{ + // Intentionally empty +} diff --git a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventObserver.java b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventObserver.java similarity index 88% rename from integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventObserver.java rename to integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventObserver.java index d5bb77c85..9e61db7b3 100644 --- a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventObserver.java +++ b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/RewriteLifecycleEventObserver.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.bridge; +package org.ocpsoft.rewrite.cdi.bridge; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; -import com.ocpsoft.rewrite.cdi.events.AfterInboundRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; +import org.ocpsoft.rewrite.cdi.events.AfterInboundRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpOutboundServletRewrite; /** * @author Lincoln Baxter, III diff --git a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/ServiceEnricherTestConfigProvider.java b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/ServiceEnricherTestConfigProvider.java similarity index 77% rename from integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/ServiceEnricherTestConfigProvider.java rename to integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/ServiceEnricherTestConfigProvider.java index 51f85d33f..a3b24c05e 100644 --- a/integration-cdi/src/test/java/com/ocpsoft/rewrite/cdi/bridge/ServiceEnricherTestConfigProvider.java +++ b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/ServiceEnricherTestConfigProvider.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.cdi.bridge; +package org.ocpsoft.rewrite.cdi.bridge; import javax.inject.Inject; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Condition; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.SendStatus; +import org.ocpsoft.rewrite.config.Condition; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.servlet.config.SendStatus; /** * @author Lincoln Baxter, III diff --git a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/NavigatingInvocationResultHandler.java b/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/NavigatingInvocationResultHandler.java deleted file mode 100644 index f200a17e6..000000000 --- a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/NavigatingInvocationResultHandler.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.faces; - -import org.ocpsoft.logging.Logger; - -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.faces.config.PhaseAction; -import com.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; -import com.ocpsoft.rewrite.spi.InvocationResultHandler; - -/** - * (Priority: 100) Implementation of {@link InvocationResultHandler} which handles JavaServer Faces action result and - * navigation strings. Together with {@link RewritePhaseListener}, integrates {@link PhaseAction} into Faces navigation. - * - * @author Lincoln Baxter, III - */ -public class NavigatingInvocationResultHandler implements InvocationResultHandler -{ - public static final String QUEUED_NAVIGATION = NavigatingInvocationResultHandler.class.getName() - + "_QUEUED_NAVIGATION"; - - private static Logger log = Logger.getLogger(NavigatingInvocationResultHandler.class); - - @Override - public int priority() - { - return 100; - } - - @Override - public boolean handles(final Object payload) - { - return payload instanceof String; - } - - @Override - public void handle(final Rewrite event, final EvaluationContext context, final Object result) - { - if (event instanceof HttpInboundServletRewrite) - { - if (result instanceof String) - { - log.info("Storing Invocation result [" + result + "] as deferred navigation string."); - ((HttpInboundServletRewrite) event).getRequest().setAttribute(QUEUED_NAVIGATION, result); - } - } - } - -} diff --git a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/FacesRewriteLifecycleListener.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/FacesRewriteLifecycleListener.java similarity index 55% rename from integration-faces/src/main/java/com/ocpsoft/rewrite/faces/FacesRewriteLifecycleListener.java rename to integration-faces/src/main/java/org/ocpsoft/rewrite/faces/FacesRewriteLifecycleListener.java index 4a85ad583..6e19c988c 100644 --- a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/FacesRewriteLifecycleListener.java +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/FacesRewriteLifecycleListener.java @@ -1,31 +1,10 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.faces; +package org.ocpsoft.rewrite.faces; import javax.servlet.DispatcherType; import javax.servlet.http.HttpServletRequest; -import com.ocpsoft.rewrite.servlet.http.HttpRewriteLifecycleListener; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.servlet.http.HttpRewriteLifecycleListener; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * @author Lincoln Baxter, III diff --git a/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/NavigatingInvocationResultHandler.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/NavigatingInvocationResultHandler.java new file mode 100644 index 000000000..64ac7cdc6 --- /dev/null +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/NavigatingInvocationResultHandler.java @@ -0,0 +1,48 @@ +package org.ocpsoft.rewrite.faces; + +import org.ocpsoft.logging.Logger; + +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; +import org.ocpsoft.rewrite.spi.InvocationResultHandler; + +/** + * (Priority: 100) Implementation of {@link InvocationResultHandler} which handles JavaServer Faces action result and + * navigation strings. Together with {@link RewritePhaseListener}, integrates {@link org.ocpsoft.rewrite.faces.config.PhaseAction} into Faces navigation. + * + * @author Lincoln Baxter, III + */ +public class NavigatingInvocationResultHandler implements InvocationResultHandler +{ + public static final String QUEUED_NAVIGATION = NavigatingInvocationResultHandler.class.getName() + + "_QUEUED_NAVIGATION"; + + private static Logger log = Logger.getLogger(NavigatingInvocationResultHandler.class); + + @Override + public int priority() + { + return 100; + } + + @Override + public boolean handles(final Object payload) + { + return payload instanceof String; + } + + @Override + public void handle(final Rewrite event, final EvaluationContext context, final Object result) + { + if (event instanceof HttpInboundServletRewrite) + { + if (result instanceof String) + { + log.info("Storing Invocation result [" + result + "] as deferred navigation string."); + ((HttpInboundServletRewrite) event).getRequest().setAttribute(QUEUED_NAVIGATION, result); + } + } + } + +} diff --git a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/RewriteNavigationHandler.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteNavigationHandler.java similarity index 97% rename from integration-faces/src/main/java/com/ocpsoft/rewrite/faces/RewriteNavigationHandler.java rename to integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteNavigationHandler.java index dbcf93403..1f8718882 100644 --- a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/RewriteNavigationHandler.java +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteNavigationHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.faces; +package org.ocpsoft.rewrite.faces; import java.io.IOException; import java.util.Map; @@ -25,7 +25,7 @@ import javax.faces.context.FacesContext; import javax.servlet.http.HttpServletRequest; -import com.ocpsoft.rewrite.exception.RewriteException; +import org.ocpsoft.rewrite.exception.RewriteException; /** * @author Lincoln Baxter, III diff --git a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/RewritePhaseListener.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewritePhaseListener.java similarity index 77% rename from integration-faces/src/main/java/com/ocpsoft/rewrite/faces/RewritePhaseListener.java rename to integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewritePhaseListener.java index 855e958c2..967412cbf 100644 --- a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/RewritePhaseListener.java +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewritePhaseListener.java @@ -1,25 +1,4 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.faces; +package org.ocpsoft.rewrite.faces; import java.util.ArrayList; @@ -32,9 +11,9 @@ import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.faces.config.PhaseAction; -import com.ocpsoft.rewrite.faces.config.PhaseOperation; -import com.ocpsoft.rewrite.servlet.event.BaseRewrite.Flow; +import org.ocpsoft.rewrite.faces.config.PhaseAction; +import org.ocpsoft.rewrite.faces.config.PhaseOperation; +import org.ocpsoft.rewrite.servlet.event.BaseRewrite.Flow; /** * @author Lincoln Baxter, III diff --git a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/RewriteViewHandler.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java similarity index 99% rename from integration-faces/src/main/java/com/ocpsoft/rewrite/faces/RewriteViewHandler.java rename to integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java index aabf814aa..298b093b4 100644 --- a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/RewriteViewHandler.java +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.faces; +package org.ocpsoft.rewrite.faces; import java.io.IOException; import java.util.List; diff --git a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/URLDuplicatePathCanonicalizer.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/URLDuplicatePathCanonicalizer.java similarity index 97% rename from integration-faces/src/main/java/com/ocpsoft/rewrite/faces/URLDuplicatePathCanonicalizer.java rename to integration-faces/src/main/java/org/ocpsoft/rewrite/faces/URLDuplicatePathCanonicalizer.java index 4aeb97643..4ac5832ba 100644 --- a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/URLDuplicatePathCanonicalizer.java +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/URLDuplicatePathCanonicalizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ocpsoft.rewrite.faces; +package org.ocpsoft.rewrite.faces; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/config/PhaseAction.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/config/PhaseAction.java similarity index 71% rename from integration-faces/src/main/java/com/ocpsoft/rewrite/faces/config/PhaseAction.java rename to integration-faces/src/main/java/org/ocpsoft/rewrite/faces/config/PhaseAction.java index 0e6cef2d6..af27e8c37 100644 --- a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/config/PhaseAction.java +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/config/PhaseAction.java @@ -1,25 +1,4 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.faces.config; +package org.ocpsoft.rewrite.faces.config; import javax.faces.context.FacesContext; import javax.faces.event.PhaseId; @@ -29,17 +8,16 @@ import org.ocpsoft.common.services.ServiceLoader; import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.bind.Retrieval; -import com.ocpsoft.rewrite.bind.Submission; -import com.ocpsoft.rewrite.config.Invoke; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.exception.RewriteException; -import com.ocpsoft.rewrite.servlet.event.BaseRewrite.Flow; -import com.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; -import com.ocpsoft.rewrite.spi.InvocationResultHandler; +import org.ocpsoft.rewrite.bind.Retrieval; +import org.ocpsoft.rewrite.bind.Submission; +import org.ocpsoft.rewrite.config.Invoke; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.exception.RewriteException; +import org.ocpsoft.rewrite.servlet.event.BaseRewrite.Flow; +import org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.spi.InvocationResultHandler; /** * Invoke an action before or after a given JavaServer Faces {@link PhaseId}. Has a {@link Weighted#priority()} of 0. @@ -159,8 +137,8 @@ public static PhaseAction retrieveFrom(final Retrieval retrieval) } /** - * Invoke {@link Submission#submit(Rewrite, EvaluationContext, Object)}, use the result of the given - * {@link Retrieval#retrieve(Rewrite, EvaluationContext)} as the value for this submission. Process + * Invoke {@link Submission#submit(org.ocpsoft.rewrite.event.Rewrite, EvaluationContext, Object)}, use the result of the given + * {@link Retrieval#retrieve(org.ocpsoft.rewrite.event.Rewrite, EvaluationContext)} as the value for this submission. Process * {@link InvocationResultHandler} instances on the result value (if any.) *

* By default, this action is invoked after {@link PhaseId#RESTORE_VIEW} diff --git a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/config/PhaseInjection.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/config/PhaseInjection.java similarity index 60% rename from integration-faces/src/main/java/com/ocpsoft/rewrite/faces/config/PhaseInjection.java rename to integration-faces/src/main/java/org/ocpsoft/rewrite/faces/config/PhaseInjection.java index ee084937e..5cd64f9a1 100644 --- a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/config/PhaseInjection.java +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/config/PhaseInjection.java @@ -1,35 +1,14 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.faces.config; +package org.ocpsoft.rewrite.faces.config; import javax.faces.event.PhaseId; import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.bind.El.ElProperty; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.El; /** * Wraps & holds a param binding till before or after a given JavaServer Faces {@link PhaseId} @@ -48,7 +27,7 @@ private PhaseInjection(Binding binding) { throw new NullPointerException("binding"); } - else if (!(binding instanceof ElProperty)) + else if (!(binding instanceof El.ElProperty)) { log.warn("binding ought to be an ElProperty; instead it is a [" + binding.getClass().getName() + "]."); } diff --git a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/config/PhaseOperation.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/config/PhaseOperation.java similarity index 67% rename from integration-faces/src/main/java/com/ocpsoft/rewrite/faces/config/PhaseOperation.java rename to integration-faces/src/main/java/org/ocpsoft/rewrite/faces/config/PhaseOperation.java index d202ca3b6..9710a7a67 100644 --- a/integration-faces/src/main/java/com/ocpsoft/rewrite/faces/config/PhaseOperation.java +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/config/PhaseOperation.java @@ -1,25 +1,4 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.faces.config; +package org.ocpsoft.rewrite.faces.config; import java.util.ArrayList; import java.util.Arrays; @@ -33,11 +12,11 @@ import org.ocpsoft.common.pattern.Weighted; import org.ocpsoft.common.pattern.WeightedComparator; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.config.OperationBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.servlet.config.HttpOperation; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.config.OperationBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.config.HttpOperation; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * This class encapsulates another operation that should be performed during the JSF lifecycle @@ -122,7 +101,7 @@ public static PhaseOperation enqueue(final Operation operation) } /** - * Enqueue an {@link Operation} to be performed before or after one or many JavaServer Faces life-cycle phases, specified via invoking {@link #before(PhaseId...)} or {@link #after(PhaseId...)}. + * Enqueue an {@link org.ocpsoft.rewrite.config.Operation} to be performed before or after one or many JavaServer Faces life-cycle phases, specified via invoking {@link #before(PhaseId...)} or {@link #after(PhaseId...)}. */ @SuppressWarnings("rawtypes") public static PhaseOperation enqueue(final Operation operation, final int priority) diff --git a/integration-faces/src/main/resources/META-INF/faces-config.xml b/integration-faces/src/main/resources/META-INF/faces-config.xml index ca80f73ef..7d410cf73 100644 --- a/integration-faces/src/main/resources/META-INF/faces-config.xml +++ b/integration-faces/src/main/resources/META-INF/faces-config.xml @@ -8,12 +8,12 @@ rewrite_integration_faces - com.ocpsoft.rewrite.faces.RewriteNavigationHandler - com.ocpsoft.rewrite.faces.RewriteViewHandler + org.ocpsoft.rewrite.faces.RewriteNavigationHandler + org.ocpsoft.rewrite.faces.RewriteViewHandler - com.ocpsoft.rewrite.faces.RewritePhaseListener + org.ocpsoft.rewrite.faces.RewritePhaseListener diff --git a/integration-faces/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener b/integration-faces/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener deleted file mode 100644 index c8618e816..000000000 --- a/integration-faces/src/main/resources/META-INF/services/com.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.faces.FacesRewriteLifecycleListener \ No newline at end of file diff --git a/integration-faces/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.InvocationResultHandler b/integration-faces/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.InvocationResultHandler deleted file mode 100644 index a5d830941..000000000 --- a/integration-faces/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.InvocationResultHandler +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.faces.NavigatingInvocationResultHandler \ No newline at end of file diff --git a/integration-faces/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener b/integration-faces/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener new file mode 100644 index 000000000..e38dab967 --- /dev/null +++ b/integration-faces/src/main/resources/META-INF/services/org.ocpsoft.rewrite.servlet.spi.RewriteLifecycleListener @@ -0,0 +1 @@ +org.ocpsoft.rewrite.faces.FacesRewriteLifecycleListener \ No newline at end of file diff --git a/integration-faces/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.InvocationResultHandler b/integration-faces/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.InvocationResultHandler new file mode 100644 index 000000000..89cb687e1 --- /dev/null +++ b/integration-faces/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.InvocationResultHandler @@ -0,0 +1 @@ +org.ocpsoft.rewrite.faces.NavigatingInvocationResultHandler \ No newline at end of file diff --git a/integration-faces/src/test/java/com/ocpsoft/rewrite/faces/ADFRoot.java b/integration-faces/src/test/java/com/ocpsoft/rewrite/faces/ADFRoot.java deleted file mode 100644 index ae7541feb..000000000 --- a/integration-faces/src/test/java/com/ocpsoft/rewrite/faces/ADFRoot.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.ocpsoft.rewrite.faces; - -public interface ADFRoot -{ - -} diff --git a/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/ADFRoot.java b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/ADFRoot.java new file mode 100644 index 000000000..e4c0aab3b --- /dev/null +++ b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/ADFRoot.java @@ -0,0 +1,6 @@ +package org.ocpsoft.rewrite.faces; + +public interface ADFRoot +{ + +} diff --git a/integration-faces/src/test/java/com/ocpsoft/rewrite/faces/PhaseOperationTest.java b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/PhaseOperationTest.java similarity index 90% rename from integration-faces/src/test/java/com/ocpsoft/rewrite/faces/PhaseOperationTest.java rename to integration-faces/src/test/java/org/ocpsoft/rewrite/faces/PhaseOperationTest.java index 114310e86..03773f2cc 100644 --- a/integration-faces/src/test/java/com/ocpsoft/rewrite/faces/PhaseOperationTest.java +++ b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/PhaseOperationTest.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.faces; +package org.ocpsoft.rewrite.faces; /* * Copyright 2011 Lincoln Baxter, III @@ -26,9 +26,8 @@ import org.jboss.shrinkwrap.descriptor.impl.base.Strings; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -47,9 +46,9 @@ public static WebArchive getDeployment() .addAsWebInfResource("faces-config.xml","faces-config.xml") .addAsWebResource("empty-view.xhtml","empty.xhtml") .addAsResource( - new StringAsset("com.ocpsoft.rewrite.faces.PhaseOperationTestConfigurationProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); - + new StringAsset("org.ocpsoft.rewrite.faces.PhaseOperationTestConfigurationProvider"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); + return deployment; } diff --git a/integration-faces/src/test/java/com/ocpsoft/rewrite/faces/PhaseOperationTestConfigurationProvider.java b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/PhaseOperationTestConfigurationProvider.java similarity index 56% rename from integration-faces/src/test/java/com/ocpsoft/rewrite/faces/PhaseOperationTestConfigurationProvider.java rename to integration-faces/src/test/java/org/ocpsoft/rewrite/faces/PhaseOperationTestConfigurationProvider.java index 01c964cd9..11048bc28 100644 --- a/integration-faces/src/test/java/com/ocpsoft/rewrite/faces/PhaseOperationTestConfigurationProvider.java +++ b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/PhaseOperationTestConfigurationProvider.java @@ -1,20 +1,20 @@ -package com.ocpsoft.rewrite.faces; +package org.ocpsoft.rewrite.faces; import javax.faces.context.FacesContext; import javax.faces.event.PhaseId; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; -import com.ocpsoft.rewrite.faces.config.PhaseOperation; -import com.ocpsoft.rewrite.servlet.config.DispatchType; -import com.ocpsoft.rewrite.servlet.config.Forward; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.SendStatus; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.faces.config.PhaseOperation; +import org.ocpsoft.rewrite.servlet.config.DispatchType; +import org.ocpsoft.rewrite.servlet.config.Forward; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.servlet.config.SendStatus; public class PhaseOperationTestConfigurationProvider extends HttpConfigurationProvider { @@ -40,14 +40,13 @@ public void perform(Rewrite event, EvaluationContext context) .defineRule() .when(Path.matches("/render_response").and(DispatchType.isRequest())) .perform(Forward.to("/empty.xhtml").and(PhaseOperation.enqueue(new Operation() { - @Override - public void perform(Rewrite event, EvaluationContext context) - { - if (PhaseId.RENDER_RESPONSE.equals(FacesContext.getCurrentInstance().getCurrentPhaseId())) - SendStatus.code(204).perform(event, context); - else - SendStatus.code(504).perform(event, context); - } + @Override + public void perform(Rewrite event, EvaluationContext context) { + if (PhaseId.RENDER_RESPONSE.equals(FacesContext.getCurrentInstance().getCurrentPhaseId())) + SendStatus.code(204).perform(event, context); + else + SendStatus.code(504).perform(event, context); + } }).before(PhaseId.RENDER_RESPONSE))); } diff --git a/integration-gwt/README.md b/integration-gwt/README.md index 6726daa95..3e2f7ca19 100644 --- a/integration-gwt/README.md +++ b/integration-gwt/README.md @@ -9,14 +9,14 @@ Get Started 1. Include Rewrite GWT in your application's POM file: - com.ocpsoft.rewrite + org.ocpsoft.rewrite rewrite-integation-gwt ${rewrite.version} 2. Include Rewrite GWT in your App.gwt.xml file: - + 3. Enable bookmarking by routing some or all URLs back to your host application file. Below is a recommended rule format (replace */index.jsp* with the path to your application): diff --git a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/Rewrite.gwt.xml b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/Rewrite.gwt.xml similarity index 93% rename from integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/Rewrite.gwt.xml rename to integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/Rewrite.gwt.xml index 062bf470e..cf912fe0a 100644 --- a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/Rewrite.gwt.xml +++ b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/Rewrite.gwt.xml @@ -19,7 +19,7 @@ ]]> - + diff --git a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/ContextPathListener.java b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/ContextPathListener.java similarity index 78% rename from integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/ContextPathListener.java rename to integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/ContextPathListener.java index 7b2f5f8eb..78971b59b 100644 --- a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/ContextPathListener.java +++ b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/ContextPathListener.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.gwt.client.history; +package org.ocpsoft.rewrite.gwt.client.history; /** * Listener to be notified when the application context path is set. diff --git a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/ContextPathProvider.java b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/ContextPathProvider.java similarity index 85% rename from integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/ContextPathProvider.java rename to integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/ContextPathProvider.java index 624dc1a6a..8557b9aed 100644 --- a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/ContextPathProvider.java +++ b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/ContextPathProvider.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.gwt.client.history; +package org.ocpsoft.rewrite.gwt.client.history; /** diff --git a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/CookieContextPathProvider.java b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/CookieContextPathProvider.java similarity index 82% rename from integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/CookieContextPathProvider.java rename to integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/CookieContextPathProvider.java index f8d1e38b7..27a210a32 100644 --- a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/CookieContextPathProvider.java +++ b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/CookieContextPathProvider.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.gwt.client.history; +package org.ocpsoft.rewrite.gwt.client.history; import com.google.gwt.user.client.Cookies; @@ -11,7 +11,7 @@ public class CookieContextPathProvider implements ContextPathProvider { public void getContextPath(HistoryStateImpl historyState) { - String contextPath = Cookies.getCookie("com.ocpsoft.rewrite.gwt.history.contextPath"); + String contextPath = Cookies.getCookie("org.ocpsoft.rewrite.gwt.history.contextPath"); if (contextPath != null) HistoryStateImpl.setContextPath(contextPath); } diff --git a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/HistoryStateImpl.java b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/HistoryStateImpl.java similarity index 92% rename from integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/HistoryStateImpl.java rename to integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/HistoryStateImpl.java index d2563703d..9c4342c16 100644 --- a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/HistoryStateImpl.java +++ b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/HistoryStateImpl.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.gwt.client.history; +package org.ocpsoft.rewrite.gwt.client.history; import java.util.ArrayList; import java.util.Arrays; @@ -74,7 +74,7 @@ public native boolean initNative() /*-{ var path = $wnd.location.pathname; if (path.length > 0) { token = historyImpl.@com.google.gwt.user.client.impl.HistoryImpl::decodeFragment(Ljava/lang/String;)(path); - token = historyImpl.@com.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl::cleanToken(Ljava/lang/String;)(token); + token = historyImpl.@HistoryStateImpl::cleanToken(Ljava/lang/String;)(token); } @com.google.gwt.user.client.impl.HistoryImpl::setToken(Ljava/lang/String;)(token); @@ -86,7 +86,7 @@ public native boolean initNative() /*-{ var path = $wnd.location.pathname; if (path.length > 0) { token = historyImpl.@com.google.gwt.user.client.impl.HistoryImpl::decodeFragment(Ljava/lang/String;)(path); - token = historyImpl.@com.ocpsoft.rewrite.gwt.client.history.HistoryStateImpl::cleanToken(Ljava/lang/String;)(token); + token = historyImpl.@HistoryStateImpl::cleanToken(Ljava/lang/String;)(token); } historyImpl.@com.google.gwt.user.client.impl.HistoryImpl::newItemOnEvent(Ljava/lang/String;)(token); diff --git a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/ListenerRegistration.java b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/ListenerRegistration.java similarity index 84% rename from integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/ListenerRegistration.java rename to integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/ListenerRegistration.java index f93944c96..7b349e591 100644 --- a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/ListenerRegistration.java +++ b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/ListenerRegistration.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.gwt.client.history; +package org.ocpsoft.rewrite.gwt.client.history; /** * Returned when a listener is added. diff --git a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/RequestContextPathProvider.java b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/RequestContextPathProvider.java similarity index 89% rename from integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/RequestContextPathProvider.java rename to integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/RequestContextPathProvider.java index b31ade2b9..8fabab7e5 100644 --- a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/client/history/RequestContextPathProvider.java +++ b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/client/history/RequestContextPathProvider.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.gwt.client.history; +package org.ocpsoft.rewrite.gwt.client.history; import com.google.gwt.core.client.GWT; import com.google.gwt.http.client.Request; @@ -17,7 +17,7 @@ public void getContextPath(HistoryStateImpl historyState) @Override public void onResponseReceived(Request request, Response response) { - HistoryStateImpl.setContextPath(response.getHeader("com.ocpsoft.rewrite.gwt.history.contextPath")); + HistoryStateImpl.setContextPath(response.getHeader("org.ocpsoft.rewrite.gwt.history.contextPath")); } @Override diff --git a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/server/history/HistoryRewriteConfiguration.java b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/server/history/HistoryRewriteConfiguration.java similarity index 61% rename from integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/server/history/HistoryRewriteConfiguration.java rename to integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/server/history/HistoryRewriteConfiguration.java index bd88c1fbd..0e2d4e07b 100644 --- a/integration-gwt/src/main/java/com/ocpsoft/rewrite/gwt/server/history/HistoryRewriteConfiguration.java +++ b/integration-gwt/src/main/java/org/ocpsoft/rewrite/gwt/server/history/HistoryRewriteConfiguration.java @@ -1,21 +1,21 @@ -package com.ocpsoft.rewrite.gwt.server.history; +package org.ocpsoft.rewrite.gwt.server.history; import javax.servlet.ServletContext; import javax.servlet.http.Cookie; import org.ocpsoft.logging.Logger; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.Method; -import com.ocpsoft.rewrite.servlet.config.QueryString; -import com.ocpsoft.rewrite.servlet.config.Response; -import com.ocpsoft.rewrite.servlet.util.ContextUtil; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.Method; +import org.ocpsoft.rewrite.servlet.config.QueryString; +import org.ocpsoft.rewrite.servlet.config.Response; +import org.ocpsoft.rewrite.servlet.util.ContextUtil; public class HistoryRewriteConfiguration extends HttpConfigurationProvider { - private static final String DISABLED_PARAM = "com.ocpsoft.rewrite.gwt.history.disableCookies"; + private static final String DISABLED_PARAM = "org.ocpsoft.rewrite.gwt.history.disableCookies"; public static Logger log = Logger.getLogger(HistoryRewriteConfiguration.class); Configuration config = null; @@ -32,14 +32,14 @@ public Configuration getConfiguration(ServletContext context) config = ConfigurationBuilder .begin() .defineRule() - .perform(Response.addCookie(new Cookie("com.ocpsoft.rewrite.gwt.history.contextPath", context - .getContextPath()))) + .perform(Response.addCookie(new Cookie("org.ocpsoft.rewrite.gwt.history.contextPath", context + .getContextPath()))) .defineRule() .when(Method.isHead().and( - QueryString.parameterExists("com.ocpsoft.rewrite.gwt.history.contextPath"))) + QueryString.parameterExists("org.ocpsoft.rewrite.gwt.history.contextPath"))) .perform(Response.setCode(200).and( - Response.addHeader("com.ocpsoft.rewrite.gwt.history.contextPath", + Response.addHeader("org.ocpsoft.rewrite.gwt.history.contextPath", context.getContextPath()))); } } diff --git a/integration-gwt/src/main/java/com/ocpsoft/rewrite/servlet/util/ContextUtil.java b/integration-gwt/src/main/java/org/ocpsoft/rewrite/servlet/util/ContextUtil.java similarity index 97% rename from integration-gwt/src/main/java/com/ocpsoft/rewrite/servlet/util/ContextUtil.java rename to integration-gwt/src/main/java/org/ocpsoft/rewrite/servlet/util/ContextUtil.java index 65e6ea3ce..af3b2b6e3 100644 --- a/integration-gwt/src/main/java/com/ocpsoft/rewrite/servlet/util/ContextUtil.java +++ b/integration-gwt/src/main/java/org/ocpsoft/rewrite/servlet/util/ContextUtil.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.servlet.util; +package org.ocpsoft.rewrite.servlet.util; import javax.servlet.ServletContext; diff --git a/integration-gwt/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider b/integration-gwt/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider deleted file mode 100644 index b442efc9f..000000000 --- a/integration-gwt/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.gwt.server.history.HistoryRewriteConfiguration \ No newline at end of file diff --git a/integration-gwt/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider b/integration-gwt/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider new file mode 100644 index 000000000..8417dc116 --- /dev/null +++ b/integration-gwt/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider @@ -0,0 +1 @@ +org.ocpsoft.rewrite.gwt.server.history.HistoryRewriteConfiguration \ No newline at end of file diff --git a/integration-gwt/src/test/java/com/ocpsoft/rewrite/servlet/GWTRoot.java b/integration-gwt/src/test/java/org/ocpsoft/rewrite/servlet/GWTRoot.java similarity index 95% rename from integration-gwt/src/test/java/com/ocpsoft/rewrite/servlet/GWTRoot.java rename to integration-gwt/src/test/java/org/ocpsoft/rewrite/servlet/GWTRoot.java index 76e3917a7..680a245b8 100644 --- a/integration-gwt/src/test/java/com/ocpsoft/rewrite/servlet/GWTRoot.java +++ b/integration-gwt/src/test/java/org/ocpsoft/rewrite/servlet/GWTRoot.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet; +package org.ocpsoft.rewrite.servlet; /** * @author Lincoln Baxter, III diff --git a/integration-gwt/src/test/java/com/ocpsoft/rewrite/servlet/config/HistoryRewriteConfigurationTest.java b/integration-gwt/src/test/java/org/ocpsoft/rewrite/servlet/config/HistoryRewriteConfigurationTest.java similarity index 79% rename from integration-gwt/src/test/java/com/ocpsoft/rewrite/servlet/config/HistoryRewriteConfigurationTest.java rename to integration-gwt/src/test/java/org/ocpsoft/rewrite/servlet/config/HistoryRewriteConfigurationTest.java index 377a54b1a..7b25b78b2 100644 --- a/integration-gwt/src/test/java/com/ocpsoft/rewrite/servlet/config/HistoryRewriteConfigurationTest.java +++ b/integration-gwt/src/test/java/org/ocpsoft/rewrite/servlet/config/HistoryRewriteConfigurationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.servlet.config; +package org.ocpsoft.rewrite.servlet.config; import junit.framework.Assert; @@ -25,10 +25,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.servlet.GWTRoot; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.servlet.GWTRoot; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -44,28 +43,28 @@ public static WebArchive getDeployment() .addPackages(true, GWTRoot.class.getPackage()) .addAsResource( new StringAsset( - "com.ocpsoft.rewrite.gwt.server.history.HistoryRewriteConfiguration"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + "org.ocpsoft.rewrite.gwt.server.history.HistoryRewriteConfiguration"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } @Test public void testContextPathServedFromHeadRequest() { - HttpAction action = head("/?com.ocpsoft.rewrite.gwt.history.contextPath"); + HttpAction action = head("/?org.ocpsoft.rewrite.gwt.history.contextPath"); Assert.assertEquals(200, action.getResponse().getStatusLine().getStatusCode()); Assert.assertEquals(action.getContextPath(), - action.getResponseHeaderValues("com.ocpsoft.rewrite.gwt.history.contextPath").get(0)); + action.getResponseHeaderValues("org.ocpsoft.rewrite.gwt.history.contextPath").get(0)); } @Test public void testContextPathNotServedFromGetRequest() { - HttpAction action = get("/?com.ocpsoft.rewrite.gwt.history.contextPath"); + HttpAction action = get("/?org.ocpsoft.rewrite.gwt.history.contextPath"); Assert.assertEquals(200, action.getResponse().getStatusLine().getStatusCode()); - Assert.assertTrue(action.getResponseHeaderValues("com.ocpsoft.rewrite.gwt.history.contextPath").isEmpty()); + Assert.assertTrue(action.getResponseHeaderValues("org.ocpsoft.rewrite.gwt.history.contextPath").isEmpty()); } @Test @@ -75,7 +74,7 @@ public void testContextPathServedFromCookieOnNormalRequest() Assert.assertEquals(200, action.getResponse().getStatusLine().getStatusCode()); String cookie = action.getResponseHeaderValues("Set-Cookie").get(0); - Assert.assertTrue(cookie.contains("com.ocpsoft.rewrite.gwt.history.contextPath=" + action.getContextPath())); + Assert.assertTrue(cookie.contains("org.ocpsoft.rewrite.gwt.history.contextPath=" + action.getContextPath())); } } \ No newline at end of file diff --git a/integration-oracle-adf/src/main/java/com/ocpsoft/rewrite/adf/ADFConfigurationProvider.java b/integration-oracle-adf/src/main/java/org/ocpsoft/rewrite/adf/ADFConfigurationProvider.java similarity index 89% rename from integration-oracle-adf/src/main/java/com/ocpsoft/rewrite/adf/ADFConfigurationProvider.java rename to integration-oracle-adf/src/main/java/org/ocpsoft/rewrite/adf/ADFConfigurationProvider.java index 9c9b1ab78..78511f8bb 100644 --- a/integration-oracle-adf/src/main/java/com/ocpsoft/rewrite/adf/ADFConfigurationProvider.java +++ b/integration-oracle-adf/src/main/java/org/ocpsoft/rewrite/adf/ADFConfigurationProvider.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.adf; +package org.ocpsoft.rewrite.adf; /* * Copyright 2011 Lincoln Baxter, III * @@ -18,13 +18,13 @@ import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.servlet.config.HttpCondition; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.HttpOperation; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.config.HttpCondition; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.HttpOperation; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * @author Lincoln Baxter, III diff --git a/integration-oracle-adf/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider b/integration-oracle-adf/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider deleted file mode 100644 index fbb7ff9c9..000000000 --- a/integration-oracle-adf/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.adf.ADFConfigurationProvider \ No newline at end of file diff --git a/integration-oracle-adf/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider b/integration-oracle-adf/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider new file mode 100644 index 000000000..a9318e2c6 --- /dev/null +++ b/integration-oracle-adf/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider @@ -0,0 +1 @@ +org.ocpsoft.rewrite.adf.ADFConfigurationProvider \ No newline at end of file diff --git a/integration-oracle-adf/src/test/java/com/ocpsoft/rewrite/adf/ADFRoot.java b/integration-oracle-adf/src/test/java/com/ocpsoft/rewrite/adf/ADFRoot.java deleted file mode 100644 index e31b2d378..000000000 --- a/integration-oracle-adf/src/test/java/com/ocpsoft/rewrite/adf/ADFRoot.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.ocpsoft.rewrite.adf; - -public interface ADFRoot -{ - -} diff --git a/integration-oracle-adf/src/test/java/com/ocpsoft/rewrite/adf/ADFConfigurationTest.java b/integration-oracle-adf/src/test/java/org/ocpsoft/rewrite/adf/ADFConfigurationTest.java similarity index 84% rename from integration-oracle-adf/src/test/java/com/ocpsoft/rewrite/adf/ADFConfigurationTest.java rename to integration-oracle-adf/src/test/java/org/ocpsoft/rewrite/adf/ADFConfigurationTest.java index 7f61c1c14..32c58d4d6 100644 --- a/integration-oracle-adf/src/test/java/com/ocpsoft/rewrite/adf/ADFConfigurationTest.java +++ b/integration-oracle-adf/src/test/java/org/ocpsoft/rewrite/adf/ADFConfigurationTest.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.adf; +package org.ocpsoft.rewrite.adf; /* * Copyright 2011 Lincoln Baxter, III * @@ -25,9 +25,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; - -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.test.HttpAction; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** * @author Lincoln Baxter, III @@ -43,9 +42,9 @@ public static WebArchive getDeployment() .addPackages(true, ADFRoot.class.getPackage()) .addAsResource( new StringAsset( - "com.ocpsoft.rewrite.adf.ADFConfigurationProvider\n" + - "com.ocpsoft.rewrite.adf.MockADFConfigurationProvider"), - "/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider"); + "org.ocpsoft.rewrite.adf.ADFConfigurationProvider\n" + + "org.ocpsoft.rewrite.adf.MockADFConfigurationProvider"), + "/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider"); return deployment; } diff --git a/integration-oracle-adf/src/test/java/org/ocpsoft/rewrite/adf/ADFRoot.java b/integration-oracle-adf/src/test/java/org/ocpsoft/rewrite/adf/ADFRoot.java new file mode 100644 index 000000000..5f35d4cea --- /dev/null +++ b/integration-oracle-adf/src/test/java/org/ocpsoft/rewrite/adf/ADFRoot.java @@ -0,0 +1,6 @@ +package org.ocpsoft.rewrite.adf; + +public interface ADFRoot +{ + +} diff --git a/integration-oracle-adf/src/test/java/com/ocpsoft/rewrite/adf/MockADFConfigurationProvider.java b/integration-oracle-adf/src/test/java/org/ocpsoft/rewrite/adf/MockADFConfigurationProvider.java similarity index 82% rename from integration-oracle-adf/src/test/java/com/ocpsoft/rewrite/adf/MockADFConfigurationProvider.java rename to integration-oracle-adf/src/test/java/org/ocpsoft/rewrite/adf/MockADFConfigurationProvider.java index 2d8ba2274..cec74b35d 100644 --- a/integration-oracle-adf/src/test/java/com/ocpsoft/rewrite/adf/MockADFConfigurationProvider.java +++ b/integration-oracle-adf/src/test/java/org/ocpsoft/rewrite/adf/MockADFConfigurationProvider.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.adf; +package org.ocpsoft.rewrite.adf; /* * Copyright 2011 Lincoln Baxter, III @@ -18,11 +18,11 @@ import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.QueryString; -import com.ocpsoft.rewrite.servlet.config.Response; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.QueryString; +import org.ocpsoft.rewrite.servlet.config.Response; /** * @author Lincoln Baxter, III diff --git a/integration-spring/src/main/java/com/ocpsoft/rewrite/spring/SpringExpressionLanguageProvider.java b/integration-spring/src/main/java/org/ocpsoft/rewrite/spring/SpringExpressionLanguageProvider.java similarity index 94% rename from integration-spring/src/main/java/com/ocpsoft/rewrite/spring/SpringExpressionLanguageProvider.java rename to integration-spring/src/main/java/org/ocpsoft/rewrite/spring/SpringExpressionLanguageProvider.java index 8b1d35fb6..16c97c273 100644 --- a/integration-spring/src/main/java/com/ocpsoft/rewrite/spring/SpringExpressionLanguageProvider.java +++ b/integration-spring/src/main/java/org/ocpsoft/rewrite/spring/SpringExpressionLanguageProvider.java @@ -1,5 +1,7 @@ -package com.ocpsoft.rewrite.spring; +package org.ocpsoft.rewrite.spring; +import org.ocpsoft.rewrite.exception.UnsupportedEvaluationException; +import org.ocpsoft.rewrite.spi.ExpressionLanguageProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanExpressionContext; import org.springframework.beans.factory.config.ConfigurableBeanFactory; @@ -19,11 +21,8 @@ import org.springframework.expression.spel.support.StandardTypeLocator; import org.springframework.web.context.WebApplicationContext; -import com.ocpsoft.rewrite.exception.UnsupportedEvaluationException; -import com.ocpsoft.rewrite.spi.ExpressionLanguageProvider; - /** - * Implementation of {@link ExpressionLanguageProvider} for the Spring Expression Language (SpEL) + * Implementation of {@link org.ocpsoft.rewrite.spi.ExpressionLanguageProvider} for the Spring Expression Language (SpEL) * * @author Christian Kaltepoth */ diff --git a/integration-spring/src/main/java/com/ocpsoft/rewrite/spring/SpringServiceEnricher.java b/integration-spring/src/main/java/org/ocpsoft/rewrite/spring/SpringServiceEnricher.java similarity index 97% rename from integration-spring/src/main/java/com/ocpsoft/rewrite/spring/SpringServiceEnricher.java rename to integration-spring/src/main/java/org/ocpsoft/rewrite/spring/SpringServiceEnricher.java index 419382de8..0c29acaf6 100644 --- a/integration-spring/src/main/java/com/ocpsoft/rewrite/spring/SpringServiceEnricher.java +++ b/integration-spring/src/main/java/org/ocpsoft/rewrite/spring/SpringServiceEnricher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.spring; +package org.ocpsoft.rewrite.spring; import java.util.ArrayList; import java.util.Collection; diff --git a/integration-spring/src/main/java/com/ocpsoft/rewrite/spring/SpringServiceLocator.java b/integration-spring/src/main/java/org/ocpsoft/rewrite/spring/SpringServiceLocator.java similarity index 98% rename from integration-spring/src/main/java/com/ocpsoft/rewrite/spring/SpringServiceLocator.java rename to integration-spring/src/main/java/org/ocpsoft/rewrite/spring/SpringServiceLocator.java index 67de9a634..04274fb11 100644 --- a/integration-spring/src/main/java/com/ocpsoft/rewrite/spring/SpringServiceLocator.java +++ b/integration-spring/src/main/java/org/ocpsoft/rewrite/spring/SpringServiceLocator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.spring; +package org.ocpsoft.rewrite.spring; import java.util.Collection; import java.util.HashSet; diff --git a/integration-spring/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.ExpressionLanguageProvider b/integration-spring/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.ExpressionLanguageProvider deleted file mode 100644 index 0fe9730ba..000000000 --- a/integration-spring/src/main/resources/META-INF/services/com.ocpsoft.rewrite.spi.ExpressionLanguageProvider +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.spring.SpringExpressionLanguageProvider \ No newline at end of file diff --git a/integration-spring/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceEnricher b/integration-spring/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceEnricher index 870a8c684..ca189a650 100644 --- a/integration-spring/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceEnricher +++ b/integration-spring/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceEnricher @@ -1 +1 @@ -com.ocpsoft.rewrite.spring.SpringServiceEnricher \ No newline at end of file +org.ocpsoft.rewrite.spring.SpringServiceEnricher \ No newline at end of file diff --git a/integration-spring/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceLocator b/integration-spring/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceLocator index 8b95f0e95..3783e9ba7 100644 --- a/integration-spring/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceLocator +++ b/integration-spring/src/main/resources/META-INF/services/org.ocpsoft.common.spi.ServiceLocator @@ -1 +1 @@ -com.ocpsoft.rewrite.spring.SpringServiceLocator +org.ocpsoft.rewrite.spring.SpringServiceLocator diff --git a/integration-spring/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.ExpressionLanguageProvider b/integration-spring/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.ExpressionLanguageProvider new file mode 100644 index 000000000..07c929ab7 --- /dev/null +++ b/integration-spring/src/main/resources/META-INF/services/org.ocpsoft.rewrite.spi.ExpressionLanguageProvider @@ -0,0 +1 @@ +org.ocpsoft.rewrite.spring.SpringExpressionLanguageProvider \ No newline at end of file diff --git a/integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringFeaturesBean.java b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesBean.java similarity index 97% rename from integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringFeaturesBean.java rename to integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesBean.java index 0933671a2..26fa16ebc 100644 --- a/integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringFeaturesBean.java +++ b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.spring; +package org.ocpsoft.rewrite.spring; import org.springframework.stereotype.Component; diff --git a/integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringFeaturesConfigProvider.java b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesConfigProvider.java similarity index 79% rename from integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringFeaturesConfigProvider.java rename to integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesConfigProvider.java index d507b68eb..23ce01273 100644 --- a/integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringFeaturesConfigProvider.java +++ b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesConfigProvider.java @@ -13,21 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.spring; +package org.ocpsoft.rewrite.spring; import javax.servlet.ServletContext; +import org.ocpsoft.rewrite.bind.El; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Invoke; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.servlet.config.Redirect; +import org.ocpsoft.rewrite.servlet.config.SendStatus; import org.springframework.stereotype.Component; -import com.ocpsoft.rewrite.bind.El; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Invoke; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.Redirect; -import com.ocpsoft.rewrite.servlet.config.SendStatus; - /** * @author Christian Kaltepoth */ diff --git a/integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringFeaturesTest.java b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesTest.java similarity index 94% rename from integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringFeaturesTest.java rename to integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesTest.java index e8c78979b..34d9d58af 100644 --- a/integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringFeaturesTest.java +++ b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.spring; +package org.ocpsoft.rewrite.spring; import junit.framework.Assert; @@ -25,10 +25,10 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; import org.junit.runner.RunWith; +import org.ocpsoft.rewrite.test.HttpAction; import org.springframework.web.context.WebApplicationContext; -import com.ocpsoft.rewrite.test.HttpAction; -import com.ocpsoft.rewrite.test.RewriteTestBase; +import org.ocpsoft.rewrite.test.RewriteTestBase; /** *

diff --git a/integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringRoot.java b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringRoot.java similarity index 95% rename from integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringRoot.java rename to integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringRoot.java index 4e85530b3..e44b81211 100644 --- a/integration-spring/src/test/java/com/ocpsoft/rewrite/spring/SpringRoot.java +++ b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringRoot.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.spring; +package org.ocpsoft.rewrite.spring; /** * @author Christian Kaltepoth diff --git a/integration-spring/src/test/resources/applicationContext.xml b/integration-spring/src/test/resources/applicationContext.xml index e9abf972b..796bb3d81 100644 --- a/integration-spring/src/test/resources/applicationContext.xml +++ b/integration-spring/src/test/resources/applicationContext.xml @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/showcase/access-control/src/main/java/com/ocpsoft/rewrite/showcase/access/TimerBean.java b/showcase/access-control/src/main/java/com/ocpsoft/rewrite/showcase/access/TimerBean.java deleted file mode 100644 index 710b0975d..000000000 --- a/showcase/access-control/src/main/java/com/ocpsoft/rewrite/showcase/access/TimerBean.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.showcase.access; - -import java.io.Serializable; - -import javax.enterprise.context.SessionScoped; -import javax.inject.Named; - -import org.joda.time.DateTime; - -import com.ocpsoft.pretty.time.PrettyTime; -import com.ocpsoft.pretty.time.units.Second; - -/** - * @author Lincoln Baxter, III - * - */ -@Named -@SessionScoped -public class TimerBean implements Serializable -{ - private static final long serialVersionUID = 4702776314232622624L; - - public String getSecondsUntilGranted() - { - DateTime time = new DateTime(); - int secondsRemain = 60 - time.getSecondOfMinute(); - DateTime deniedTime = time.plusSeconds(secondsRemain); - PrettyTime prettyTime = new PrettyTime(); - prettyTime.setUnits(new Second(prettyTime.getLocale())); - return prettyTime.format(deniedTime.toDate()); - } - - public String getSecondsUntilDenied() - { - DateTime time = new DateTime(); - int secondsRemain = 30 - time.getSecondOfMinute(); - DateTime grantedTime = time.plusSeconds(secondsRemain); - PrettyTime prettyTime = new PrettyTime(); - prettyTime.setUnits(new Second(prettyTime.getLocale())); - return prettyTime.format(grantedTime.toDate()); - } -} diff --git a/showcase/access-control/src/main/java/com/ocpsoft/rewrite/showcase/access/AccessRewriteConfiguration.java b/showcase/access-control/src/main/java/org/ocpsoft/rewrite/showcase/access/AccessRewriteConfiguration.java similarity index 54% rename from showcase/access-control/src/main/java/com/ocpsoft/rewrite/showcase/access/AccessRewriteConfiguration.java rename to showcase/access-control/src/main/java/org/ocpsoft/rewrite/showcase/access/AccessRewriteConfiguration.java index 006e4d6fe..22cbc9184 100644 --- a/showcase/access-control/src/main/java/com/ocpsoft/rewrite/showcase/access/AccessRewriteConfiguration.java +++ b/showcase/access-control/src/main/java/org/ocpsoft/rewrite/showcase/access/AccessRewriteConfiguration.java @@ -1,41 +1,20 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.ocpsoft.rewrite.showcase.access; +package org.ocpsoft.rewrite.showcase.access; import javax.inject.Inject; import javax.servlet.ServletContext; import org.joda.time.DateTime; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.jodatime.JodaTime; -import com.ocpsoft.rewrite.config.jodatime.TimeCondition; -import com.ocpsoft.rewrite.servlet.config.DispatchType; -import com.ocpsoft.rewrite.servlet.config.Domain; -import com.ocpsoft.rewrite.servlet.config.Forward; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.rule.Join; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.jodatime.JodaTime; +import org.ocpsoft.rewrite.config.jodatime.TimeCondition; +import org.ocpsoft.rewrite.servlet.config.DispatchType; +import org.ocpsoft.rewrite.servlet.config.Domain; +import org.ocpsoft.rewrite.servlet.config.Forward; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.servlet.config.rule.Join; /** * @author Lincoln Baxter, III diff --git a/showcase/access-control/src/main/java/org/ocpsoft/rewrite/showcase/access/TimerBean.java b/showcase/access-control/src/main/java/org/ocpsoft/rewrite/showcase/access/TimerBean.java new file mode 100644 index 000000000..8cb4ca735 --- /dev/null +++ b/showcase/access-control/src/main/java/org/ocpsoft/rewrite/showcase/access/TimerBean.java @@ -0,0 +1,42 @@ +package org.ocpsoft.rewrite.showcase.access; + +import java.io.Serializable; + +import javax.enterprise.context.SessionScoped; +import javax.inject.Named; + +import org.joda.time.DateTime; + +import org.ocpsoft.pretty.time.PrettyTime; +import org.ocpsoft.pretty.time.units.Second; + +/** + * @author Lincoln Baxter, III + * + */ +@Named +@SessionScoped +public class TimerBean implements Serializable +{ + private static final long serialVersionUID = 4702776314232622624L; + + public String getSecondsUntilGranted() + { + DateTime time = new DateTime(); + int secondsRemain = 60 - time.getSecondOfMinute(); + DateTime deniedTime = time.plusSeconds(secondsRemain); + PrettyTime prettyTime = new PrettyTime(); + prettyTime.setUnits(new Second(prettyTime.getLocale())); + return prettyTime.format(deniedTime.toDate()); + } + + public String getSecondsUntilDenied() + { + DateTime time = new DateTime(); + int secondsRemain = 30 - time.getSecondOfMinute(); + DateTime grantedTime = time.plusSeconds(secondsRemain); + PrettyTime prettyTime = new PrettyTime(); + prettyTime.setUnits(new Second(prettyTime.getLocale())); + return prettyTime.format(grantedTime.toDate()); + } +} diff --git a/showcase/access-control/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider b/showcase/access-control/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider deleted file mode 100644 index 7c2a94919..000000000 --- a/showcase/access-control/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.showcase.access.AccessRewriteConfiguration \ No newline at end of file diff --git a/showcase/access-control/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider b/showcase/access-control/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider new file mode 100644 index 000000000..eb48dd2cc --- /dev/null +++ b/showcase/access-control/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider @@ -0,0 +1 @@ +org.ocpsoft.rewrite.showcase.access.AccessRewriteConfiguration \ No newline at end of file diff --git a/showcase/composite-query/src/main/java/com/ocpsoft/rewrite/showcase/composite/CompositeRewriteConfiguration.java b/showcase/composite-query/src/main/java/org/ocpsoft/rewrite/showcase/composite/CompositeRewriteConfiguration.java similarity index 71% rename from showcase/composite-query/src/main/java/com/ocpsoft/rewrite/showcase/composite/CompositeRewriteConfiguration.java rename to showcase/composite-query/src/main/java/org/ocpsoft/rewrite/showcase/composite/CompositeRewriteConfiguration.java index 91899918d..fb7e570d9 100644 --- a/showcase/composite-query/src/main/java/com/ocpsoft/rewrite/showcase/composite/CompositeRewriteConfiguration.java +++ b/showcase/composite-query/src/main/java/org/ocpsoft/rewrite/showcase/composite/CompositeRewriteConfiguration.java @@ -1,13 +1,13 @@ -package com.ocpsoft.rewrite.showcase.composite; +package org.ocpsoft.rewrite.showcase.composite; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.servlet.config.EncodeQuery; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.Redirect; -import com.ocpsoft.rewrite.servlet.config.rule.Join; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.servlet.config.EncodeQuery; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.Redirect; +import org.ocpsoft.rewrite.servlet.config.rule.Join; public class CompositeRewriteConfiguration extends HttpConfigurationProvider { diff --git a/showcase/composite-query/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider b/showcase/composite-query/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider deleted file mode 100644 index a7c321889..000000000 --- a/showcase/composite-query/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.showcase.composite.CompositeRewriteConfiguration \ No newline at end of file diff --git a/showcase/composite-query/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider b/showcase/composite-query/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider new file mode 100644 index 000000000..398d5db58 --- /dev/null +++ b/showcase/composite-query/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider @@ -0,0 +1 @@ +org.ocpsoft.rewrite.showcase.composite.CompositeRewriteConfiguration \ No newline at end of file diff --git a/showcase/mega-rewrite/src/main/java/com/ocpsoft/rewrite/showcase/mega/MegaRewriteConfiguration.java b/showcase/mega-rewrite/src/main/java/org/ocpsoft/rewrite/showcase/mega/MegaRewriteConfiguration.java similarity index 71% rename from showcase/mega-rewrite/src/main/java/com/ocpsoft/rewrite/showcase/mega/MegaRewriteConfiguration.java rename to showcase/mega-rewrite/src/main/java/org/ocpsoft/rewrite/showcase/mega/MegaRewriteConfiguration.java index 315949cf6..685f0182f 100644 --- a/showcase/mega-rewrite/src/main/java/com/ocpsoft/rewrite/showcase/mega/MegaRewriteConfiguration.java +++ b/showcase/mega-rewrite/src/main/java/org/ocpsoft/rewrite/showcase/mega/MegaRewriteConfiguration.java @@ -1,15 +1,15 @@ -package com.ocpsoft.rewrite.showcase.mega; +package org.ocpsoft.rewrite.showcase.mega; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Direction; -import com.ocpsoft.rewrite.config.Not; -import com.ocpsoft.rewrite.servlet.config.DispatchType; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.rule.Join; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.servlet.config.DispatchType; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.servlet.config.rule.Join; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.config.Not; public class MegaRewriteConfiguration extends HttpConfigurationProvider { diff --git a/showcase/mega-rewrite/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider b/showcase/mega-rewrite/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider deleted file mode 100644 index a53e00310..000000000 --- a/showcase/mega-rewrite/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.showcase.mega.MegaRewriteConfiguration \ No newline at end of file diff --git a/showcase/mega-rewrite/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider b/showcase/mega-rewrite/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider new file mode 100644 index 000000000..5d7f67c0b --- /dev/null +++ b/showcase/mega-rewrite/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider @@ -0,0 +1 @@ +org.ocpsoft.rewrite.showcase.mega.MegaRewriteConfiguration \ No newline at end of file diff --git a/showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/domain/DomainEntity.java b/showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/domain/DomainEntity.java similarity index 96% rename from showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/domain/DomainEntity.java rename to showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/domain/DomainEntity.java index 9678a2a55..bb2eb648d 100644 --- a/showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/domain/DomainEntity.java +++ b/showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/domain/DomainEntity.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.showcase.domain; +package org.ocpsoft.rewrite.showcase.domain; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/domain/DomainRewriteConfiguration.java b/showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/domain/DomainRewriteConfiguration.java similarity index 80% rename from showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/domain/DomainRewriteConfiguration.java rename to showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/domain/DomainRewriteConfiguration.java index 5d756ab13..2e19eeffa 100644 --- a/showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/domain/DomainRewriteConfiguration.java +++ b/showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/domain/DomainRewriteConfiguration.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.showcase.domain; +package org.ocpsoft.rewrite.showcase.domain; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.bind.El; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Invoke; -import com.ocpsoft.rewrite.servlet.config.DispatchType; -import com.ocpsoft.rewrite.servlet.config.Domain; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.QueryString; -import com.ocpsoft.rewrite.servlet.config.rule.Join; +import org.ocpsoft.rewrite.bind.El; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Invoke; +import org.ocpsoft.rewrite.servlet.config.DispatchType; +import org.ocpsoft.rewrite.servlet.config.Domain; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.QueryString; +import org.ocpsoft.rewrite.servlet.config.rule.Join; /** * @author Lincoln Baxter, III diff --git a/showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/domain/Domains.java b/showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/domain/Domains.java similarity index 98% rename from showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/domain/Domains.java rename to showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/domain/Domains.java index 0e57c7251..7acd96d4a 100644 --- a/showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/domain/Domains.java +++ b/showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/domain/Domains.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.showcase.domain; +package org.ocpsoft.rewrite.showcase.domain; import javax.ejb.Stateful; import javax.enterprise.context.RequestScoped; diff --git a/showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/rewrite/URLRewriteConfiguration.java b/showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/rewrite/URLRewriteConfiguration.java similarity index 75% rename from showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/rewrite/URLRewriteConfiguration.java rename to showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/rewrite/URLRewriteConfiguration.java index c64525fce..35af3468e 100644 --- a/showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/rewrite/URLRewriteConfiguration.java +++ b/showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/rewrite/URLRewriteConfiguration.java @@ -1,16 +1,16 @@ -package com.ocpsoft.rewrite.showcase.rewrite; +package org.ocpsoft.rewrite.showcase.rewrite; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.config.Direction; -import com.ocpsoft.rewrite.servlet.config.DispatchType; -import com.ocpsoft.rewrite.servlet.config.Forward; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.rule.Join; -import com.ocpsoft.rewrite.servlet.config.rule.TrailingSlash; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.config.Direction; +import org.ocpsoft.rewrite.servlet.config.DispatchType; +import org.ocpsoft.rewrite.servlet.config.Forward; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.servlet.config.rule.Join; +import org.ocpsoft.rewrite.servlet.config.rule.TrailingSlash; /** * @author Lincoln Baxter, III diff --git a/showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/view/DomainBean.java b/showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/view/DomainBean.java similarity index 95% rename from showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/view/DomainBean.java rename to showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/view/DomainBean.java index 80bca46d9..3af8af834 100644 --- a/showcase/multi-domain/src/main/java/com/ocpsoft/rewrite/showcase/view/DomainBean.java +++ b/showcase/multi-domain/src/main/java/org/ocpsoft/rewrite/showcase/view/DomainBean.java @@ -1,4 +1,4 @@ -package com.ocpsoft.rewrite.showcase.view; +package org.ocpsoft.rewrite.showcase.view; import java.util.ArrayList; import java.util.List; @@ -10,7 +10,7 @@ import org.jboss.forge.scaffold.metawidget.persistence.PaginationHelper; import org.jboss.forge.scaffold.metawidget.persistence.PersistenceUtil; -import com.ocpsoft.rewrite.showcase.domain.DomainEntity; +import org.ocpsoft.rewrite.showcase.domain.DomainEntity; @Named @Stateful diff --git a/showcase/multi-domain/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider b/showcase/multi-domain/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider deleted file mode 100644 index 1e59c9fde..000000000 --- a/showcase/multi-domain/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider +++ /dev/null @@ -1,2 +0,0 @@ -com.ocpsoft.rewrite.showcase.rewrite.URLRewriteConfiguration -com.ocpsoft.rewrite.showcase.domain.DomainRewriteConfiguration \ No newline at end of file diff --git a/showcase/multi-domain/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider b/showcase/multi-domain/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider new file mode 100644 index 000000000..1535c3d9c --- /dev/null +++ b/showcase/multi-domain/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider @@ -0,0 +1,2 @@ +org.ocpsoft.rewrite.showcase.rewrite.URLRewriteConfiguration +org.ocpsoft.rewrite.showcase.domain.DomainRewriteConfiguration \ No newline at end of file diff --git a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/Product.java b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/Product.java similarity index 97% rename from showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/Product.java rename to showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/Product.java index 59186123f..050f97f10 100644 --- a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/Product.java +++ b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/Product.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.showcase.rest; +package org.ocpsoft.rewrite.showcase.rest; import javax.xml.bind.annotation.XmlRootElement; diff --git a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/ProductConverter.java b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/ProductConverter.java similarity index 84% rename from showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/ProductConverter.java rename to showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/ProductConverter.java index b5e30bbb6..01016b708 100644 --- a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/ProductConverter.java +++ b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/ProductConverter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.showcase.rest; +package org.ocpsoft.rewrite.showcase.rest; import javax.inject.Inject; -import com.ocpsoft.rewrite.bind.Converter; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.convert.IntegerConverter; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.bind.Converter; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.convert.IntegerConverter; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/ProductRegistry.java b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/ProductRegistry.java similarity index 97% rename from showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/ProductRegistry.java rename to showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/ProductRegistry.java index 94bfaa16b..fa9c9c119 100644 --- a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/ProductRegistry.java +++ b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/ProductRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.showcase.rest; +package org.ocpsoft.rewrite.showcase.rest; import java.util.ArrayList; import java.util.List; diff --git a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/ProductValidator.java b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/ProductValidator.java similarity index 86% rename from showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/ProductValidator.java rename to showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/ProductValidator.java index bec72138e..3578a5545 100644 --- a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/ProductValidator.java +++ b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/ProductValidator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.showcase.rest; +package org.ocpsoft.rewrite.showcase.rest; -import com.ocpsoft.rewrite.bind.Validator; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.bind.Validator; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/RestRewriteConfiguration.java b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/RestRewriteConfiguration.java similarity index 91% rename from showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/RestRewriteConfiguration.java rename to showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/RestRewriteConfiguration.java index 9fce91a93..bf1302fcb 100644 --- a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/RestRewriteConfiguration.java +++ b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/RestRewriteConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.showcase.rest; +package org.ocpsoft.rewrite.showcase.rest; import java.io.IOException; import java.io.PrintWriter; @@ -21,19 +21,19 @@ import javax.inject.Inject; import javax.servlet.ServletContext; -import com.ocpsoft.rewrite.bind.Evaluation; -import com.ocpsoft.rewrite.bind.ParameterizedPattern; -import com.ocpsoft.rewrite.config.Configuration; -import com.ocpsoft.rewrite.config.ConfigurationBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; -import com.ocpsoft.rewrite.servlet.config.HttpOperation; -import com.ocpsoft.rewrite.servlet.config.Method; -import com.ocpsoft.rewrite.servlet.config.Path; -import com.ocpsoft.rewrite.servlet.config.Response; -import com.ocpsoft.rewrite.servlet.config.SendStatus; -import com.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; -import com.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; +import org.ocpsoft.rewrite.bind.Evaluation; +import org.ocpsoft.rewrite.bind.ParameterizedPattern; +import org.ocpsoft.rewrite.config.Configuration; +import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider; +import org.ocpsoft.rewrite.servlet.config.HttpOperation; +import org.ocpsoft.rewrite.servlet.config.Method; +import org.ocpsoft.rewrite.servlet.config.Path; +import org.ocpsoft.rewrite.servlet.config.Response; +import org.ocpsoft.rewrite.servlet.config.SendStatus; +import org.ocpsoft.rewrite.servlet.http.event.HttpInboundServletRewrite; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * @author Lincoln Baxter, III diff --git a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/XMLUtil.java b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/XMLUtil.java similarity index 97% rename from showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/XMLUtil.java rename to showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/XMLUtil.java index c08093004..6f5cd7920 100644 --- a/showcase/rest-ws/src/main/java/com/ocpsoft/rewrite/showcase/rest/XMLUtil.java +++ b/showcase/rest-ws/src/main/java/org/ocpsoft/rewrite/showcase/rest/XMLUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.showcase.rest; +package org.ocpsoft.rewrite.showcase.rest; import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; diff --git a/showcase/rest-ws/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider b/showcase/rest-ws/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider deleted file mode 100644 index 2d8db0178..000000000 --- a/showcase/rest-ws/src/main/resources/META-INF/services/com.ocpsoft.rewrite.config.ConfigurationProvider +++ /dev/null @@ -1 +0,0 @@ -com.ocpsoft.rewrite.showcase.rest.RestRewriteConfiguration \ No newline at end of file diff --git a/showcase/rest-ws/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider b/showcase/rest-ws/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider new file mode 100644 index 000000000..5184183e4 --- /dev/null +++ b/showcase/rest-ws/src/main/resources/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider @@ -0,0 +1 @@ +org.ocpsoft.rewrite.showcase.rest.RestRewriteConfiguration \ No newline at end of file diff --git a/test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockBinding.java b/test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockBinding.java similarity index 91% rename from test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockBinding.java rename to test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockBinding.java index 6b823595a..ca85b12c0 100644 --- a/test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockBinding.java +++ b/test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockBinding.java @@ -1,8 +1,8 @@ -package com.ocpsoft.rewrite.mock; +package org.ocpsoft.rewrite.mock; -import com.ocpsoft.rewrite.bind.BindingBuilder; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.bind.BindingBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; public class MockBinding extends BindingBuilder { diff --git a/test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockEvaluationContext.java b/test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockEvaluationContext.java similarity index 90% rename from test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockEvaluationContext.java rename to test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockEvaluationContext.java index 78ada11f3..1341704b5 100644 --- a/test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockEvaluationContext.java +++ b/test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockEvaluationContext.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.mock; +package org.ocpsoft.rewrite.mock; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.ocpsoft.rewrite.config.Operation; -import com.ocpsoft.rewrite.context.ContextBase; -import com.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.config.Operation; +import org.ocpsoft.rewrite.context.ContextBase; +import org.ocpsoft.rewrite.context.EvaluationContext; /** * @author Lincoln Baxter, III diff --git a/test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockFailedBinding.java b/test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockFailedBinding.java similarity index 86% rename from test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockFailedBinding.java rename to test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockFailedBinding.java index 2fed23b4a..b211c7ff8 100644 --- a/test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockFailedBinding.java +++ b/test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockFailedBinding.java @@ -1,8 +1,8 @@ -package com.ocpsoft.rewrite.mock; +package org.ocpsoft.rewrite.mock; -import com.ocpsoft.rewrite.bind.Binding; -import com.ocpsoft.rewrite.context.EvaluationContext; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.bind.Binding; +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.event.Rewrite; public class MockFailedBinding implements Binding { diff --git a/test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockRewrite.java b/test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockRewrite.java similarity index 88% rename from test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockRewrite.java rename to test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockRewrite.java index 58e895dfd..56a3e138f 100644 --- a/test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockRewrite.java +++ b/test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockRewrite.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.mock; +package org.ocpsoft.rewrite.mock; -import com.ocpsoft.rewrite.context.Context; -import com.ocpsoft.rewrite.event.Rewrite; +import org.ocpsoft.rewrite.context.Context; +import org.ocpsoft.rewrite.event.Rewrite; /** * @author Lincoln Baxter, III diff --git a/test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockRewriteContext.java b/test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockRewriteContext.java similarity index 90% rename from test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockRewriteContext.java rename to test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockRewriteContext.java index b976a3d1d..c5f7f4e83 100644 --- a/test-harness/src/main/java/com/ocpsoft/rewrite/mock/MockRewriteContext.java +++ b/test-harness/src/main/java/org/ocpsoft/rewrite/mock/MockRewriteContext.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.mock; +package org.ocpsoft.rewrite.mock; -import com.ocpsoft.rewrite.context.ContextBase; +import org.ocpsoft.rewrite.context.ContextBase; /** diff --git a/test-harness/src/main/java/com/ocpsoft/rewrite/test/HttpAction.java b/test-harness/src/main/java/org/ocpsoft/rewrite/test/HttpAction.java similarity index 98% rename from test-harness/src/main/java/com/ocpsoft/rewrite/test/HttpAction.java rename to test-harness/src/main/java/org/ocpsoft/rewrite/test/HttpAction.java index 80ddde38a..af17f5d5c 100644 --- a/test-harness/src/main/java/com/ocpsoft/rewrite/test/HttpAction.java +++ b/test-harness/src/main/java/org/ocpsoft/rewrite/test/HttpAction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.test; +package org.ocpsoft.rewrite.test; import java.io.IOException; import java.io.InputStream; @@ -33,7 +33,7 @@ import org.apache.http.protocol.ExecutionContext; import org.apache.http.protocol.HttpContext; -import com.ocpsoft.rewrite.exception.RewriteException; +import org.ocpsoft.rewrite.exception.RewriteException; /** * @author Lincoln Baxter, III diff --git a/test-harness/src/main/java/com/ocpsoft/rewrite/test/RewriteTestBase.java b/test-harness/src/main/java/org/ocpsoft/rewrite/test/RewriteTestBase.java similarity index 83% rename from test-harness/src/main/java/com/ocpsoft/rewrite/test/RewriteTestBase.java rename to test-harness/src/main/java/org/ocpsoft/rewrite/test/RewriteTestBase.java index d3a243b79..a5458d4f6 100644 --- a/test-harness/src/main/java/com/ocpsoft/rewrite/test/RewriteTestBase.java +++ b/test-harness/src/main/java/org/ocpsoft/rewrite/test/RewriteTestBase.java @@ -13,29 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ocpsoft.rewrite.test; - -/* - * JBoss, Home of Professional Open Source - * Copyright 2011, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ +package org.ocpsoft.rewrite.test; import java.io.File; import java.util.Collection; @@ -102,9 +80,9 @@ public static WebArchive getDeploymentNoWebXml() protected static JavaArchive getRewriteArchive() { return ShrinkWrap.create(JavaArchive.class, "rewrite-servlet.jar") - .addAsResource(new File("../api/target/classes/com")) + .addAsResource(new File("../api/target/classes/org")) .addAsResource(new File("../api/target/classes/META-INF")) - .addAsResource(new File("../impl-servlet/target/classes/com")) + .addAsResource(new File("../impl-servlet/target/classes/org")) .addAsResource(new File("../impl-servlet/target/classes/META-INF")); } diff --git a/test-harness/src/main/resources/jetty-log4j.xml b/test-harness/src/main/resources/jetty-log4j.xml index 173aba565..40dd624ad 100644 --- a/test-harness/src/main/resources/jetty-log4j.xml +++ b/test-harness/src/main/resources/jetty-log4j.xml @@ -24,7 +24,7 @@ - +