You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/09/13 10:54:46 UTC
svn commit: r1384240 - in /camel/branches/camel-2.10.x: ./ components/camel-apns/src/main/resources/ components/camel-apns/src/main/resources/META-INF/ components/camel-hbase/src/main/resources/META-INF/ components/camel-jsch/src/main/resources/META-IN...

Author: ningjiang
Date: Thu Sep 13 08:54:45 2012
New Revision: 1384240

URL: http://svn.apache.org/viewvc?rev=1384240&view=rev
Log:
Merged revisions 1384226 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1384226 | ningjiang | 2012-09-13 16:10:06 +0800 (Thu, 13 Sep 2012) | 1 line
  
  CAMEL-5602 Fixed the license file issue of camel artifacts
........

Added:
    camel/branches/camel-2.10.x/components/camel-apns/src/main/resources/META-INF/LICENSE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-apns/src/main/resources/META-INF/LICENSE.txt
    camel/branches/camel-2.10.x/components/camel-apns/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-apns/src/main/resources/META-INF/NOTICE.txt
    camel/branches/camel-2.10.x/components/camel-hbase/src/main/resources/META-INF/LICENSE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-hbase/src/main/resources/META-INF/LICENSE.txt
    camel/branches/camel-2.10.x/components/camel-hbase/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-hbase/src/main/resources/META-INF/NOTICE.txt
    camel/branches/camel-2.10.x/components/camel-jsch/src/main/resources/META-INF/LICENSE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-jsch/src/main/resources/META-INF/LICENSE.txt
    camel/branches/camel-2.10.x/components/camel-jsch/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-jsch/src/main/resources/META-INF/NOTICE.txt
    camel/branches/camel-2.10.x/components/camel-mongodb/src/main/resources/META-INF/LICENSE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-mongodb/src/main/resources/META-INF/LICENSE.txt
    camel/branches/camel-2.10.x/components/camel-mongodb/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-mongodb/src/main/resources/META-INF/NOTICE.txt
    camel/branches/camel-2.10.x/components/camel-ssh/src/main/resources/META-INF/LICENSE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-ssh/src/main/resources/META-INF/LICENSE.txt
    camel/branches/camel-2.10.x/components/camel-ssh/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-ssh/src/main/resources/META-INF/NOTICE.txt
    camel/branches/camel-2.10.x/components/camel-stax/src/main/resources/META-INF/LICENSE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-stax/src/main/resources/META-INF/LICENSE.txt
    camel/branches/camel-2.10.x/components/camel-stax/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-stax/src/main/resources/META-INF/NOTICE.txt
    camel/branches/camel-2.10.x/components/camel-websocket/src/main/resources/META-INF/LICENSE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-websocket/src/main/resources/META-INF/LICENSE.txt
    camel/branches/camel-2.10.x/components/camel-websocket/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-websocket/src/main/resources/META-INF/NOTICE.txt
    camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/resources/META-INF/LICENSE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-zookeeper/src/main/resources/META-INF/LICENSE.txt
    camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r1384226, camel/trunk/components/camel-zookeeper/src/main/resources/META-INF/NOTICE.txt
    camel/branches/camel-2.10.x/examples/camel-example-twitter-websocket/src/main/resources/META-INF/
      - copied from r1384226, camel/trunk/examples/camel-example-twitter-websocket/src/main/resources/META-INF/
    camel/branches/camel-2.10.x/examples/camel-example-twitter-websocket/src/main/resources/META-INF/LICENSE.txt
      - copied unchanged from r1384226, camel/trunk/examples/camel-example-twitter-websocket/src/main/resources/META-INF/LICENSE.txt
    camel/branches/camel-2.10.x/examples/camel-example-twitter-websocket/src/main/resources/META-INF/NOTICE.txt
      - copied unchanged from r1384226, camel/trunk/examples/camel-example-twitter-websocket/src/main/resources/META-INF/NOTICE.txt
Removed:
    camel/branches/camel-2.10.x/components/camel-apns/src/main/resources/LICENSE.txt
    camel/branches/camel-2.10.x/components/camel-apns/src/main/resources/NOTICE.txt
    camel/branches/camel-2.10.x/components/camel-mongodb/src/main/resources/LICENSE.txt
    camel/branches/camel-2.10.x/components/camel-mongodb/src/main/resources/NOTICE.txt
Modified:
    camel/branches/camel-2.10.x/   (props changed)

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1384226

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.