Added: camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/LICENSE.txt URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/LICENSE.txt?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/LICENSE.txt (added) +++ camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/LICENSE.txt Thu Dec 27 13:18:41 2012 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +
Propchange: camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/LICENSE.txt ------------------------------------------------------------------------------ svn:executable = * Propchange: camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/LICENSE.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/NOTICE.txt URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/NOTICE.txt?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/NOTICE.txt (added) +++ camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/NOTICE.txt Thu Dec 27 13:18:41 2012 @@ -0,0 +1,11 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Apache Camel distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + Please read the different LICENSE files present in the licenses directory of + this distribution. Propchange: camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/main/resources/META-INF/NOTICE.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModTest.java?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModTest.java (added) +++ camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModTest.java Thu Dec 27 13:18:41 2012 @@ -0,0 +1,61 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.urlrewrite.http; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +/** + * + */ +public class HttpUrlRewriteModTest extends CamelTestSupport { + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + + HttpUrlRewrite myRewrite = new HttpUrlRewrite(); + myRewrite.setModRewriteConfText("RewriteRule page/([^/\\.]+)/?$ index.php?page=$1 [L]"); + + jndi.bind("myRewrite", myRewrite); + + return jndi; + } + + @Test + public void testHttpUriRewrite() throws Exception { + String out = template.requestBody("http://localhost:8080/myapp/page/software/", null, String.class); + assertEquals("http://localhost:8081/myapp2/index.php?page=software", out); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("jetty:http://localhost:8080/myapp?matchOnUriPrefix=true") + .to("http://localhost:8081/myapp2?bridgeEndpoint=true&throwExceptionOnFailure=false&urlRewrite=#myRewrite"); + + from("jetty:http://localhost:8081/myapp2?matchOnUriPrefix=true") + .transform().simple("${header.CamelHttpUrl}?${header.CamelHttpQuery}"); + } + }; + } +} Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteModTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingQueryTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingQueryTest.java?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingQueryTest.java (added) +++ camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingQueryTest.java Thu Dec 27 13:18:41 2012 @@ -0,0 +1,62 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.urlrewrite.http; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +/** + * + */ +public class HttpUrlRewritePingQueryTest extends CamelTestSupport { + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + + HttpUrlRewrite myRewrite = new HttpUrlRewrite(); + myRewrite.setConfigFile("example/urlrewrite-ping.xml"); + myRewrite.setUseQueryString(true); + + jndi.bind("myRewrite", myRewrite); + + return jndi; + } + + @Test + public void testHttpUriRewrite() throws Exception { + String out = template.requestBody("http://localhost:8080/ping?foo=bar", null, String.class); + assertEquals("http://localhost:8081/proxy/ping?foo=bar", out); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("jetty:http://localhost:8080/?matchOnUriPrefix=true") + .to("http://localhost:8081/?bridgeEndpoint=true&throwExceptionOnFailure=false&urlRewrite=#myRewrite"); + + from("jetty:http://localhost:8081/proxy/?matchOnUriPrefix=true") + .transform().simple("${header.CamelHttpUrl}?${header.CamelHttpQuery}"); + } + }; + } +} Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingQueryTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingQueryTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingTest.java?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingTest.java (added) +++ camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingTest.java Thu Dec 27 13:18:41 2012 @@ -0,0 +1,62 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.urlrewrite.http; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +/** + * + */ +public class HttpUrlRewritePingTest extends CamelTestSupport { + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + + HttpUrlRewrite myRewrite = new HttpUrlRewrite(); + myRewrite.setConfigFile("example/urlrewrite-ping.xml"); + myRewrite.setUseQueryString(false); + + jndi.bind("myRewrite", myRewrite); + + return jndi; + } + + @Test + public void testHttpUriRewrite() throws Exception { + String out = template.requestBody("http://localhost:8080/ping", null, String.class); + assertEquals("http://localhost:8081/proxy/ping", out); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("jetty:http://localhost:8080/?matchOnUriPrefix=true") + .to("http://localhost:8081/?bridgeEndpoint=true&throwExceptionOnFailure=false&urlRewrite=#myRewrite"); + + from("jetty:http://localhost:8081/proxy/?matchOnUriPrefix=true") + .transform().simple("${header.CamelHttpUrl}"); + } + }; + } +} Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewritePingTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteTest.java?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteTest.java (added) +++ camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteTest.java Thu Dec 27 13:18:41 2012 @@ -0,0 +1,66 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.urlrewrite.http; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.http.HttpMessage; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +/** + * + */ +public class HttpUrlRewriteTest extends CamelTestSupport { + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + + HttpUrlRewrite myRewrite = new HttpUrlRewrite(); + myRewrite.setConfigFile("example/urlrewrite2.xml"); + + jndi.bind("myRewrite", myRewrite); + + return jndi; + } + + @Test + public void testHttpUriRewrite() throws Exception { + String out = template.requestBody("http://localhost:8080/myapp/products/1234", null, String.class); + assertEquals("http://localhost:8081/myapp2/products/index.jsp?product_id=1234", out); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("jetty:http://localhost:8080/myapp?matchOnUriPrefix=true") + .to("http://localhost:8081/myapp2?bridgeEndpoint=true&throwExceptionOnFailure=false&urlRewrite=#myRewrite"); + + from("jetty:http://localhost:8081/myapp2?matchOnUriPrefix=true") + .transform().simple("${header.CamelHttpUrl}?${header.CamelHttpQuery}"); + } + }; + } +} Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/http/HttpUrlRewriteTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteModTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteModTest.java?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteModTest.java (added) +++ camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteModTest.java Thu Dec 27 13:18:41 2012 @@ -0,0 +1,61 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.urlrewrite.jetty; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +/** + * + */ +public class JettyUrlRewriteModTest extends CamelTestSupport { + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + + HttpUrlRewrite myRewrite = new HttpUrlRewrite(); + myRewrite.setModRewriteConfText("RewriteRule page/([^/\\.]+)/?$ index.php?page=$1 [L]"); + + jndi.bind("myRewrite", myRewrite); + + return jndi; + } + + @Test + public void testHttpUriRewrite() throws Exception { + String out = template.requestBody("jetty:http://localhost:8080/myapp/page/software/", null, String.class); + assertEquals("http://localhost:8081/myapp2/index.php?page=software", out); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("jetty:http://localhost:8080/myapp?matchOnUriPrefix=true") + .to("jetty:http://localhost:8081/myapp2?bridgeEndpoint=true&throwExceptionOnFailure=false&urlRewrite=#myRewrite"); + + from("jetty:http://localhost:8081/myapp2?matchOnUriPrefix=true") + .transform().simple("${header.CamelHttpUrl}?${header.CamelHttpQuery}"); + } + }; + } +} Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteModTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteModTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteTest.java?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteTest.java (added) +++ camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteTest.java Thu Dec 27 13:18:41 2012 @@ -0,0 +1,61 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.urlrewrite.jetty; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.urlrewrite.HttpUrlRewrite; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +/** + * + */ +public class JettyUrlRewriteTest extends CamelTestSupport { + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + + HttpUrlRewrite myRewrite = new HttpUrlRewrite(); + myRewrite.setConfigFile("example/urlrewrite2.xml"); + + jndi.bind("myRewrite", myRewrite); + + return jndi; + } + + @Test + public void testJettyUriRewrite() throws Exception { + String out = template.requestBody("jetty:http://localhost:8080/myapp/products/1234", null, String.class); + assertEquals("http://localhost:8081/myapp2/products/index.jsp?product_id=1234", out); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("jetty:http://localhost:8080/myapp?matchOnUriPrefix=true") + .to("jetty:http://localhost:8081/myapp2?bridgeEndpoint=true&throwExceptionOnFailure=false&urlRewrite=#myRewrite"); + + from("jetty:http://localhost:8081/myapp2?matchOnUriPrefix=true") + .transform().simple("${header.CamelHttpUrl}?${header.CamelHttpQuery}"); + } + }; + } +} Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/jetty/JettyUrlRewriteTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite-ping.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite-ping.xml?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite-ping.xml (added) +++ camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite-ping.xml Thu Dec 27 13:18:41 2012 @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!DOCTYPE urlrewrite PUBLIC "-//tuckey.org//DTD UrlRewrite 4.0//EN" + "http://www.tuckey.org/res/dtds/urlrewrite4.0.dtd"> + +<!-- + + Configuration file for UrlRewriteFilter + http://www.tuckey.org/urlrewrite/ + +--> +<!-- START SNIPPET: e1 --> +<urlrewrite> + + <rule> + <from>^/?(.*)$</from> + <to>/proxy/$1</to> + </rule> + +</urlrewrite> +<!-- END SNIPPET: e1 --> Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite-ping.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite-ping.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite-ping.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite2.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite2.xml?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite2.xml (added) +++ camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite2.xml Thu Dec 27 13:18:41 2012 @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!DOCTYPE urlrewrite PUBLIC "-//tuckey.org//DTD UrlRewrite 4.0//EN" + "http://www.tuckey.org/res/dtds/urlrewrite4.0.dtd"> + +<!-- + + Configuration file for UrlRewriteFilter + http://www.tuckey.org/urlrewrite/ + +--> +<!-- START SNIPPET: e1 --> +<urlrewrite> + + <rule> + <from>/products/([0-9]+)</from> + <to>/products/index.jsp?product_id=$1</to> + </rule> + +</urlrewrite> +<!-- END SNIPPET: e1 --> Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite2.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite2.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/example/urlrewrite2.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: camel/trunk/components/camel-urlrewrite/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/test/resources/log4j.properties?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/test/resources/log4j.properties (added) +++ camel/trunk/components/camel-urlrewrite/src/test/resources/log4j.properties Thu Dec 27 13:18:41 2012 @@ -0,0 +1,39 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +# +# The logging properties used during tests.. +# +# +# The logging properties used for eclipse testing, We want to see debug output on the console. +# +log4j.rootLogger=INFO, file + +# uncomment the following to enable camel debugging +log4j.logger.org.apache.camel.component.urlrewrite=DEBUG + +# CONSOLE appender not used by default +log4j.appender.out=org.apache.log4j.ConsoleAppender +log4j.appender.out.layout=org.apache.log4j.PatternLayout +#log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n +log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n + +# File appender +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n +log4j.appender.file.file=target/camel-urlrewrite-test.log \ No newline at end of file Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/log4j.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/log4j.properties ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/log4j.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: camel/trunk/components/camel-urlrewrite/src/test/resources/urlrewrite.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-urlrewrite/src/test/resources/urlrewrite.xml?rev=1426191&view=auto ============================================================================== --- camel/trunk/components/camel-urlrewrite/src/test/resources/urlrewrite.xml (added) +++ camel/trunk/components/camel-urlrewrite/src/test/resources/urlrewrite.xml Thu Dec 27 13:18:41 2012 @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!DOCTYPE urlrewrite PUBLIC "-//tuckey.org//DTD UrlRewrite 4.0//EN" + "http://www.tuckey.org/res/dtds/urlrewrite4.0.dtd"> + +<!-- + + Configuration file for UrlRewriteFilter + http://www.tuckey.org/urlrewrite/ + +--> +<urlrewrite> + + <rule> + <note> + The rule means that requests to /test/status/ will be redirected to /rewrite-status + the url will be rewritten. + </note> + <from>/test/status/</from> + <to type="redirect">%{context-path}/rewrite-status</to> + </rule> + + + <outbound-rule> + <note> + The outbound-rule specifies that when response.encodeURL is called (if you are using JSTL c:url) + the url /rewrite-status will be rewritten to /test/status/. + + The above rule and this outbound-rule means that end users should never see the + url /rewrite-status only /test/status/ both in thier location bar and in hyperlinks + in your pages. + </note> + <from>/rewrite-status</from> + <to>/test/status/</to> + </outbound-rule> + + + <!-- + + INSTALLATION + + in your web.xml add... + + <filter> + <filter-name>UrlRewriteFilter</filter-name> + <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class> + <init-param> + <param-name>logLevel</param-name> + <param-value>WARN</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>UrlRewriteFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + EXAMPLES + + Redirect one url + <rule> + <from>/some/old/page.html</from> + <to type="redirect">/very/new/page.html</to> + </rule> + + Redirect a directory + <rule> + <from>/some/olddir/(.*)</from> + <to type="redirect">/very/newdir/$1</to> + </rule> + + Clean a url + <rule> + <from>/products/([0-9]+)</from> + <to>/products/index.jsp?product_id=$1</to> + </rule> + eg, /products/1234 will be passed on to /products/index.jsp?product_id=1234 without the user noticing. + + Browser detection + <rule> + <condition name="user-agent">Mozilla/[1-4]</condition> + <from>/some/page.html</from> + <to>/some/page-for-old-browsers.html</to> + </rule> + eg, will pass the request for /some/page.html on to /some/page-for-old-browsers.html only for older + browsers whose user agent srtings match Mozilla/1, Mozilla/2, Mozilla/3 or Mozilla/4. + + Centralised browser detection + <rule> + <condition name="user-agent">Mozilla/[1-4]</condition> + <set type="request" name="browser">moz</set> + </rule> + eg, all requests will be checked against the condition and if matched + request.setAttribute("browser", "moz") will be called. + + --> + +</urlrewrite> Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/urlrewrite.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/urlrewrite.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: camel/trunk/components/camel-urlrewrite/src/test/resources/urlrewrite.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: camel/trunk/components/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1426191&r1=1426190&r2=1426191&view=diff ============================================================================== --- camel/trunk/components/pom.xml (original) +++ camel/trunk/components/pom.xml Thu Dec 27 13:18:41 2012 @@ -161,6 +161,7 @@ <module>camel-syslog</module> <module>camel-tagsoup</module> <module>camel-twitter</module> + <module>camel-urlrewite</module> <module>camel-velocity</module> <module>camel-websocket</module> <module>camel-xmlbeans</module> Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1426191&r1=1426190&r2=1426191&view=diff ============================================================================== --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Thu Dec 27 13:18:41 2012 @@ -328,6 +328,7 @@ <testng-version>6.8</testng-version> <twitter4j-bundle-version>2.2.5_2</twitter4j-bundle-version> <twitter4j-version>2.2.5</twitter4j-version> + <urlrewritefilter-version>4.0.4</urlrewritefilter-version> <velocity-bundle-version>1.7_5</velocity-bundle-version> <velocity-tools-version>2.0</velocity-tools-version> <velocity-version>1.7</velocity-version>