svn commit: r1328228 - in /axis/axis2/java/core/trunk/modules: integration/test-resources/BaseDataTypes.wsdl kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java kernel/src/or
Author: sagara Date: Fri Apr 20 07:18:38 2012 New Revision: 1328228 URL: http://svn.apache.org/viewvc?rev=1328228&view=rev Log: Fixed AXIS2-5293. Modified: axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java Modified: axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl?rev=1328228&r1=1328227&r2=1328228&view=diff == --- axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl (original) +++ axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl Fri Apr 20 07:18:38 2012 @@ -25,28 +25,28 @@ - + - + - + - + @@ -67,84 +67,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -277,56 +277,56 @@ - + - + - + - + - + - + - + - + Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/
svn commit: r1328230 - in /axis/axis2/java/core/branches/1_6: ./ modules/integration/test-resources/ modules/kernel/src/org/apache/axis2/description/java2wsdl/
Author: sagara Date: Fri Apr 20 07:46:27 2012 New Revision: 1328230 URL: http://svn.apache.org/viewvc?rev=1328230&view=rev Log: Merged r1328228 to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java Propchange: axis/axis2/java/core/branches/1_6/ -- Merged /axis/axis2/java/core/trunk:r1328228 Modified: axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl?rev=1328230&r1=1328229&r2=1328230&view=diff == --- axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl (original) +++ axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl Fri Apr 20 07:46:27 2012 @@ -25,28 +25,28 @@ - + - + - + - + @@ -67,84 +67,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -277,56 +277,56 @@ - + - + - + - + - + - + - +
svn commit: r1328231 - /axis/axis2/java/core/trunk/modules/rmi/
Author: sagara Date: Fri Apr 20 07:50:38 2012 New Revision: 1328231 URL: http://svn.apache.org/viewvc?rev=1328231&view=rev Log: Delete the module based on AXIS2-5292. Removed: axis/axis2/java/core/trunk/modules/rmi/
svn commit: r1328293 - /axis/axis2/java/core/trunk/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl
Author: sagara Date: Fri Apr 20 10:09:10 2012 New Revision: 1328293 URL: http://svn.apache.org/viewvc?rev=1328293&view=rev Log: Further test resources correction for AXIS2-5293. Modified: axis/axis2/java/core/trunk/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl Modified: axis/axis2/java/core/trunk/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl?rev=1328293&r1=1328292&r2=1328293&view=diff == --- axis/axis2/java/core/trunk/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl (original) +++ axis/axis2/java/core/trunk/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl Fri Apr 20 10:09:10 2012 @@ -84,14 +84,14 @@ - + - + @@ -112,14 +112,14 @@ - + - + @@ -210,42 +210,42 @@ - + - + - + - + - + - + @@ -280,42 +280,42 @@ - + - + - + - + - + - + @@ -336,14 +336,14 @@ - + - + @@ -378,14 +378,14 @@ - + - + @@ -448,14 +448,14 @@ - + - + @@ -476,28 +476,28 @@ - + - + -
svn commit: r1328298 - /axis/axis2/java/core/branches/1_6/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl
Author: sagara Date: Fri Apr 20 10:21:06 2012 New Revision: 1328298 URL: http://svn.apache.org/viewvc?rev=1328298&view=rev Log: Merged r1328293 to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl Modified: axis/axis2/java/core/branches/1_6/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl?rev=1328298&r1=1328297&r2=1328298&view=diff == --- axis/axis2/java/core/branches/1_6/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl (original) +++ axis/axis2/java/core/branches/1_6/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl Fri Apr 20 10:21:06 2012 @@ -84,14 +84,14 @@ - + - + @@ -112,14 +112,14 @@ - + - + @@ -210,42 +210,42 @@ - + - + - + - + - + - + @@ -280,42 +280,42 @@ - + - + - + - + - + - + @@ -336,14 +336,14 @@ - + - + @@ -378,14 +378,14 @@ - + - + @@ -448,14 +448,14 @@ - + - + @@ -476,28 +476,28 @@ - + - +
svn commit: r1328354 - /axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
Author: azeez
Date: Fri Apr 20 12:37:31 2012
New Revision: 1328354
URL: http://svn.apache.org/viewvc?rev=1328354&view=rev
Log:
Take portOffset into consideration when transmitting member http & https port
member properties
Modified:
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
Modified:
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java?rev=1328354&r1=1328353&r2=1328354&view=diff
==
---
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
(original)
+++
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
Fri Apr 20 12:37:31 2012
@@ -297,24 +297,25 @@ public class TribesClusteringAgent imple
Properties memberInfo = new Properties();
AxisConfiguration axisConfig =
configurationContext.getAxisConfiguration();
TransportInDescription httpTransport =
axisConfig.getTransportIn("http");
+int portOffset = 0;
+if(System.getProperty("portOffset") != null){
+portOffset = Integer.parseInt(System.getProperty("portOffset"));
+}
if (httpTransport != null) {
Parameter port = httpTransport.getParameter("port");
if (port != null) {
-memberInfo.put("httpPort", port.getValue());
+memberInfo.put("httpPort",
+
String.valueOf(Integer.valueOf((String)port.getValue()) + portOffset));
}
}
TransportInDescription httpsTransport =
axisConfig.getTransportIn("https");
if (httpsTransport != null) {
Parameter port = httpsTransport.getParameter("port");
if (port != null) {
-memberInfo.put("httpsPort", port.getValue());
+memberInfo.put("httpsPort",
+
String.valueOf(Integer.valueOf((String)port.getValue()) + portOffset));
}
}
-Parameter isActiveParam =
getParameter(ClusteringConstants.Parameters.IS_ACTIVE);
-if (isActiveParam != null) {
-memberInfo.setProperty(ClusteringConstants.Parameters.IS_ACTIVE,
- (String) isActiveParam.getValue());
-}
memberInfo.setProperty("hostName",
TribesUtil.getLocalHost(getParameter(TribesConstants.LOCAL_MEMBER_HOST)));
