You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2005/05/16 11:22:32 UTC
svn commit: r170344 -
/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment
Author: deepal
Date: Mon May 16 02:22:31 2005
New Revision: 170344
URL: http://svn.apache.org/viewcvs?rev=170344&view=rev
Log:
loading cliet.xml
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentConstants.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentConstants.java?rev=170344&r1=170343&r2=170344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentConstants.java Mon May 16 02:22:31 2005
@@ -48,6 +48,7 @@
String SERVICETAG = "service";
String SERVERST = "server";
+ String CLIENTST = "client" ;
// for serviemetadat
String PROVIDERNAME = "provider";
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?rev=170344&r1=170343&r2=170344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java Mon May 16 02:22:31 2005
@@ -190,7 +190,7 @@
InputStream in = new FileInputStream(tempfile);
axisConfig = createEngineConfig();
DeploymentParser parser = new DeploymentParser(in, this);
- parser.processGlobalConfig(axisGlobal);
+ parser.processGlobalConfig(axisGlobal , SERVERST);
} catch (FileNotFoundException e) {
throw new DeploymentException("Exception at deployment", e);
} catch (XMLStreamException e) {
@@ -203,7 +203,7 @@
new RepositoryListenerImpl(folderName, this);
}
try {
- validateServerModule();
+ validateModuleRefs();
validateSystemPredefinedPhases();
} catch (AxisFault axisFault) {
log.info("Module validation failed" + axisFault.getMessage());
@@ -230,7 +230,7 @@
try {
axisConfig = createEngineConfig();
DeploymentParser parser = new DeploymentParser(in, this);
- parser.processGlobalConfig(axisGlobal);
+ parser.processGlobalConfig(axisGlobal ,CLIENTST);
} catch (XMLStreamException e) {
throw new DeploymentException(e.getMessage());
}
@@ -238,7 +238,7 @@
hotUpdate = false;
new RepositoryListenerImpl(folderName, this);
try {
- validateServerModule();
+ validateModuleRefs();
} catch (AxisFault axisFault) {
log.info("Module validation failed" + axisFault.getMessage());
throw new DeploymentException(axisFault.getMessage());
@@ -292,7 +292,7 @@
* This methode used to check the modules referd by server.xml
* are exist , or they have deployed
*/
- private void validateServerModule() throws AxisFault {
+ private void validateModuleRefs() throws AxisFault {
Iterator itr = axisGlobal.getModules().iterator();
while (itr.hasNext()) {
QName qName = (QName) itr.next();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java?rev=170344&r1=170343&r2=170344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java Mon May 16 02:22:31 2005
@@ -90,7 +90,8 @@
/**
* To process server.xml
*/
- public void processGlobalConfig(GlobalDescription axisGlobal) throws DeploymentException {
+ public void processGlobalConfig(GlobalDescription axisGlobal , String starttag) throws DeploymentException {
+ String START_TAG = starttag;
try {
boolean END_DOCUMENT = false;
while (!END_DOCUMENT) {
@@ -101,7 +102,7 @@
break;
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String ST = pullparser.getLocalName(); //Staring tag name
- if (SERVERST.equals(ST)) {
+ if (START_TAG.equals(ST)) {
//todo complete this to fill the names
} else if (PARAMETERST.equals(ST)) {
Parameter parameter = processParameter();
@@ -185,7 +186,7 @@
}
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
String endtagname = pullparser.getLocalName();
- if (SERVERST.equals(endtagname)) {
+ if (START_TAG.equals(endtagname)) {
END_DOCUMENT = true;
break;
}