Author: davsclaus Date: Sat Sep 4 13:05:45 2010 New Revision: 992593 URL: http://svn.apache.org/viewvc?rev=992593&view=rev Log: CAMEL-2987: Adding camel-jasypt as new component for having encrypted passwords or the likes in properties file and whatnot.
Added: camel/trunk/components/camel-jasypt/ camel/trunk/components/camel-jasypt/pom.xml (with props) camel/trunk/components/camel-jasypt/src/ camel/trunk/components/camel-jasypt/src/main/ camel/trunk/components/camel-jasypt/src/main/java/ camel/trunk/components/camel-jasypt/src/main/java/org/ camel/trunk/components/camel-jasypt/src/main/java/org/apache/ camel/trunk/components/camel-jasypt/src/main/java/org/apache/camel/ camel/trunk/components/camel-jasypt/src/main/java/org/apache/camel/component/ camel/trunk/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/ camel/trunk/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java (with props) camel/trunk/components/camel-jasypt/src/main/resources/ camel/trunk/components/camel-jasypt/src/main/resources/META-INF/ camel/trunk/components/camel-jasypt/src/main/resources/META-INF/LICENSE.txt (with props) camel/trunk/components/camel-jasypt/src/main/resources/META-INF/NOTICE.txt (with props) camel/trunk/components/camel-jasypt/src/test/ camel/trunk/components/camel-jasypt/src/test/java/ camel/trunk/components/camel-jasypt/src/test/java/org/ camel/trunk/components/camel-jasypt/src/test/java/org/apache/ camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/ camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/ camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/ camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/MainTest.java (with props) camel/trunk/components/camel-jasypt/src/test/resources/ camel/trunk/components/camel-jasypt/src/test/resources/log4j.properties (with props) Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java camel/trunk/components/pom.xml camel/trunk/parent/pom.xml Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java?rev=992593&r1=992592&r2=992593&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java Sat Sep 4 13:05:45 2010 @@ -46,17 +46,17 @@ import org.apache.commons.logging.LogFac public abstract class MainSupport extends ServiceSupport { protected static final Log LOG = LogFactory.getLog(MainSupport.class); protected String dotOutputDir; - private final List<Option> options = new ArrayList<Option>(); - private final CountDownLatch latch = new CountDownLatch(1); - private final AtomicBoolean completed = new AtomicBoolean(false); - private long duration = -1; - private TimeUnit timeUnit = TimeUnit.MILLISECONDS; - private String routesOutputFile; - private boolean aggregateDot; - private boolean trace; - private List<RouteBuilder> routeBuilders = new ArrayList<RouteBuilder>(); - private final List<CamelContext> camelContexts = new ArrayList<CamelContext>(); - private ProducerTemplate camelTemplate; + protected final List<Option> options = new ArrayList<Option>(); + protected final CountDownLatch latch = new CountDownLatch(1); + protected final AtomicBoolean completed = new AtomicBoolean(false); + protected long duration = -1; + protected TimeUnit timeUnit = TimeUnit.MILLISECONDS; + protected String routesOutputFile; + protected boolean aggregateDot; + protected boolean trace; + protected List<RouteBuilder> routeBuilders = new ArrayList<RouteBuilder>(); + protected final List<CamelContext> camelContexts = new ArrayList<CamelContext>(); + protected ProducerTemplate camelTemplate; protected MainSupport() { addOption(new Option("h", "help", "Displays the help screen") { Added: camel/trunk/components/camel-jasypt/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jasypt/pom.xml?rev=992593&view=auto ============================================================================== --- camel/trunk/components/camel-jasypt/pom.xml (added) +++ camel/trunk/components/camel-jasypt/pom.xml Sat Sep 4 13:05:45 2010 @@ -0,0 +1,90 @@ +<?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. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>camel-parent</artifactId> + <version>2.5-SNAPSHOT</version> + </parent> + + <artifactId>camel-jasypt</artifactId> + <packaging>bundle</packaging> + <name>Camel :: Jasypt</name> + <description>Camel Jasypt support</description> + + <properties> + <camel.osgi.export.pkg>org.apache.camel.component.jasypt.*</camel.osgi.export.pkg> + </properties> + + <dependencies> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jasypt</groupId> + <artifactId>jasypt</artifactId> + <version>${jasypt-version}</version> + </dependency> + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <version>${icu4j-version}</version> + </dependency> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test</artifactId> + <scope>test</scope> + </dependency> + + <!-- to allow Spring annotations (jmx) to be tested --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <optional>true</optional> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <optional>true</optional> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <!-- TODO: maven stuff to define a Main class in MANIFEST.MF so we can easily run it from cmd line, using java -jar camel-jasypt --> + +</project> Propchange: camel/trunk/components/camel-jasypt/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-jasypt/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: camel/trunk/components/camel-jasypt/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: camel/trunk/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java?rev=992593&view=auto ============================================================================== --- camel/trunk/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java (added) +++ camel/trunk/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java Sat Sep 4 13:05:45 2010 @@ -0,0 +1,135 @@ +/** + * 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.jasypt; + +import java.util.LinkedList; +import java.util.Map; +import javax.xml.bind.JAXBException; + +import org.apache.camel.CamelContext; +import org.apache.camel.ProducerTemplate; +import org.apache.camel.impl.MainSupport; +import org.apache.camel.util.ObjectHelper; +import org.apache.camel.view.ModelFileGenerator; +import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; + +/** + * @version $Revision$ + */ +public class Main extends MainSupport { + + private StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor(); + + private String command; + private String password; + private String input; + private String algorithm; + + public Main() { + options.clear(); + + addOption(new Option("h", "help", "Displays the help screen") { + protected void doProcess(String arg, LinkedList<String> remainingArgs) { + showOptions(); + completed(); + } + }); + + addOption(new ParameterOption("c", "command", "Command either encrypt or decrypt", "command") { + protected void doProcess(String arg, String parameter, LinkedList<String> remainingArgs) { + if ("encrypt".equals(parameter) || "decrypt".equals(parameter)) { + command = parameter; + } else { + throw new IllegalArgumentException("Unknown command, was: " + parameter); + } + } + }); + + addOption(new ParameterOption("p", "password", "Password to use", "password") { + protected void doProcess(String arg, String parameter, LinkedList<String> remainingArgs) { + password = parameter; + } + }); + + addOption(new ParameterOption("i", "input", "Text to encrypt or decrypt", "input") { + protected void doProcess(String arg, String parameter, LinkedList<String> remainingArgs) { + input = parameter; + } + }); + + addOption(new ParameterOption("a", "algorithm", "Optional algorithm to use", "algorithm") { + protected void doProcess(String arg, String parameter, LinkedList<String> remainingArgs) { + algorithm = parameter; + } + }); + } + + @Override + public void showOptionsHeader() { + System.out.println("Apache Camel Jasypt takes the following options"); + System.out.println(); + } + + protected ProducerTemplate findOrCreateCamelTemplate() { + // noop + return null; + } + + protected Map<String, CamelContext> getCamelContextMap() { + // noop + return null; + } + + protected ModelFileGenerator createModelFileGenerator() throws JAXBException { + // noop + return null; + } + + @Override + public void run() throws Exception { + if (ObjectHelper.isEmpty(command)) { + throw new IllegalArgumentException("Command is empty"); + } + if (ObjectHelper.isEmpty(password)) { + throw new IllegalArgumentException("Password is empty"); + } + if (ObjectHelper.isEmpty(input)) { + throw new IllegalArgumentException("Input is empty"); + } + + encryptor.setPassword(password); + if (algorithm != null) { + encryptor.setAlgorithm(algorithm); + } + if ("encrypt".equals(command)) { + System.out.println("Encrypted text: " + encryptor.encrypt(input)); + } else { + System.out.println("Decrypted text: " + encryptor.decrypt(input)); + } + } + + public static void main(String[] args) throws Exception { + Main main = new Main(); + if (args.length == 0) { + main.showOptions(); + return; + } else { + main.run(args); + } + } + +} Propchange: camel/trunk/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: camel/trunk/components/camel-jasypt/src/main/resources/META-INF/LICENSE.txt URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jasypt/src/main/resources/META-INF/LICENSE.txt?rev=992593&view=auto ============================================================================== --- camel/trunk/components/camel-jasypt/src/main/resources/META-INF/LICENSE.txt (added) +++ camel/trunk/components/camel-jasypt/src/main/resources/META-INF/LICENSE.txt Sat Sep 4 13:05:45 2010 @@ -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-jasypt/src/main/resources/META-INF/LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-jasypt/src/main/resources/META-INF/LICENSE.txt ------------------------------------------------------------------------------ svn:executable = * Propchange: camel/trunk/components/camel-jasypt/src/main/resources/META-INF/LICENSE.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: camel/trunk/components/camel-jasypt/src/main/resources/META-INF/NOTICE.txt URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jasypt/src/main/resources/META-INF/NOTICE.txt?rev=992593&view=auto ============================================================================== --- camel/trunk/components/camel-jasypt/src/main/resources/META-INF/NOTICE.txt (added) +++ camel/trunk/components/camel-jasypt/src/main/resources/META-INF/NOTICE.txt Sat Sep 4 13:05:45 2010 @@ -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-jasypt/src/main/resources/META-INF/NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-jasypt/src/main/resources/META-INF/NOTICE.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/MainTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/MainTest.java?rev=992593&view=auto ============================================================================== --- camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/MainTest.java (added) +++ camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/MainTest.java Sat Sep 4 13:05:45 2010 @@ -0,0 +1,44 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.jasypt; + +import junit.framework.TestCase; +import org.junit.Test; + +/** + * @version $Revision$ + */ +public class MainTest extends TestCase { + + @Test + public void testMainShowOptions() throws Exception { + Main.main(new String[]{}); + } + + @Test + public void testMainEncrypt() throws Exception { + Main main = new Main(); + main.run("-c encrypt -p secret -i tiger".split(" ")); + } + + @Test + public void testMainDecrypt() throws Exception { + Main main = new Main(); + main.run("-c decrypt -p secret -i bsW9uV37gQ0QHFu7KO03Ww==".split(" ")); + } + +} Propchange: camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/MainTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/MainTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: camel/trunk/components/camel-jasypt/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jasypt/src/test/resources/log4j.properties?rev=992593&view=auto ============================================================================== --- camel/trunk/components/camel-jasypt/src/test/resources/log4j.properties (added) +++ camel/trunk/components/camel-jasypt/src/test/resources/log4j.properties Sat Sep 4 13:05:45 2010 @@ -0,0 +1,35 @@ +## ------------------------------------------------------------------------ +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## ------------------------------------------------------------------------ + +# +# The logging properties used for eclipse testing, We want to see debug output on the console. +# +log4j.rootLogger=INFO, file + +#log4j.logger.org.apache.camel=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 %-5p %c{1} - %m %n +log4j.appender.file.file=target/camel-jasypt-test.log Propchange: camel/trunk/components/camel-jasypt/src/test/resources/log4j.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-jasypt/src/test/resources/log4j.properties ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: camel/trunk/components/camel-jasypt/src/test/resources/log4j.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: camel/trunk/components/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=992593&r1=992592&r2=992593&view=diff ============================================================================== --- camel/trunk/components/pom.xml (original) +++ camel/trunk/components/pom.xml Sat Sep 4 13:05:45 2010 @@ -68,6 +68,7 @@ <module>camel-jing</module> <module>camel-jms</module> <module>camel-josql</module> + <module>camel-jasypt</module> <module>camel-jcr</module> <module>camel-jpa</module> <module>camel-jt400</module> Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=992593&r1=992592&r2=992593&view=diff ============================================================================== --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Sat Sep 4 13:05:45 2010 @@ -78,9 +78,11 @@ <httpcore4-version>4.0.1</httpcore4-version> <httpclient4-version>4.0.1</httpclient4-version> <httpclient-version>3.1</httpclient-version> + <icu4j-version>4.0.1</icu4j-version> <jackson-version>1.5.4</jackson-version> <jain-api-version>1.2</jain-api-version> <jain-sip-version>1.2.153</jain-sip-version> + <jasypt-version>1.6</jasypt-version> <javassist-version>3.9.0.GA</javassist-version> <javax-mail-version>1.4.3</javax-mail-version> <jaxb-version>2.1.13</jaxb-version>