You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2005/09/19 12:43:00 UTC
svn commit: r290106 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
deployment/ deployment/repository/util/ transport/http/
Author: deepal
Date: Mon Sep 19 03:42:43 2005
New Revision: 290106
URL: http://svn.apache.org/viewcvs?rev=290106&view=rev
Log:
Modified JSPs to show service WSDL
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=290106&r1=290105&r2=290106&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Mon Sep 19 03:42:43 2005
@@ -595,6 +595,7 @@
archiveReader = new ArchiveReader();
String serviceStatus = "";
try {
+ archiveReader.processWSDLs(currentArchiveFile,this);
// ServiceDescription service = archiveReader.createService(currentArchiveFile.getAbsolutePath());
ServiceGroupDescription sericeGroup =
new ServiceGroupDescription(axisConfig);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?rev=290106&r1=290105&r2=290106&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java Mon Sep 19 03:42:43 2005
@@ -62,7 +62,7 @@
throw new DeploymentException("Service Name required");
} else {
ServiceDescription serviceDecs = engine.getCurrentFileItem().getService(
- new QName(serviceName));
+ serviceName);
if(serviceDecs == null){
serviceDecs = new ServiceDescription(new QName(serviceName));
engine.getCurrentFileItem().addService(serviceDecs);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java?rev=290106&r1=290105&r2=290106&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java Mon Sep 19 03:42:43 2005
@@ -186,10 +186,10 @@
public void addService(ServiceDescription servicedesc){
- service.put(servicedesc.getName(),servicedesc);
+ service.put(servicedesc.getName().getLocalPart(),servicedesc);
}
- public ServiceDescription getService(QName serviceName){
+ public ServiceDescription getService(String serviceName){
return (ServiceDescription)service.get(serviceName);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=290106&r1=290105&r2=290106&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Mon Sep 19 03:42:43 2005
@@ -251,8 +251,8 @@
rootelementName = services.getLocalName();
if(SERVICE_ELEMENT.equals(rootelementName)){
ServiceDescription serviceDesc = engine.getCurrentFileItem().
- getService(new QName(DescriptionBuilder.getShortFileName(
- engine.getCurrentFileItem().getName())));
+ getService(DescriptionBuilder.getShortFileName(
+ engine.getCurrentFileItem().getName()));
if(serviceDesc == null){
serviceDesc = new ServiceDescription(
new QName(DescriptionBuilder.getShortFileName(
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java?rev=290106&r1=290105&r2=290106&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java Mon Sep 19 03:42:43 2005
@@ -465,9 +465,8 @@
}
} else {
- //todo fix me Deepal
-// HashMap services = configContext.getAxisConfiguration().getServices();
-// req.getSession().setAttribute(Constants.SERVICE_MAP, services);
+ HashMap services = configContext.getAxisConfiguration().getServices();
+ req.getSession().setAttribute(Constants.SERVICE_MAP, services);
}
res.sendRedirect(REMOVE_SERVICE_JSP_NAME);
}
@@ -525,7 +524,7 @@
HashMap services = configContext.getAxisConfiguration().getServices();
String wsdl = req.getParameter("wsdl");
if ((services != null) && !services.isEmpty()) {
- Object serviceObj = services.get(new QName(serviceName));
+ Object serviceObj = services.get(serviceName);
if (serviceObj != null) {
if (wsdl != null) {
res.setContentType("text/html");