Author: hiranya
Date: Tue Oct 5 18:05:56 2010
New Revision: 1004747
URL: http://svn.apache.org/viewvc?rev=1004747&view=rev
Log:
Refactoring
Modified:
synapse/branches/2.0/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AbstractEvaluatorSerializer.java
synapse/branches/2.0/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAQueue.java
synapse/branches/2.0/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAQueueProducer.java
synapse/branches/2.0/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
synapse/branches/2.0/modules/securevault/src/main/java/org/apache/synapse/securevault/definition/KeyStoreInformation.java
synapse/branches/2.0/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java
Modified:
synapse/branches/2.0/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AbstractEvaluatorSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AbstractEvaluatorSerializer.java?rev=1004747&r1=1004746&r2=1004747&view=diff
==============================================================================
---
synapse/branches/2.0/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AbstractEvaluatorSerializer.java
(original)
+++
synapse/branches/2.0/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AbstractEvaluatorSerializer.java
Tue Oct 5 18:05:56 2010
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
*/
public abstract class AbstractEvaluatorSerializer implements
EvaluatorSerializer {
- protected static Log log;
+ protected Log log;
protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
Modified:
synapse/branches/2.0/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAQueue.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAQueue.java?rev=1004747&r1=1004746&r2=1004747&view=diff
==============================================================================
---
synapse/branches/2.0/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAQueue.java
(original)
+++
synapse/branches/2.0/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAQueue.java
Tue Oct 5 18:05:56 2010
@@ -72,4 +72,8 @@ public class SEDAQueue {
public void setInitialized(boolean initialized) {
this.initialized = initialized;
}
+
+ public SEDAQueuePolicy getQueuePolicy() {
+ return queuePolicy;
+ }
}
Modified:
synapse/branches/2.0/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAQueueProducer.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAQueueProducer.java?rev=1004747&r1=1004746&r2=1004747&view=diff
==============================================================================
---
synapse/branches/2.0/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAQueueProducer.java
(original)
+++
synapse/branches/2.0/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAQueueProducer.java
Tue Oct 5 18:05:56 2010
@@ -48,7 +48,9 @@ public class SEDAQueueProducer {
} else if (SEDAQueueProducerPolicy.OFFER.equals(action)) {
long timeout = queueProducerPolicy.getTimeoutOnInsert();
if (timeout < 0) {
- queue.offer(messageContext);
+ if (!queue.offer(messageContext)) {
+ log.warn("Error while offering the message to the queue");
+ }
} else {
try {
queue.offer(messageContext, timeout,
TimeUnit.MILLISECONDS);
Modified:
synapse/branches/2.0/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java?rev=1004747&r1=1004746&r2=1004747&view=diff
==============================================================================
---
synapse/branches/2.0/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
(original)
+++
synapse/branches/2.0/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
Tue Oct 5 18:05:56 2010
@@ -211,8 +211,7 @@ public class ScriptMediator extends Abst
returnValue = false;
} catch (NoSuchMethodException e) {
handleException("The script engine returned a
NoSuchMethodException executing the " +
- (key == null ? "inlined " : "external ") + language + "
script" +
- (key != null ? " : " + key : "") +
+ "external " + language + " script" + " : " + key +
(function != null ? " function " + function : ""), e,
synCtx);
returnValue = false;
}
@@ -231,7 +230,7 @@ public class ScriptMediator extends Abst
throws ScriptException, NoSuchMethodException {
prepareExternalScript(synCtx);
ScriptMessageContext scriptMC = new ScriptMessageContext(synCtx,
xmlHelper);
- return invocableScript.invokeFunction(function, new
Object[]{scriptMC});
+ return invocableScript.invokeFunction(function, scriptMC);
}
/**
Modified:
synapse/branches/2.0/modules/securevault/src/main/java/org/apache/synapse/securevault/definition/KeyStoreInformation.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/securevault/src/main/java/org/apache/synapse/securevault/definition/KeyStoreInformation.java?rev=1004747&r1=1004746&r2=1004747&view=diff
==============================================================================
---
synapse/branches/2.0/modules/securevault/src/main/java/org/apache/synapse/securevault/definition/KeyStoreInformation.java
(original)
+++
synapse/branches/2.0/modules/securevault/src/main/java/org/apache/synapse/securevault/definition/KeyStoreInformation.java
Tue Oct 5 18:05:56 2010
@@ -94,6 +94,10 @@ public abstract class KeyStoreInformatio
this.location = location;
}
+ public String getProvider() {
+ return provider;
+ }
+
public void setProvider(String provider) {
this.provider = provider;
}
Modified:
synapse/branches/2.0/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java?rev=1004747&r1=1004746&r2=1004747&view=diff
==============================================================================
---
synapse/branches/2.0/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java
(original)
+++
synapse/branches/2.0/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java
Tue Oct 5 18:05:56 2010
@@ -191,6 +191,7 @@ public abstract class AbstractXarMojo ex
throws ArchiverException, MojoExecutionException {
Log log = getLog();
+ log.debug("Using base directory: " + baseDir);
archiver.addDirectory(buildOutputDirectory);
if (includeDependencies) {
log.debug("Adding dependencies ...");
