svn commit: r1178750 - in /axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web: css/axis-style.css listFaultyService.jsp listGroupService.jsp listService.jsp listServices.jsp listSingl

2011-10-04 Thread sagara 
Author: sagara
Date: Tue Oct  4 10:18:50 2011
New Revision: 1178750

URL: http://svn.apache.org/viewvc?rev=1178750&view=rev
Log:
Applied patch for AXIS2-5143. 

Modified:

axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/css/axis-style.css

axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listFaultyService.jsp

axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp

axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listService.jsp

axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp

axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listSingleService.jsp

Modified: 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/css/axis-style.css
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/css/axis-style.css?rev=1178750&r1=1178749&r2=1178750&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/css/axis-style.css
 (original)
+++ 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/css/axis-style.css
 Tue Oct  4 10:18:50 2011
@@ -17,9 +17,9 @@
  * under the License.
  */
 BODY {
-   background-color : "#FF";
-   leftmargin:"0";
-   topmargin:"0";
+   background-color : #FF;
+   left-margin:0;
+   top-margin:0;
font-family:Arial;
font-size:11pt;
 }
@@ -40,8 +40,8 @@ TABLE.LOG_IN_FORM{
height: 200px%;
border:1px solid #00;
width: 300px%;
-   cellspacing:1px;
-   cellpadding:1px;
+   border-spacing:1px;
+   padding:1px;
background-color: #f7f7f7 ;
 }
 

Modified: 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listFaultyService.jsp
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listFaultyService.jsp?rev=1178750&r1=1178749&r2=1178750&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listFaultyService.jsp
 (original)
+++ 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listFaultyService.jsp
 Tue Oct  4 10:18:50 2011
@@ -55,7 +55,7 @@
   String  serviceName = axisService.getName();
 %><%=serviceName%>
Service EPR : <%=prifix + axisService.getName()%>
-   Service Description : <%=axisService.getServiceDescription()%>
+   Service Description : <%=axisService.getDocumentation()%>
Service Status : 
<%=axisService.isActive()?"Active":"InActive"%>
<%
 if (opItr.hasNext()) {

Modified: 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp?rev=1178750&r1=1178749&r2=1178750&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp
 (original)
+++ 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp
 Tue Oct  4 10:18:50 2011
@@ -52,7 +52,7 @@
 <%=serviceName%>
 
 Service EPR :<%=prefix + 
axisService.getName()%>
-Service Description : <%=axisService.getServiceDescription()%>
+Service Description : <%=axisService.getDocumentation()%>
 Service Status : <%=axisService.isActive() ? "Active" : 
"InActive"%>
 <%
   Collection engagedModules = axisService.getEngagedModules();

Modified: 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listService.jsp
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listService.jsp?rev=1178750&r1=1178749&r2=1178750&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listService.jsp
 (original)
+++ 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listService.jsp
 Tue Oct  4 10:18:50 2011
@@ -70,7 +70,7 @@
 }
 
 
-String serviceDescription = axisService.getServiceDescription();
+String serviceDescription = axisService.getDocumentation();
 if (serviceDescription == null || "".equals(serviceDescription)) {
 serviceDescription = "No description available for this service";
 }

Modified: 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp?rev=1178750&r1=1178749&r2=1178750&view=diff
==
--- 
axis/

svn commit: r1178754 - /axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java

2011-10-04 Thread sagara 
Author: sagara
Date: Tue Oct  4 11:06:37 2011
New Revision: 1178754

URL: http://svn.apache.org/viewvc?rev=1178754&view=rev
Log:
Applied patch for AXIS2-4962.

Modified:

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java

Modified: 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java?rev=1178754&r1=1178753&r2=1178754&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
 Tue Oct  4 11:06:37 2011
@@ -26,12 +26,7 @@ import org.apache.axis2.description.Axis
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.AxisConfiguration;
 
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Class HTTPTransportReceiver
@@ -97,8 +92,12 @@ public class HTTPTransportReceiver {
 
 if ((services != null) && !services.isEmpty()) {
 status = true;
-
-Collection serviceCollection = services.values();
+Collection serviceCollection = new ArrayList();
+// sort services by alphabetical order to show in services page
+Set allServices = new TreeSet(services.keySet());
+for(String serviceName : allServices) {
+serviceCollection.add(services.get(serviceName));
+}
 
 temp += "" + "Deployed services" + "";
 
@@ -131,11 +130,9 @@ public class HTTPTransportReceiver {
 temp += "Faulty Services";
 status = true;
 
-Enumeration faultyservices = erroneousServices.keys();
-
-while (faultyservices.hasMoreElements()) {
-String faultyserviceName = (String) 
faultyservices.nextElement();
-
+// sort faluty services to alphabetical order
+Set allFaultServices = new 
TreeSet(erroneousServices.keySet());
+for(String faultyserviceName : allFaultServices) {
 temp += "" + faultyserviceName + 
"";
 }
 }

svn commit: r1178758 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/utils/BeanUtil.java kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

2011-10-04 Thread sagara 
Author: sagara
Date: Tue Oct  4 11:35:52 2011
New Revision: 1178758

URL: http://svn.apache.org/viewvc?rev=1178758&view=rev
Log:
Applied patch for AXIS2-5141.

Modified:

axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

Modified: 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1178758&r1=1178757&r2=1178758&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
 Tue Oct  4 11:35:52 2011
@@ -1095,7 +1095,13 @@ public class BeanUtil {
 *reason to add this block is check is soap sending a string but 
service require Enum
 * then this convert string to relevant enum object and add to 
retObjs[] as object
 * */
-Object enumIbj = Enum.valueOf(classType , omElement.getText());
+  String paraArgString = omElement.getText();
+ Object enumIbj;
+if (paraArgString == null || paraArgString.length() == 0) {
+enumIbj = null;
+}else{
+enumIbj = Enum.valueOf(classType , paraArgString);
+}
 return enumIbj;
 
 }

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1178758&r1=1178757&r2=1178758&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 Tue Oct  4 11:35:52 2011
@@ -2148,9 +2148,9 @@ public class DefaultSchemaGenerator impl
   parameterElement.setName(parameterName);
   if(isArrayType){
   parameterElement.setMaxOccurs(Long.MAX_VALUE);
-  parameterElement.setMinOccurs(0);
-  parameterElement.setNillable(true);
   }
+  parameterElement.setMinOccurs(0);
+  parameterElement.setNillable(true);
   sequence.getItems().add(parameterElement);
   parameterElement.setSchemaTypeName(parameterTypeName);
   return parameterTypeName;