Author: asankha
Date: Mon Feb 5 21:38:55 2007
New Revision: 503995
URL: http://svn.apache.org/viewvc?view=rev&rev=503995
Log:
set execute permissions for shell scripts alone
use ip address in place of host name where hostname cannot be found for logging
purposes
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
webservices/synapse/trunk/java/src/main/assembly/bin.xml
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java?view=diff&rev=503995&r1=503994&r2=503995
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
Mon Feb 5 21:38:55 2007
@@ -58,11 +58,15 @@
if (addr != null) {
// Get IP Address
String ipAddr = addr.getHostAddress();
- if (ipAddr != null)
+ if (ipAddr != null) {
MDC.put("ip", ipAddr);
+ }
// Get hostname
String hostname = addr.getHostName();
+ if (hostname == null) {
+ hostname = ipAddr;
+ }
MDC.put("host", hostname);
}
Modified: webservices/synapse/trunk/java/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/assembly/bin.xml?view=diff&rev=503995&r1=503994&r2=503995
==============================================================================
--- webservices/synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ webservices/synapse/trunk/java/src/main/assembly/bin.xml Mon Feb 5
21:38:55 2007
@@ -38,9 +38,19 @@
<fileSet>
<directory>src/main/bin</directory>
<outputDirectory>synapse-${synapse.version}/bin</outputDirectory>
+ <includes>
+ <include>synapse.sh</include>
+ </includes>
<fileMode>755</fileMode>
</fileSet>
<fileSet>
+ <directory>src/main/bin</directory>
+ <outputDirectory>synapse-${synapse.version}/bin</outputDirectory>
+ <includes>
+ <include>synapse.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>repository</directory>
<outputDirectory>synapse-${synapse.version}/repository</outputDirectory>
</fileSet>
@@ -123,9 +133,15 @@
<outputDirectory>synapse-${synapse.version}/samples/axis2Server</outputDirectory>
<includes>
<include>axis2server.sh</include>
- <include>axis2server.bat</include>
</includes>
<fileMode>755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>modules/samples/src/main/scripts</directory>
+
<outputDirectory>synapse-${synapse.version}/samples/axis2Server</outputDirectory>
+ <includes>
+ <include>axis2server.bat</include>
+ </includes>
</fileSet>
<!--<fileSet>-->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
