Author: indika
Date: Tue Mar 27 02:10:22 2007
New Revision: 522824
URL: http://svn.apache.org/viewvc?view=rev&rev=522824
Log:
Hard code the version of the pom.xml files to overcome problem with maven 2
Fixed minor issues in building Endpoints
Modified:
webservices/synapse/trunk/java/modules/core/pom.xml
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
webservices/synapse/trunk/java/modules/extensions/pom.xml
webservices/synapse/trunk/java/modules/mar/pom.xml
webservices/synapse/trunk/java/modules/nhttp/pom.xml
webservices/synapse/trunk/java/modules/samples/pom.xml
webservices/synapse/trunk/java/pom.xml
Modified: webservices/synapse/trunk/java/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/pom.xml?view=diff&rev=522824&r1=522823&r2=522824
==============================================================================
--- webservices/synapse/trunk/java/modules/core/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/core/pom.xml Tue Mar 27 02:10:22 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>${synapse.version}</version>
+ <version>1.0-RC1-SNAPSHOT</version>
</parent>
<groupId>org.apache.synapse</groupId>
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java?view=diff&rev=522824&r1=522823&r2=522824
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
Tue Mar 27 02:10:22 2007
@@ -175,12 +175,12 @@
String name = ele.getAttributeValue(new
QName(Constants.NULL_NAMESPACE, "name"));
if (name != null) {
- if (config.getLocalRegistry().get(name) != null) {
+ if (config.getLocalRegistry().get(name.trim()) != null) {
handleException("Duplicate endpoint definition : " + name);
}
Endpoint endpoint =
EndpointAbstractFactory.getEndpointFactroy(ele).createEndpoint(ele, false);
- config.addEndpoint(name, endpoint);
+ config.addEndpoint(name.trim(), endpoint);
} else {
handleException("Invalid endpoint definition without a name");
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java?view=diff&rev=522824&r1=522823&r2=522824
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
Tue Mar 27 02:10:22 2007
@@ -89,11 +89,11 @@
// get the service name and port name. at this point we should not
worry about the presence
// of those parameters. they are handled by corresponding WSDL
builders.
- String serviceName = wsdlElement.getAttributeValue(new
QName("service"));
- String portName = wsdlElement.getAttributeValue(new QName("port"));
+ String serviceName = wsdlElement.getAttributeValue(new
QName(org.apache.synapse.config.xml.Constants.NULL_NAMESPACE,"service"));
+ String portName = wsdlElement.getAttributeValue(new
QName(org.apache.synapse.config.xml.Constants.NULL_NAMESPACE,"port"));
// check if wsdl is supplied as a URI
- String wsdlURI = wsdlElement.getAttributeValue(new QName("uri"));
+ String wsdlURI = wsdlElement.getAttributeValue(new
QName(org.apache.synapse.config.xml.Constants.NULL_NAMESPACE,"uri"));
// set serviceName and portName in the endpoint. it does not
matter if these are
// null at this point. we are setting them only for serialization
purpose.
@@ -101,7 +101,7 @@
wsdlEndpoint.setPortName(portName);
if (wsdlURI != null) {
- wsdlEndpoint.setWsdlURI(wsdlURI);
+ wsdlEndpoint.setWsdlURI(wsdlURI.trim());
try {
URL wsdlURL = new URL(wsdlURI);
Modified: webservices/synapse/trunk/java/modules/extensions/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/pom.xml?view=diff&rev=522824&r1=522823&r2=522824
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/extensions/pom.xml Tue Mar 27
02:10:22 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>${synapse.version}</version>
+ <version>1.0-RC1-SNAPSHOT</version>
</parent>
<groupId>org.apache.synapse</groupId>
Modified: webservices/synapse/trunk/java/modules/mar/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/mar/pom.xml?view=diff&rev=522824&r1=522823&r2=522824
==============================================================================
--- webservices/synapse/trunk/java/modules/mar/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/mar/pom.xml Tue Mar 27 02:10:22 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>${synapse.version}</version>
+ <version>1.0-RC1-SNAPSHOT</version>
</parent>
<groupId>org.apache.synapse</groupId>
Modified: webservices/synapse/trunk/java/modules/nhttp/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/nhttp/pom.xml?view=diff&rev=522824&r1=522823&r2=522824
==============================================================================
--- webservices/synapse/trunk/java/modules/nhttp/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/nhttp/pom.xml Tue Mar 27 02:10:22
2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>${synapse.version}</version>
+ <version>1.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>synapse-nhttp</artifactId>
Modified: webservices/synapse/trunk/java/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/pom.xml?view=diff&rev=522824&r1=522823&r2=522824
==============================================================================
--- webservices/synapse/trunk/java/modules/samples/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/samples/pom.xml Tue Mar 27 02:10:22
2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>${synapse.version}</version>
+ <version>1.0-RC1-SNAPSHOT</version>
</parent>
<groupId>org.apache.synapse</groupId>
Modified: webservices/synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/pom.xml?view=diff&rev=522824&r1=522823&r2=522824
==============================================================================
--- webservices/synapse/trunk/java/pom.xml (original)
+++ webservices/synapse/trunk/java/pom.xml Tue Mar 27 02:10:22 2007
@@ -26,7 +26,7 @@
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>${synapse.version}</version>
+ <version>1.0-RC1-SNAPSHOT</version>
<name>Apache Synapse</name>
<description>Apache Synapse</description>
@@ -588,7 +588,8 @@
<synapse.version>1.0-RC1-SNAPSHOT</synapse.version>
<jakarta.httpcore.nio.version>4.0-alpha4-SNAPSHOT</jakarta.httpcore.nio.version>
- <!-- Axis2 1.1.1 and its dependencies -->
+
+ <!-- Axis2 1.1.1 and its dependencies -->
<axis2.version>SNAPSHOT</axis2.version>
<rampart.version>SNAPSHOT</rampart.version>
<axiom.version>SNAPSHOT</axiom.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
