camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r758541 - in /camel/branches/camel-1.x: ./ components/camel-spring/src/main/java/org/apache/camel/spring/Main.java components/camel-xmpp/src/test/resources/
Date Thu, 26 Mar 2009 07:41:47 GMT
Author: ningjiang
Date: Thu Mar 26 07:41:45 2009
New Revision: 758541

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

........
  r758539 | ningjiang | 2009-03-26 15:28:14 +0800 (Thu, 26 Mar 2009) | 1 line
  
  CAMEL-1490 Made Spring Main instance easy for extension
........

Modified:
    camel/branches/camel-1.x/   (props changed)
    camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
    camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/   (props changed)

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 26 07:41:45 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,757636,757693,757743,757865
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,757636,757693,757743,757865,758539

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

Modified: camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java?rev=758541&r1=758540&r2=758541&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
(original)
+++ camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
Thu Mar 26 07:41:45 2009
@@ -41,7 +41,7 @@
  * @version $Revision$
  */
 public class Main extends MainSupport {
-    private static Main instance;
+    protected static Main instance;
 
     private String applicationContextUri = "META-INF/spring/*.xml";
     private String fileApplicationContextUri;
@@ -89,8 +89,7 @@
             }
         }
     }
-
-
+    
     public static void main(String... args) {
         Main main = new Main();
         instance = main;

Propchange: camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 26 07:41:45 2009
@@ -1 +1 @@
-/camel/trunk/components/camel-xmpp/src/test/resources:757693,757743,757865
+/camel/trunk/components/camel-xmpp/src/test/resources:757693,757743,757865,758539



Mime
View raw message