Author: indika
Date: Tue May 6 04:45:27 2008
New Revision: 16570
Log:
fix a windows related issue
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/registry/WSO2RegistryAdapter.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/registry/WSO2RegistryAdapter.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/registry/WSO2RegistryAdapter.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/registry/WSO2RegistryAdapter.java
Tue May 6 04:45:27 2008
@@ -86,7 +86,9 @@
handleException("Resource cannot be empty");
}
- log.info("==> Repository fetch of resource with key : " + key);
+ if (log.isDebugEnabled()) {
+ log.debug("==> Repository fetch of resource with key : " + key);
+ }
try {
@@ -629,7 +631,7 @@
}
private String getResourcePath(String path) {
- path = calculatePath(File.separator, path);
+ path = calculatePath(RegistryConstants.PATH_SEPARATOR, path);
if (path.startsWith(rootPath)) {
path = path.substring(rootPath.length(), path.length());
} else {
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
Tue May 6 04:45:27 2008
@@ -210,7 +210,7 @@
if (ep instanceof AddressEndpoint) {
EndpointDefinition def = ((AddressEndpoint) ep).getEndpoint();
AddressEndpointData epData = new AddressEndpointData();
- epData.setSuspendDurationOnFailure(((AddressEndpoint)
ep).getSuspendOnFailDuration());
+ epData.setSuspendDurationOnFailure(((AddressEndpoint)
ep).getEndpoint().getSuspendOnFailDuration());
epData.setName(ep.getName());
epData.setEndpointDefinition(def);
return epData;
@@ -225,7 +225,7 @@
WSDLEndpoint wsdlEndpoint = (WSDLEndpoint) ep;
EndpointDefinition def = (wsdlEndpoint).getEndpoint();
WSDLEndpointData epData = new WSDLEndpointData();
-
epData.setSuspendDurationOnFailure(wsdlEndpoint.getSuspendOnFailDuration());
+
epData.setSuspendDurationOnFailure(wsdlEndpoint.getEndpoint().getSuspendOnFailDuration());
epData.setName(wsdlEndpoint.getName());
epData.setPort(wsdlEndpoint.getPortName());
epData.setService(wsdlEndpoint.getServiceName());
@@ -279,7 +279,7 @@
EndpointDefinition def = ((AddressEndpoint)
ep).getEndpoint();
AddressEndpointData epData = new AddressEndpointData();
epData.setName(ep.getName());
- epData.setSuspendDurationOnFailure(((AddressEndpoint)
ep).getSuspendOnFailDuration());
+ epData.setSuspendDurationOnFailure(((AddressEndpoint)
ep).getEndpoint().getSuspendOnFailDuration());
epData.setEndpointDefinition(def);
datas[i] = epData;
}
@@ -293,7 +293,7 @@
WSDLEndpoint wsdlEndpoint = (WSDLEndpoint) ep;
EndpointDefinition def = (wsdlEndpoint).getEndpoint();
WSDLEndpointData epData = new WSDLEndpointData();
-
epData.setSuspendDurationOnFailure(wsdlEndpoint.getSuspendOnFailDuration());
+
epData.setSuspendDurationOnFailure(wsdlEndpoint.getEndpoint().getSuspendOnFailDuration());
epData.setName(wsdlEndpoint.getName());
epData.setPort(wsdlEndpoint.getPortName());
epData.setService(wsdlEndpoint.getServiceName());
@@ -456,7 +456,8 @@
*/
public EndpointData getEndpoint(String endpointName) throws AxisFault {
SynapseConfiguration synapseConfiguration = getSynapseConfiguration();
- if (endpointName != null && !("".equals(endpointName)) &&
synapseConfiguration.getEndpoint(endpointName.trim()) != null)
+ if (endpointName != null && !("".equals(endpointName))
+ && synapseConfiguration.getEndpoint(endpointName.trim()) !=
null)
{
return
getEndpointData(synapseConfiguration.getEndpoint(endpointName.trim()));
} else {
Modified: trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
(original)
+++ trunk/esb/java/modules/distribution/src/main/assembly/bin.xml Tue May
6 04:45:27 2008
@@ -326,7 +326,7 @@
<exclude>axis:axis-ant:jar</exclude>
<exclude>javax.servlet:servlet-api:jar</exclude>
<exclude>commons-discovery:commons-discovery:jar</exclude>
- <exclude>commons-io:commons-io:jar</exclude>
+ <!--<exclude>commons-io:commons-io:jar</exclude>-->
<exclude>org.apache.geronimo.specs:geronimo-javamail:jar</exclude>
<exclude>xml-apis:xml-apis:jar</exclude>
<exclude>xerces:xercesImpl:jar</exclude>
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
