camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1362958 [2/2] - in /camel/trunk: apache-camel/ apache-camel/src/main/descriptors/ components/ components/camel-cmis/ components/camel-cmis/src/ components/camel-cmis/src/main/ components/camel-cmis/src/main/java/ components/camel-cmis/src/...
Date Wed, 18 Jul 2012 14:11:36 GMT
Added: camel/trunk/components/camel-cmis/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cmis/src/test/resources/log4j.properties?rev=1362958&view=auto
==============================================================================
--- camel/trunk/components/camel-cmis/src/test/resources/log4j.properties (added)
+++ camel/trunk/components/camel-cmis/src/test/resources/log4j.properties Wed Jul 18 14:11:35
2012
@@ -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 during tests..
+#
+log4j.rootLogger=INFO, file
+
+log4j.logger.org.apache.camel.impl.converter=WARN
+log4j.logger.org.apache.camel.component.cxf=INFO
+
+# 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=%d [%-35.35t] %-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-cmis-test.log
+log4j.appender.file.append=true

Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1362958&r1=1362957&r2=1362958&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Wed Jul 18 14:11:35 2012
@@ -65,6 +65,7 @@
     <module>camel-cache</module>
     <module>camel-castor</module>
     <module>camel-cdi</module>
+    <module>camel-cmis</module>
     <module>camel-cometd</module>
     <module>camel-context</module>
     <module>camel-crypto</module>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1362958&r1=1362957&r2=1362958&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jul 18 14:11:35 2012
@@ -49,6 +49,7 @@
     <beanio-version>2.0.1</beanio-version>
     <bouncycastle-version>1.46</bouncycastle-version>
     <castor-bundle-version>1.3.1_2</castor-bundle-version>
+    <cmis-version>0.7.0</cmis-version>
     <cometd-bayeux-version>6.1.11</cometd-bayeux-version>
     <cometd-java-server>2.3.1</cometd-java-server>
     <commons-codec-version>1.6</commons-codec-version>
@@ -328,6 +329,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-cmis</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-cometd</artifactId>
         <version>${project.version}</version>
       </dependency>

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1362958&r1=1362957&r2=1362958&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Jul 18 14:11:35 2012
@@ -43,6 +43,7 @@
       <bcel-bundle-version>5.2_4</bcel-bundle-version>
       <bcpg-jdk16-bundle-version>1.46_2</bcpg-jdk16-bundle-version>
       <cglib-version>2.1_3_7</cglib-version>
+      <cmis-bundle-version>0.7.0</cmis-bundle-version>
       <cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
       <commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
       <commons-csv-version>1.0-r706900_3</commons-csv-version>

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=1362958&r1=1362957&r2=1362958&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Jul 18 14:11:35
2012
@@ -104,6 +104,13 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.castor/${castor-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-castor/${project.version}</bundle>
   </feature>
+  <!-- camel-cmis doesn't work yet -->
+  <!--feature name='camel-cmis' version='${project.version}' resolver='(obr)' start-level='50'>
+    <feature version='${project.version}'>camel-core</feature>
+    <feature version='${cxf-version-range}'>cxf-specs</feature>
+    <bundle dependency='true'>mvn:org.apache.chemistry.opencmis/chemistry-opencmis-osgi-client/${cmis-bundle-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-cmis/${project.version}</bundle>
+  </feature-->
   <feature name='camel-crypto' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>



Mime
View raw message