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/10/06 08:27:09 UTC
svn commit: r306544 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
deployment/ deployment/repository/util/ description/
Author: deepal
Date: Wed Oct 5 23:26:49 2005
New Revision: 306544
URL: http://svn.apache.org/viewcvs?rev=306544&view=rev
Log:
Fixing deployment bugs,
when there are multiple wsdls , and if there is no any reference to those wsdl from services.xml no need to create services for all those.
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/description/ServiceDescription.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=306544&r1=306543&r2=306544&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 Wed Oct 5 23:26:49 2005
@@ -386,7 +386,8 @@
private void addnewService(ServiceGroupDescription serviceMetaData) throws AxisFault {
- Iterator services = currentArchiveFile.getService().values().iterator();
+// Iterator services = currentArchiveFile.getService().values().iterator();
+ Iterator services = currentArchiveFile.getDeploybleServices().iterator();
while (services.hasNext()) {
ServiceDescription serviceDescription = (ServiceDescription) services.next();
loadServiceProperties(serviceDescription);
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=306544&r1=306543&r2=306544&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 Wed Oct 5 23:26:49 2005
@@ -68,6 +68,8 @@
engine.getCurrentFileItem().addService(serviceDecs);
serviceDecs.setName(new QName(serviceName));
}
+ // the service that has to be deploy
+ engine.getCurrentFileItem().getDeploybleServices().add(serviceDecs);
serviceDecs.setParent(serviceGroup);
serviceDecs.setClassLoader(engine.getCurrentFileItem().getClassLoader());
ServiceBuilder serviceBuilder = new ServiceBuilder(engine,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=306544&r1=306543&r2=306544&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 Wed Oct 5 23:26:49 2005
@@ -46,6 +46,8 @@
//in this table
private HashMap service = new HashMap();
+ private ArrayList deploybleServices = new ArrayList();
+
public ArchiveFileData(int type, String name) {
this.type = type;
this.name = name;
@@ -196,4 +198,11 @@
return service;
}
+ public ArrayList getDeploybleServices() {
+ return deploybleServices;
+ }
+
+ public void setDeploybleServices(ArrayList deploybleServices) {
+ this.deploybleServices = deploybleServices;
+ }
}
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=306544&r1=306543&r2=306544&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 Wed Oct 5 23:26:49 2005
@@ -269,6 +269,7 @@
serviceDesc.setClassLoader(engine.getCurrentFileItem().getClassLoader());
ServiceBuilder serviceBuilder = new ServiceBuilder(engine,serviceDesc);
serviceBuilder.populateService(services);
+ engine.getCurrentFileItem().getDeploybleServices().add(serviceDesc);
} else if(SERVICE_GROUP_ELEMENT.equals(rootelementName)){
ServiceGroupBuilder groupBuilder = new ServiceGroupBuilder(services,engine);
groupBuilder.populateServiceGroup(serviceGroupDesc);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java?rev=306544&r1=306543&r2=306544&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java Wed Oct 5 23:26:49 2005
@@ -36,10 +36,7 @@
import org.apache.wsdl.impl.WSDLInterfaceImpl;
import org.apache.wsdl.impl.WSDLServiceImpl;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
+import javax.wsdl.*;
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;
@@ -81,6 +78,8 @@
//to store module ref at deploy time parsing
private ArrayList mdoulesList = new ArrayList();
+
+
/**
* Constructor ServiceDescription