You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2008/06/16 15:55:03 UTC
svn commit: r668163 - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/core/axis2/
core/src/main/java/org/apache/synapse/util/
transports/src/main/java/org/apache/synapse/transport/nhttp/util/
Author: indika
Date: Mon Jun 16 06:55:03 2008
New Revision: 668163
URL: http://svn.apache.org/viewvc?rev=668163&view=rev
Log:
Some refactoring
Added:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/ResponseAcceptEncodingProcessor.java
- copied, changed from r668138, synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/util/ResponseAcceptEncodingProcessor.java
Removed:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/util/ResponseAcceptEncodingProcessor.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/DataSourceRegistrar.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java?rev=668163&r1=668162&r2=668163&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java Mon Jun 16 06:55:03 2008
@@ -38,10 +38,10 @@
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.ServerManager;
+import org.apache.synapse.util.ResponseAcceptEncodingProcessor;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.transport.nhttp.NhttpConstants;
-import org.apache.synapse.transport.nhttp.util.ResponseAcceptEncodingProcessor;
import java.util.*;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/DataSourceRegistrar.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/DataSourceRegistrar.java?rev=668163&r1=668162&r2=668163&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/DataSourceRegistrar.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/DataSourceRegistrar.java Mon Jun 16 06:55:03 2008
@@ -137,38 +137,52 @@
props.put(Context.INITIAL_CONTEXT_FACTORY, namingFactory);
jndiEvn.put(Context.INITIAL_CONTEXT_FACTORY, namingFactory);
- String providerHost = "localhost";
- try {
- InetAddress addr = InetAddress.getLocalHost();
- if (addr != null) {
- String hostname = addr.getHostName();
- if (hostname == null) {
- String ipAddr = addr.getHostAddress();
- if (ipAddr != null) {
- providerHost = ipAddr;
+ //Provider URL
+ String providerUrl = getProperty(dsProperties, rootPrefix + PROP_PROVIDER_URL, null);
+
+ if (providerUrl != null && !"".equals(providerUrl)) {
+ if (log.isDebugEnabled()) {
+ log.debug("Using provided initial context provider url :" + providerUrl);
+ }
+
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("No initial context provider url...creaeting a new one");
+ }
+ String providerHost = "localhost";
+ try {
+ InetAddress addr = InetAddress.getLocalHost();
+ if (addr != null) {
+ String hostname = addr.getHostName();
+ if (hostname == null) {
+ String ipAddr = addr.getHostAddress();
+ if (ipAddr != null) {
+ providerHost = ipAddr;
+ }
+ } else {
+ providerHost = hostname;
}
- } else {
- providerHost = hostname;
}
+ } catch (UnknownHostException e) {
+ log.warn("Unable to determine hostname or IP address.. Using localhost", e);
}
- } catch (UnknownHostException e) {
- log.warn("Unable to determine hostname or IP address.. Using localhost", e);
- }
- // default port for RMI registry
- int port = 2199;
- String providerPort =
- getProperty(dsProperties, rootPrefix + PROP_PROVIDER_PORT, String.valueOf(port));
- try {
- port = Integer.parseInt(providerPort);
- } catch (NumberFormatException ignored) {
- }
+ // default port for RMI registry
+ int port = 2199;
+ String providerPort =
+ getProperty(dsProperties, rootPrefix + PROP_PROVIDER_PORT,
+ String.valueOf(port));
+ try {
+ port = Integer.parseInt(providerPort);
+ } catch (NumberFormatException ignored) {
+ }
- // Create a RMI local registry
- RMIRegistryController.getInstance().createLocalRegistry(port);
+ // Create a RMI local registry
+ RMIRegistryController.getInstance().createLocalRegistry(port);
- String providerUrl = getProperty(dsProperties, rootPrefix + PROP_PROVIDER_URL,
- "rmi://" + providerHost + ":" + providerPort);
+ providerUrl = getProperty(dsProperties, rootPrefix + PROP_PROVIDER_URL,
+ "rmi://" + providerHost + ":" + providerPort);
+ }
props.put(Context.PROVIDER_URL, providerUrl);
jndiEvn.put(Context.PROVIDER_URL, providerUrl);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java?rev=668163&r1=668162&r2=668163&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java Mon Jun 16 06:55:03 2008
@@ -34,6 +34,9 @@
*/
public void createLocalRegistry(int port) {
try {
+ if (log.isDebugEnabled()) {
+ log.debug("Creating a RMI registry with port :" + port);
+ }
localRegistry = LocateRegistry.createRegistry(port);
} catch (RemoteException e) {
String msg = "Couldn't create a local registry(RMI) : port " + port +
Copied: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/ResponseAcceptEncodingProcessor.java (from r668138, synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/util/ResponseAcceptEncodingProcessor.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/ResponseAcceptEncodingProcessor.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/ResponseAcceptEncodingProcessor.java&p1=synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/util/ResponseAcceptEncodingProcessor.java&r1=668138&r2=668163&rev=668163&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/util/ResponseAcceptEncodingProcessor.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/ResponseAcceptEncodingProcessor.java Mon Jun 16 06:55:03 2008
@@ -29,7 +29,7 @@
*
*/
-package org.apache.synapse.transport.nhttp.util;
+package org.apache.synapse.util;
import org.apache.axis2.context.MessageContext;
import org.apache.commons.logging.Log;