Author: davsclaus
Date: Sat Feb 16 10:42:29 2013
New Revision: 1446869
URL: http://svn.apache.org/r1446869
Log:
CAMEL-6061: Added camel-zipfile to kit and features
Added:
camel/trunk/components/camel-zipfile/src/test/resources/log4j.properties
(with props)
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java
- copied, changed from r1446865,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
Modified:
camel/trunk/apache-camel/pom.xml
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/apache-camel/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1446869&r1=1446868&r2=1446869&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Sat Feb 16 10:42:29 2013
@@ -588,6 +588,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-zipfile</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-zookeeper</artifactId>
</dependency>
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1446869&r1=1446868&r2=1446869&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Sat Feb 16
10:42:29 2013
@@ -159,6 +159,7 @@
<include>org.apache.camel:camel-xmlsecurity</include>
<include>org.apache.camel:camel-xmpp</include>
<include>org.apache.camel:camel-xstream</include>
+ <include>org.apache.camel:camel-zipfile</include>
<include>org.apache.camel:camel-zookeeper</include>
<include>org.apache.camel.karaf:camel-karaf-commands</include>
<!-- this jar is mandatory -->
Added: camel/trunk/components/camel-zipfile/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-zipfile/src/test/resources/log4j.properties?rev=1446869&view=auto
==============================================================================
--- camel/trunk/components/camel-zipfile/src/test/resources/log4j.properties
(added)
+++ camel/trunk/components/camel-zipfile/src/test/resources/log4j.properties
Sat Feb 16 10:42:29 2013
@@ -0,0 +1,36 @@
+#
+# 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
+#
+log4j.rootLogger=INFO, file
+
+#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel.dataformat.zipfile=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=[%t] %c{1} %-5p %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-zipfile-test.log
+log4j.appender.file.append=true
\ No newline at end of file
Propchange:
camel/trunk/components/camel-zipfile/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-zipfile/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/components/camel-zipfile/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1446869&r1=1446868&r2=1446869&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Feb 16 10:42:29 2013
@@ -1143,6 +1143,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-zipfile</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
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=1446869&r1=1446868&r2=1446869&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat
Feb 16 10:42:29 2013
@@ -1001,6 +1001,10 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-xstream/${project.version}</bundle>
</feature>
+ <feature name='camel-zipfile' version='${project.version}' resolver='(obr)'
start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-zipfile/${project.version}</bundle>
+ </feature>
<feature name='camel-zookeeper' version='${project.version}'
resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
Copied:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java
(from r1446865,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java&r1=1446865&r2=1446869&rev=1446869&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java
Sat Feb 16 10:42:29 2013
@@ -17,7 +17,7 @@
package org.apache.camel.itest.karaf;
import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.BeanioDataFormat;
+import org.apache.camel.model.dataformat.ZipFileDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -25,12 +25,12 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelBeanioTest extends AbstractFeatureTest {
+public class CamelZipfileTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelBeanioTest.class);
+ public static final String COMPONENT = extractName(CamelZipfileTest.class);
protected DataFormatDefinition createDataformatDefinition(String format) {
- return new BeanioDataFormat();
+ return new ZipFileDataFormat();
}
@Test
