svn commit: r1053000 - in /cxf/branches/2.3.x-fixes: ./ distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java

[ningjiang]

Author: ningjiang
Date: Mon Dec 27 05:30:26 2010
New Revision: 1053000

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

........
  r1052996 | ningjiang | 2010-12-27 13:10:46 +0800 (Mon, 27 Dec 2010) | 1 line
  
  CXF-3220 let the java_first_jms can run without jaxws API, also put the 
activemq-data into target directory
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 27 05:30:26 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052993-1052994
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052993-1052994,1052996

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java?rev=1053000&r1=1052999&r2=1053000&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
 Mon Dec 27 05:30:26 2010
@@ -48,12 +48,10 @@ public final class ServerJMS {
         for (String arg : args) {
             if ("-activemqbroker".equals(arg)) {
                 launchAmqBroker = true;
-            } else if ("-jaxws".equals(arg)) {
+            } 
+            if ("-jaxws".equals(arg)) {
                 jaxws = true;
-            } else {
-                System.err.println("Invalid argument " + arg);
-                return;
-            }
+            } 
         }
 
         if (launchAmqBroker) {
@@ -70,6 +68,8 @@ public final class ServerJMS {
             Object broker = brokerClass.newInstance();
             Method addConnectorMethod = brokerClass.getMethod("addConnector", 
String.class);
             addConnectorMethod.invoke(broker, "tcp://localhost:61616");
+            Method setDataDirectory = 
brokerClass.getMethod("setDataDirectory", String.class);
+            setDataDirectory.invoke(broker, "target/activemq-data");
             Method startMethod = brokerClass.getMethod("start");
             startMethod.invoke(broker);
         }