Skip to content

Commit 5d2b6bc

Browse files
kalaiyarasiganeshalingamkalaiyarasiganeshalingam
authored
Merge branch 'wso2:master' into master
2 parents 1b9f0c5 + 89a471d commit 5d2b6bc

File tree

32 files changed

+47
-36
lines changed

32 files changed

+47
-36
lines changed

‎modules/commons/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.synapse</groupId>
2525
<artifactId>Apache-Synapse</artifactId>
26-
<version>4.0.0-wso2v271-SNAPSHOT</version>
26+
<version>4.0.0-wso2v272-SNAPSHOT</version>
2727
<relativePath>../../pom.xml</relativePath>
2828
</parent>
2929

‎modules/core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.apache.synapse</groupId>
1818
<artifactId>Apache-Synapse</artifactId>
19-
<version>4.0.0-wso2v271-SNAPSHOT</version>
19+
<version>4.0.0-wso2v272-SNAPSHOT</version>
2020
<relativePath>../../pom.xml</relativePath>
2121
</parent>
2222

‎modules/core/src/main/java/org/apache/synapse/util/xpath/ext/XpathExtensionUtil.java‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ public class XpathExtensionUtil {
4949
*/
5050
private static final String SYNAPSE_XPATH_FUNCTION_EXTENSIONS = "synapse.xpath.func.extensions";
5151

52+
/**
53+
* The Synapse property for custom xpath function extensions.
54+
*/
55+
private static final String SYNAPSE_CUSTOM_XPATH_FUNCTION_EXTENSIONS = "synapse.custom.xpath.func.extensions";
56+
5257
private static final Log log = LogFactory.getLog(XpathExtensionUtil.class);
5358

5459
/**
@@ -94,16 +99,22 @@ public static List<SynapseXpathVariableResolver> getRegisteredVariableExtensions
9499

95100
/**
96101
* Get all registered function context extensions. Synapse will look for synapse.properties
97-
* property synapse.xpath.func.extensions
102+
* property synapse.xpath.func.extensions and synapse.custom.xpath.func.extensions.
98103
*
99104
* @return List of Synapse Xpath Function Context Providers
100105
*/
101106
public static List<SynapseXpathFunctionContextProvider> getRegisteredFunctionExtensions() {
102107
Properties synapseProps = SynapsePropertiesLoader.loadSynapseProperties();
103-
String propValue = synapseProps.getProperty(SYNAPSE_XPATH_FUNCTION_EXTENSIONS);
104-
List<SynapseXpathFunctionContextProvider> extProviders = new
105-
ArrayList<SynapseXpathFunctionContextProvider>();
106-
extractProviders(propValue, extProviders);
108+
List<SynapseXpathFunctionContextProvider> extProviders = new ArrayList<SynapseXpathFunctionContextProvider>();
109+
110+
// Load default function extensions
111+
String synapseXPathFunctionExtensionsPropValue = synapseProps.getProperty(SYNAPSE_XPATH_FUNCTION_EXTENSIONS);
112+
extractProviders(synapseXPathFunctionExtensionsPropValue, extProviders);
113+
114+
// Load custom function extensions
115+
String synapseCustomXPathFunctionExtensionsPropValue =
116+
synapseProps.getProperty(SYNAPSE_CUSTOM_XPATH_FUNCTION_EXTENSIONS);
117+
extractProviders(synapseCustomXPathFunctionExtensionsPropValue, extProviders);
107118
return extProviders;
108119
}
109120

‎modules/coverage-report/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.synapse</groupId>
2525
<artifactId>Apache-Synapse</artifactId>
26-
<version>4.0.0-wso2v271-SNAPSHOT</version>
26+
<version>4.0.0-wso2v272-SNAPSHOT</version>
2727
<relativePath>../../pom.xml</relativePath>
2828
</parent>
2929

‎modules/distribution/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.synapse</groupId>
2424
<artifactId>Apache-Synapse</artifactId>
25-
<version>4.0.0-wso2v271-SNAPSHOT</version>
25+
<version>4.0.0-wso2v272-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎modules/experimental/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.synapse</groupId>
2525
<artifactId>Apache-Synapse</artifactId>
26-
<version>4.0.0-wso2v271-SNAPSHOT</version>
26+
<version>4.0.0-wso2v272-SNAPSHOT</version>
2727
<relativePath>../../pom.xml</relativePath>
2828
</parent>
2929

‎modules/extensions/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.synapse</groupId>
2525
<artifactId>Apache-Synapse</artifactId>
26-
<version>4.0.0-wso2v271-SNAPSHOT</version>
26+
<version>4.0.0-wso2v272-SNAPSHOT</version>
2727
<relativePath>../../pom.xml</relativePath>
2828
</parent>
2929

‎modules/features/org.apache.synapse.samples.feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<parent>
2121
<artifactId>synapse-features</artifactId>
22-
<version>4.0.0-wso2v271-SNAPSHOT</version>
22+
<version>4.0.0-wso2v272-SNAPSHOT</version>
2323
<groupId>org.apache.synapse</groupId>
2424
</parent>
2525

‎modules/features/org.apache.synapse.transport.fix.feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<parent>
2121
<artifactId>synapse-features</artifactId>
22-
<version>4.0.0-wso2v271-SNAPSHOT</version>
22+
<version>4.0.0-wso2v272-SNAPSHOT</version>
2323
<groupId>org.apache.synapse</groupId>
2424
</parent>
2525

‎modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<parent>
2121
<artifactId>synapse-features</artifactId>
22-
<version>4.0.0-wso2v271-SNAPSHOT</version>
22+
<version>4.0.0-wso2v272-SNAPSHOT</version>
2323
<groupId>org.apache.synapse</groupId>
2424
</parent>
2525

0 commit comments

Comments
 (0)