svn commit: r1063631 - /axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java
Author: ruwan
Date: Wed Jan 26 08:46:50 2011
New Revision: 1063631
URL: http://svn.apache.org/viewvc?rev=1063631&view=rev
Log:
Applying the patch from Miyuru on the issue AXIS2-4941
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java?rev=1063631&r1=1063630&r2=1063631&view=diff
==
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java
Wed Jan 26 08:46:50 2011
@@ -63,6 +63,9 @@ public abstract class AbstractJSONOMBuil
String prefix = "";
OMNamespace ns = factory.createOMNamespace("", "");
+//sets DoingREST to true because, security scenarios needs to handle
in REST way
+messageContext.setDoingREST(true);
+
Reader reader;
//if the input stream is null, then check whether the HTTP method is
GET, if so get the
svn commit: r1063633 - /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/TransportView.java
Author: supun
Date: Wed Jan 26 08:51:17 2011
New Revision: 1063633
URL: http://svn.apache.org/viewvc?rev=1063633&view=rev
Log:
improving the code by re-factoring
Modified:
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/TransportView.java
Modified:
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/TransportView.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/TransportView.java?rev=1063633&r1=1063632&r2=1063633&view=diff
==
---
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/TransportView.java
(original)
+++
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/TransportView.java
Wed Jan 26 08:51:17 2011
@@ -19,8 +19,6 @@
package org.apache.axis2.transport.base;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.TransportSender;
@@ -28,171 +26,143 @@ import java.util.Map;
public class TransportView implements TransportViewMBean {
-private static final Log log = LogFactory.getLog(TransportView.class);
-
-public static final int STOPPED = 0;
-public static final int RUNNING = 1;
-public static final int PAUSED = 2;
-public static final int SHUTTING_DOWN = 3;
+private ManagementSupport managementSupport = null;
private TransportListener listener = null;
+
private TransportSender sender = null;
public TransportView(TransportListener listener, TransportSender sender) {
-this.listener = listener;
-this.sender = sender;
+if (listener != null) {
+this.listener = listener;
+if (listener instanceof ManagementSupport) {
+managementSupport = (ManagementSupport) listener;
+}
+}
+if (sender != null) {
+this.sender = sender;
+if (sender instanceof ManagementSupport) {
+managementSupport = (ManagementSupport) sender;
+}
+}
}
// JMX Attributes
public long getMessagesReceived() {
-if (listener != null && listener instanceof ManagementSupport) {
-return ((ManagementSupport) listener).getMessagesReceived();
-} else if (sender != null && sender instanceof ManagementSupport) {
-return ((ManagementSupport) sender).getMessagesReceived();
+if (managementSupport != null) {
+return managementSupport.getMessagesReceived();
}
return -1;
}
public long getFaultsReceiving() {
-if (listener != null && listener instanceof ManagementSupport) {
-return ((ManagementSupport) listener).getFaultsReceiving();
-} else if (sender != null && sender instanceof ManagementSupport) {
-return ((ManagementSupport) sender).getFaultsReceiving();
+if (managementSupport != null) {
+return managementSupport.getFaultsReceiving();
}
return -1;
}
public long getTimeoutsReceiving() {
-if (listener != null && listener instanceof ManagementSupport) {
-return ((ManagementSupport) listener).getTimeoutsReceiving();
-} else if (sender != null && sender instanceof ManagementSupport) {
-return ((ManagementSupport) sender).getTimeoutsReceiving();
+if (managementSupport != null) {
+return managementSupport.getTimeoutsReceiving();
}
return -1;
}
public long getTimeoutsSending() {
-if (listener != null && listener instanceof ManagementSupport) {
-return ((ManagementSupport) listener).getTimeoutsSending();
-} else if (sender != null && sender instanceof ManagementSupport) {
-return ((ManagementSupport) sender).getTimeoutsSending();
+if (managementSupport != null) {
+managementSupport.getTimeoutsSending();
}
return -1;
}
public long getBytesReceived() {
-if (listener != null && listener instanceof ManagementSupport) {
-return ((ManagementSupport) listener).getBytesReceived();
-} else if (sender != null && sender instanceof ManagementSupport) {
-return ((ManagementSupport) sender).getBytesReceived();
+if (managementSupport != null) {
+return managementSupport.getBytesReceived();
}
return -1;
}
public long getMessagesSent() {
-if (listener != null && listener instanceof ManagementSupport) {
-return ((ManagementSupport) listener).getMessagesSent();
-} else if (sender != null && sender instanceof ManagementSupport) {
-retur
svn commit: r1063637 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Author: ruwan
Date: Wed Jan 26 08:58:05 2011
New Revision: 1063637
URL: http://svn.apache.org/viewvc?rev=1063637&view=rev
Log:
Applying the patch from Pradeep on the issue AXIS2-4651
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?rev=1063637&r1=1063636&r2=1063637&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Wed Jan 26 08:58:05 2011
@@ -659,7 +659,7 @@ public class WSDL20ToAxisServiceBuilder
// If httpLocation is not null we should extract a constant part
from it and add its value and the
// corresponding AxisOperation to a map in order to dispatch rest
messages. If httpLocation is null we add
// the operation name into this map.
-String httpLocationString = "";
+String httpLocationString = null;
if (httpLocation != null) {
String httpLocationTemplete =
httpLocation.getOriginalLocation();
axisBindingOperation
@@ -667,8 +667,10 @@ public class WSDL20ToAxisServiceBuilder
httpLocationString =
WSDLUtil.getConstantFromHTTPLocation(httpLocationTemplete,
HTTPConstants.HEADER_POST);
}
-
-httpLocationTable.put(httpLocationString, axisOperation);
+if (httpLocationString != null){
+// this map is used to dispatch operation based on request URI
, in the HTTPLocationBasedDispatcher
+httpLocationTable.put(httpLocationString, axisOperation);
+}
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
soapBindingOperationExtensions.getHttpContentEncodingDefault());
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR,
svn commit: r1063648 - in /axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool: core/ service/bean/ service/control/ service/eclipse/ui/ service/sw
Author: ruwan
Date: Wed Jan 26 09:16:54 2011
New Revision: 1063648
URL: http://svn.apache.org/viewvc?rev=1063648&view=rev
Log:
Applying the patch from Harshana on the issue AXIS2-4920
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/FileCopier.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/JarFileWriter.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/bean/LibrarySelectionBean.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLFileSelectionPage.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/swing/ui/MainWindow.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/swing/ui/WizardPane.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/util/Constants.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/util/ServicePluginUtils.java
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java?rev=1063648&r1=1063647&r2=1063648&view=diff
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java
Wed Jan 26 09:16:54 2011
@@ -24,7 +24,9 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
+import java.security.AccessController;
import java.util.ArrayList;
+import java.security.PrivilegedAction;
public class ClassFileHandler {
@@ -41,10 +43,15 @@ public class ClassFileHandler {
public ArrayList getMethodNamesFromClass(String classFileName,String
location) throws IOException, ClassNotFoundException{
ArrayList returnList = new ArrayList();
File fileEndpoint = new File(location);
-if (!fileEndpoint.exists())
+if (!fileEndpoint.exists()){
throw new IOException("the location is invalid");
-URL[] urlList = {fileEndpoint.toURL()};
-URLClassLoader clazzLoader = new URLClassLoader(urlList);
+}
+final URL[] urlList = {fileEndpoint.toURL()};
+URLClassLoader clazzLoader = AccessController.doPrivileged(new
PrivilegedAction() {
+ public URLClassLoader run() {
+ return new URLClassLoader(urlList);
+ }
+ });
Class clazz = clazzLoader.loadClass(classFileName);
Method[] methods = clazz.getDeclaredMethods();
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/FileCopier.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/FileCopier.java?rev=1063648&r1=1063647&r2=1063648&view=diff
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/FileCopier.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-pl
svn commit: r1063651 - in /axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool: codegen/ codegen/eclipse/ codegen/eclipse/ui/ codegen/eclipse/util/
Author: ruwan
Date: Wed Jan 26 09:20:00 2011
New Revision: 1063651
URL: http://svn.apache.org/viewvc?rev=1063651&view=rev
Log:
Applying the patch from Harshana on the issue AXIS2-4920 - part2
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOutputLocationPage.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/WSDLJavaAdvanceDialog.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/FileCopier.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/JarFileWriter.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/SrcCompiler.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/util/Constants.java
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java?rev=1063651&r1=1063650&r2=1063651&view=diff
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
Wed Jan 26 09:20:00 2011
@@ -33,6 +33,7 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
public class WSDL2JavaGenerator {
@@ -147,15 +148,14 @@ public class WSDL2JavaGenerator {
}
if (advanceOptions != null) {
- for (Iterator iterator =
advanceOptions.keySet().iterator(); iterator
- .hasNext();) {
- String type = (String) iterator.next();
- String[] parameters;
- if (advanceOptions.get(type) == null)
- parameters = new String[0];
- else
- parameters = (String[])
advanceOptions.get(type);
- optionMap.put(type, new CommandLineOption(type,
parameters));
+ for (Iterator iterator =
advanceOptions.entrySet().iterator(); iterator.hasNext();) {
+ Entry entry=(Entry) iterator.next();
+ String key=(String) entry.getKey();
+ String[] value=(String[]) entry.getValue();
+ if (value == null) {
+ value = new String[0];
+ }
+ optionMap.put(key, new CommandLineOption(key,
value));
}
}
return optionMap;
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?rev=1063651&r1=1063650&r2=1063651&view=diff
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
(ori
svn commit: r1063678 - in /axis/axis2/java/core/trunk/modules/webapp/src/main: java/org/apache/axis2/webapp/AdminAgent.java webapp/axis2-web/deleteService.jsp webapp/axis2-web/listService.jsp webapp/a
Author: ruwan
Date: Wed Jan 26 11:17:22 2011
New Revision: 1063678
URL: http://svn.apache.org/viewvc?rev=1063678&view=rev
Log:
Fixing the issue AXIS2-1755, added a remove service link to remove the serivce
from the admin page of services. Though this has been done in the same manner
the rest of the admin console stuff were. I think there need to be a whole
re-write of the admin console of axis2, including the style of writing the
webapp as well as the UI, but that is out of the scope of the 1.6 release.
Added:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/deleteService.jsp
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
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
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java?rev=1063678&r1=1063677&r2=1063678&view=diff
==
---
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
Wed Jan 26 11:17:22 2011
@@ -599,6 +599,20 @@ public class AdminAgent extends Abstract
renderView("disengage.jsp", req, res);
}
+public void processdeleteService(HttpServletRequest req,
HttpServletResponse res)
+throws IOException, ServletException {
+String serviceName = req.getParameter("serviceName");
+AxisConfiguration axisConfiguration =
configContext.getAxisConfiguration();
+if (axisConfiguration.getService(serviceName) != null) {
+axisConfiguration.removeService(serviceName);
+req.getSession().setAttribute("status", "Service '" + serviceName
+ "' has been successfully removed.");
+} else {
+req.getSession().setAttribute("status", "Failed to delete service
'" + serviceName + "'. Service doesn't exist.");
+}
+
+renderView("deleteService.jsp", req, res);
+}
+
public void processSelectService(HttpServletRequest req,
HttpServletResponse res)
throws IOException, ServletException {
populateSessionInformation(req);
Added:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/deleteService.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/deleteService.jsp?rev=1063678&view=auto
==
---
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/deleteService.jsp
(added)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/deleteService.jsp
Wed Jan 26 11:17:22 2011
@@ -0,0 +1,23 @@
+<%--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ --%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<%=request.getSession().getAttribute("status")%>
+Click here to go to the service list
page
+
\ No newline at end of file
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=1063678&r1=1063677&r2=1063678&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
Wed Jan 26 11:17:22 2011
@@ -49,7 +49,6 @@
operations = axisService.getOperations();
serviceName = axisService.getName();
%><%=serviceName%>
-Service EPR : <%=prefix +
axisService.getName()%>
<%
// do we need to enable REST in the main servlet so that it handles both
REST and SOAP messages
svn commit: r1063980 - /axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
Author: ruwan
Date: Thu Jan 27 04:13:27 2011
New Revision: 1063980
URL: http://svn.apache.org/viewvc?rev=1063980&view=rev
Log:
Fixing the issue AXIS2-4810, committing the patch from Pradeep
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java?rev=1063980&r1=1063979&r2=1063980&view=diff
==
---
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
Thu Jan 27 04:13:27 2011
@@ -63,7 +63,7 @@ public class SAAJUtil {
factory = DOOMAbstractFactory.getSOAP11Factory();
} else {
nsURI = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI;
-factory = DOOMAbstractFactory.getSOAP11Factory();
+factory = DOOMAbstractFactory.getSOAP12Factory();
}
StAXSOAPModelBuilder stAXSOAPModelBuilder =
