camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmuel...@apache.org
Subject svn commit: r1226562 - in /camel/branches/camel-2.7.x: components/camel-cxf/src/main/resources/META-INF/cxf/cxf.extension examples/camel-example-reportincident-ws-security-osgi/pom.xml pom.xml
Date Mon, 02 Jan 2012 22:36:19 GMT
Author: cmueller
Date: Mon Jan  2 22:36:19 2012
New Revision: 1226562

URL: http://svn.apache.org/viewvc?rev=1226562&view=rev
Log:
fixed one failed unit test

Modified:
    camel/branches/camel-2.7.x/components/camel-cxf/src/main/resources/META-INF/cxf/cxf.extension
    camel/branches/camel-2.7.x/examples/camel-example-reportincident-ws-security-osgi/pom.xml
    camel/branches/camel-2.7.x/pom.xml

Modified: camel/branches/camel-2.7.x/components/camel-cxf/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cxf/src/main/resources/META-INF/cxf/cxf.extension?rev=1226562&r1=1226561&r2=1226562&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-cxf/src/main/resources/META-INF/cxf/cxf.extension
(original)
+++ camel/branches/camel-2.7.x/components/camel-cxf/src/main/resources/META-INF/cxf/cxf.extension
Mon Jan  2 22:36:19 2012
@@ -1,17 +1 @@
-#
-# 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.
-#
 META-INF/cxf/camel/cxf-extension-camel.xml
\ No newline at end of file

Modified: camel/branches/camel-2.7.x/examples/camel-example-reportincident-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/examples/camel-example-reportincident-ws-security-osgi/pom.xml?rev=1226562&r1=1226561&r2=1226562&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/examples/camel-example-reportincident-ws-security-osgi/pom.xml
(original)
+++ camel/branches/camel-2.7.x/examples/camel-example-reportincident-ws-security-osgi/pom.xml
Mon Jan  2 22:36:19 2012
@@ -105,11 +105,6 @@
 		
 		<!-- ws-security -->
 		<dependency>
-		    <groupId>org.apache.ws.security</groupId>
-		    <artifactId>wss4j</artifactId>
-		    <version>1.5.8</version>
-		</dependency>
-		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-ws-security</artifactId>
 			<version>${cxf-version}</version>

Modified: camel/branches/camel-2.7.x/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/pom.xml?rev=1226562&r1=1226561&r2=1226562&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/pom.xml (original)
+++ camel/branches/camel-2.7.x/pom.xml Mon Jan  2 22:36:19 2012
@@ -480,6 +480,8 @@
             <exclude>.git/**/*</exclude>
             <!-- tooling/camel-manual/src/styles/print.css use a different license -->
             <exclude>**/src/styles/print.css</exclude>
+            <!-- cxf does not handle comments here -->
+            <excludes>**/src/main/resources/META-INF/cxf/cxf.extension</excludes>
             <!-- generated files -->
             <exclude>**/target/**/*</exclude>
             <exclude>**/eclipse-classes/**/*</exclude>



Mime
View raw message