Author: indika
Date: Thu Aug 30 03:45:52 2007
New Revision: 571110
URL: http://svn.apache.org/viewvc?rev=571110&view=rev
Log:
fixed a bug which has occured when use synapse-daemon script in solaris OS
some minor improvements
Added:
webservices/synapse/trunk/java/src/main/bin/native/
webservices/synapse/trunk/java/src/main/bin/native/wrapper-linux-x86-32
(contents, props changed)
- copied, changed from r570689,
webservices/synapse/trunk/java/src/main/bin/wrapper
webservices/synapse/trunk/java/src/main/bin/native/wrapper-windows-x86-32.exe
(contents, props changed)
- copied, changed from r570689,
webservices/synapse/trunk/java/src/main/bin/wrapper.exe
Removed:
webservices/synapse/trunk/java/src/main/bin/wrapper
webservices/synapse/trunk/java/src/main/bin/wrapper.exe
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Entry.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
webservices/synapse/trunk/java/repository/conf/wrapper.conf
webservices/synapse/trunk/java/src/main/assembly/bin.xml
webservices/synapse/trunk/java/src/main/bin/install-synapse-service.bat
webservices/synapse/trunk/java/src/main/bin/synapse-daemon.sh
webservices/synapse/trunk/java/src/main/bin/uninstall-synapse-service.bat
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Entry.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Entry.java?rev=571110&r1=571109&r2=571110&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Entry.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Entry.java
Thu Aug 30 03:45:52 2007
@@ -19,9 +19,9 @@
package org.apache.synapse.config;
-import org.apache.synapse.SynapseException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.SynapseException;
import java.net.URL;
@@ -76,10 +76,11 @@
}
public void setType(int type) {
- if (type <= 4 && type >= 0)
+ if (type <= 4 && type >= 0) {
this.type = type;
- else
+ } else {
handleException("Invalid entry type for the static entry");
+ }
}
public URL getSrc() {
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=571110&r1=571109&r2=571110&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
Thu Aug 30 03:45:52 2007
@@ -251,11 +251,18 @@
if (o != null && o instanceof Entry) {
Entry entry = (Entry) o;
if (entry.isDynamic()) {
- if (entry.isCached() && !entry.isExpired()) {
- return entry.getValue();
- } else if (registry != null) {
- o = registry.getResource(entry);
- }
+ if (entry.isCached() && !entry.isExpired()) {
+ return entry.getValue();
+ } else if (registry != null) {
+ o = registry.getResource(entry);
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("Will not evaluate the value of the remote
entry, because" +
+ " the registry is not available");
+ }
+ return null; // otherwise will return an entry with a
value null
+ // (method expects return a value not an entry )
+ }
} else {
return entry.getValue();
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java?rev=571110&r1=571109&r2=571110&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
Thu Aug 30 03:45:52 2007
@@ -19,28 +19,28 @@
package org.apache.synapse.core.axis2;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.llom.OMElementImpl;
+import org.apache.axiom.om.impl.llom.OMTextImpl;
+import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.axiom.om.impl.llom.OMTextImpl;
-import org.apache.axiom.om.impl.llom.OMElementImpl;
-import org.apache.axiom.om.OMElement;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.synapse.*;
-import org.apache.synapse.mediators.GetPropertyFunction;
-import org.apache.synapse.mediators.MediatorFaultHandler;
-import org.apache.synapse.endpoints.Endpoint;
-import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.Entry;
+import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.mediators.GetPropertyFunction;
+import org.apache.synapse.mediators.MediatorFaultHandler;
+import org.jaxen.JaxenException;
import org.jaxen.SimpleFunctionContext;
import org.jaxen.XPathFunctionContext;
-import org.jaxen.JaxenException;
import java.util.*;
@@ -399,10 +399,11 @@
}
StringBuffer textValue = new StringBuffer();
if (result instanceof List) {
- Iterator iter = ((List) result).iterator();
+ List list = (List) result;
+ Iterator iter = list.iterator();
while (iter.hasNext()) {
Object o = iter.next();
- if (o == null) {
+ if (o == null && list.size() == 1) {
return null;
}
if (o instanceof OMTextImpl) {
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java?rev=571110&r1=571109&r2=571110&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
Thu Aug 30 03:45:52 2007
@@ -57,8 +57,8 @@
* Returns the string value of the property which is get from the
corresponding context to the provided scope .
* The default scope is used to get property from the synapse message
context
*
- * @param context
- * @param args
+ * @param context the context at the point in the expression when the
function is called
+ * @param args arguments of the functions
* @return The string value of a property
* @throws FunctionCallException
*/
@@ -93,9 +93,9 @@
/**
* Returns the string value of the property using arg. one as key and arg.
two as scope
*
- * @param scopeObject
- * @param keyObject
- * @param navigator
+ * @param scopeObject scope will decide from where property will pick
(axis2,transport,default(synapse))
+ * @param keyObject the key of the property
+ * @param navigator obect model which can navigating around
* @return The String value of property using arg. one as key and arg. two
as scope
*/
public Object evaluate(Object scopeObject, Object keyObject, Navigator
navigator) {
Modified: webservices/synapse/trunk/java/repository/conf/wrapper.conf
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/wrapper.conf?rev=571110&r1=571109&r2=571110&view=diff
==============================================================================
--- webservices/synapse/trunk/java/repository/conf/wrapper.conf (original)
+++ webservices/synapse/trunk/java/repository/conf/wrapper.conf Thu Aug 30
03:45:52 2007
@@ -13,22 +13,22 @@
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=%CLASSPATH%
-wrapper.java.classpath.2=./lib/wrapper.jar
-wrapper.java.classpath.3=./lib
-wrapper.java.classpath.4=./lib/*.jar
+wrapper.java.classpath.2=../../lib/wrapper.jar
+wrapper.java.classpath.3=../../lib
+wrapper.java.classpath.4=../../lib/*.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
-wrapper.java.library.path.1=./lib
+wrapper.java.library.path.1=../../lib
# Java Additional Parameters
-wrapper.java.additional.1=-Dsynapse.xml=./repository/conf/synapse.xml
-wrapper.java.additional.2=-Daxis2.xml=./repository/conf/axis2.xml
-wrapper.java.additional.3=-Daxis2.repo=./repository
-wrapper.java.additional.4=-Djava.endorsed.dirs=./lib/endorsed
-wrapper.java.additional.5=-Dsynapse.home=.
+wrapper.java.additional.1=-Dsynapse.xml=../../repository/conf/synapse.xml
+wrapper.java.additional.2=-Daxis2.xml=../../repository/conf/axis2.xml
+wrapper.java.additional.3=-Daxis2.repo=../../repository
+wrapper.java.additional.4=-Djava.endorsed.dirs=../../lib/endorsed
+wrapper.java.additional.5=-Dsynapse.home=../..
wrapper.java.additional.6=-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration
-wrapper.java.additional.7=-Dlog4j.configuration=file:./lib/log4j.properties
+wrapper.java.additional.7=-Dlog4j.configuration=file:../../lib/log4j.properties
# Initial Java Heap Size (in MB)
#wrapper.java.initmemory=3
@@ -38,8 +38,7 @@
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=org.apache.synapse.SynapseServer
-wrapper.app.parameter.2=./repository
-#wrapper.app.parameter.3=-sample=8
+wrapper.app.parameter.2=../../repository
#********************************************************************
# Wrapper Logging Properties
@@ -51,7 +50,7 @@
wrapper.console.loglevel=INFO
# Log file to use for wrapper output logging.
-wrapper.logfile=./logs/wrapper.log
+wrapper.logfile=../../logs/wrapper.log
# Format of output for the log file. (See docs for formats)
wrapper.logfile.format=LPTM
@@ -103,4 +102,3 @@
# Allow the service to interact with the desktop.
wrapper.ntservice.interactive=false
-
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?rev=571110&r1=571109&r2=571110&view=diff
==============================================================================
--- webservices/synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ webservices/synapse/trunk/java/src/main/assembly/bin.xml Thu Aug 30
03:45:52 2007
@@ -119,12 +119,9 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/bin</directory>
- <outputDirectory>synapse-${synapse.version}</outputDirectory>
- <includes>
- <include>wrapper.exe</include>
- <include>wrapper</include>
- </includes>
+ <directory>src/main/bin/native</directory>
+
<outputDirectory>synapse-${synapse.version}/bin/native</outputDirectory>
+ <fileMode>755</fileMode>
</fileSet>
<fileSet>
<directory>src/site/resources</directory>
Modified:
webservices/synapse/trunk/java/src/main/bin/install-synapse-service.bat
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/bin/install-synapse-service.bat?rev=571110&r1=571109&r2=571110&view=diff
==============================================================================
--- webservices/synapse/trunk/java/src/main/bin/install-synapse-service.bat
(original)
+++ webservices/synapse/trunk/java/src/main/bin/install-synapse-service.bat Thu
Aug 30 03:45:52 2007
@@ -19,16 +19,17 @@
rem Decide on the wrapper binary.
set _WRAPPER_BASE=wrapper
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+set _WRAPPER_DIR=%_REALPATH%bin\native\
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%.exe
if exist "%_WRAPPER_EXE%" goto conf
echo Unable to locate a Wrapper executable using any of the following names:
-echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-echo %_REALPATH%%_WRAPPER_BASE%.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%.exe
pause
goto :eof
Copied: webservices/synapse/trunk/java/src/main/bin/native/wrapper-linux-x86-32
(from r570689, webservices/synapse/trunk/java/src/main/bin/wrapper)
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/bin/native/wrapper-linux-x86-32?p2=webservices/synapse/trunk/java/src/main/bin/native/wrapper-linux-x86-32&p1=webservices/synapse/trunk/java/src/main/bin/wrapper&r1=570689&r2=571110&rev=571110&view=diff
==============================================================================
Binary files - no diff available.
Propchange:
webservices/synapse/trunk/java/src/main/bin/native/wrapper-linux-x86-32
------------------------------------------------------------------------------
svn:executable = *
Propchange:
webservices/synapse/trunk/java/src/main/bin/native/wrapper-linux-x86-32
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Copied:
webservices/synapse/trunk/java/src/main/bin/native/wrapper-windows-x86-32.exe
(from r570689, webservices/synapse/trunk/java/src/main/bin/wrapper.exe)
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/bin/native/wrapper-windows-x86-32.exe?p2=webservices/synapse/trunk/java/src/main/bin/native/wrapper-windows-x86-32.exe&p1=webservices/synapse/trunk/java/src/main/bin/wrapper.exe&r1=570689&r2=571110&rev=571110&view=diff
==============================================================================
Binary files - no diff available.
Propchange:
webservices/synapse/trunk/java/src/main/bin/native/wrapper-windows-x86-32.exe
------------------------------------------------------------------------------
svn:executable = *
Propchange:
webservices/synapse/trunk/java/src/main/bin/native/wrapper-windows-x86-32.exe
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: webservices/synapse/trunk/java/src/main/bin/synapse-daemon.sh
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/bin/synapse-daemon.sh?rev=571110&r1=571109&r2=571110&view=diff
==============================================================================
--- webservices/synapse/trunk/java/src/main/bin/synapse-daemon.sh (original)
+++ webservices/synapse/trunk/java/src/main/bin/synapse-daemon.sh Thu Aug 30
03:45:52 2007
@@ -15,7 +15,7 @@
APP_LONG_NAME="Apache Synapse (Synapse)"
# Wrapper
-WRAPPER_CMD="./wrapper"
+WRAPPER_CMD="./bin/native/wrapper"
WRAPPER_CONF="./repository/conf/wrapper.conf"
# Priority at which to run the wrapper. See "man nice" for valid priorities.
Modified:
webservices/synapse/trunk/java/src/main/bin/uninstall-synapse-service.bat
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/bin/uninstall-synapse-service.bat?rev=571110&r1=571109&r2=571110&view=diff
==============================================================================
--- webservices/synapse/trunk/java/src/main/bin/uninstall-synapse-service.bat
(original)
+++ webservices/synapse/trunk/java/src/main/bin/uninstall-synapse-service.bat
Thu Aug 30 03:45:52 2007
@@ -19,16 +19,17 @@
rem Decide on the wrapper binary.
set _WRAPPER_BASE=wrapper
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+set _WRAPPER_DIR=%_REALPATH%bin\native\
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%.exe
if exist "%_WRAPPER_EXE%" goto conf
echo Unable to locate a Wrapper executable using any of the following names:
-echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-echo %_REALPATH%%_WRAPPER_BASE%.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%.exe
pause
goto :eof
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
