You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/09/07 09:21:01 UTC
svn commit: r993248 - in /camel/trunk: platforms/karaf/features/
platforms/karaf/features/src/main/resources/
tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/
Author: davsclaus
Date: Tue Sep 7 07:21:00 2010
New Revision: 993248
URL: http://svn.apache.org/viewvc?rev=993248&view=rev
Log:
CAMEL-2987: Added feature for camel-jasypt
Added:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java (with props)
Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=993248&r1=993247&r2=993248&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Sep 7 07:21:00 2010
@@ -46,7 +46,8 @@
<cglib-version>2.1_3_4</cglib-version>
<commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version>
<commons-csv-version>1.0-r706899_3</commons-csv-version>
- <commons-codec-bundle-version>1.3_2</commons-codec-bundle-version>
+ <commons-codec-version>1.4</commons-codec-version>
+ <commons-codec-bundle-version>1.3_3</commons-codec-bundle-version>
<commons-httpclient-bundle-version>3.1_4</commons-httpclient-bundle-version>
<commons-io-bundle-version>1.3.2_3</commons-io-bundle-version>
<commons-jxpath-version>1.3</commons-jxpath-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=993248&r1=993247&r2=993248&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml Tue Sep 7 07:21:00 2010
@@ -311,6 +311,13 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-irc/${pom.version}</bundle>
</feature>
+ <feature name='camel-jasypt' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-jasypt/${pom.version}</bundle>
+ <bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle>wrap:mvn:com.ibm.icu/icu4j/${icu4j-version}</bundle>
+ </feature>
<feature name='camel-jaxb' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jaxb/${pom.version}</bundle>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=993248&r1=993247&r2=993248&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue Sep 7 07:21:00 2010
@@ -313,6 +313,13 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jackson/${pom.version}</bundle>
</feature>
+ <feature name='camel-jasypt' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-jasypt/${pom.version}</bundle>
+ <bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle>wrap:mvn:com.ibm.icu/icu4j/${icu4j-version}</bundle>
+ </feature>
<feature name='camel-jaxb' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jaxb/${pom.version}</bundle>
Added: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java?rev=993248&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java (added)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java Tue Sep 7 07:21:00 2010
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+
+@RunWith(JUnit4TestRunner.class)
+public class CamelJasyptTest extends AbstractFeatureTest {
+
+ public static final String COMPONENT = extractName(CamelJasyptTest.class);
+
+ @Test
+ public void test() throws Exception {
+ // TODO: how to actually test ?
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}
\ No newline at end of file
Propchange: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date