You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2011/04/14 07:59:18 UTC
svn commit: r1092013 - in /servicemix/components/trunk: bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ bindings/servicemix-http/src/main/java/org/apache/servicemix/http/ bindings/servicemix-jms/src/main/java/org/apache/servicemix...

Author: lhein
Date: Thu Apr 14 05:59:17 2011
New Revision: 1092013

URL: http://svn.apache.org/viewvc?rev=1092013&view=rev
Log:
SM-1206 - ClientFactory JNDI bind fails in non-standalone ServiceMix installs

Modified:
    servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConfiguration.java
    servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfiguration.java
    servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfiguration.java
    servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNConfiguration.java

Modified: servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConfiguration.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConfiguration.java?rev=1092013&r1=1092012&r2=1092013&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConfiguration.java (original)
+++ servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConfiguration.java Thu Apr 14 05:59:17 2011
@@ -36,7 +36,7 @@ public class CxfBcConfiguration {
     /**
      * The JNDI name of the AuthenticationService object
      */
-    private String authenticationServiceName = "java:comp/env/smx/AuthenticationService";
+    private String authenticationServiceName = "org/apache/servicemix/AuthenticationService";
     
     
     /**

Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfiguration.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfiguration.java?rev=1092013&r1=1092012&r2=1092013&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfiguration.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfiguration.java Thu Apr 14 05:59:17 2011
@@ -50,12 +50,12 @@ public class HttpConfiguration implement
     /**
      * The JNDI name of the AuthenticationService object
      */
-    private String authenticationServiceName = "java:comp/env/smx/AuthenticationService";
+    private String authenticationServiceName = "org/apache/servicemix/AuthenticationService";
 
     /**
      * The JNDI name of the KeystoreManager object
      */
-    private String keystoreManagerName = "java:comp/env/smx/KeystoreManager";
+    private String keystoreManagerName = "org/apache/servicemix/KeystoreManager";
 
     /**
      * The maximum number of threads for the Jetty thread pool. It's set to 255

Modified: servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfiguration.java?rev=1092013&r1=1092012&r2=1092013&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfiguration.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfiguration.java Thu Apr 14 05:59:17 2011
@@ -51,12 +51,12 @@ public class JmsConfiguration implements
     /**
      * The JNDI name of the AuthenticationService object
      */
-    private String authenticationServiceName = "java:comp/env/smx/AuthenticationService";
+    private String authenticationServiceName = "org/apache/servicemix/AuthenticationService";
     
     /**
      * The JNDI name of the KeystoreManager object
      */
-    private String keystoreManagerName = "java:comp/env/smx/KeystoreManager";
+    private String keystoreManagerName = "org/apache/servicemix/KeystoreManager";
 
     
     /**

Modified: servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNConfiguration.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNConfiguration.java?rev=1092013&r1=1092012&r2=1092013&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNConfiguration.java (original)
+++ servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNConfiguration.java Thu Apr 14 05:59:17 2011
@@ -24,7 +24,7 @@ public class WSNConfiguration extends Pe
 
     private String jndiProviderURL;
 
-    private String jndiConnectionFactoryName = "java:comp/env/jms/wsnotificationCF";
+    private String jndiConnectionFactoryName = "org/apache/servicemix/jms/wsnotificationCF";
 
     private String brokerName = "Broker";