Author: dims
Date: Wed Aug 2 12:20:02 2006
New Revision: 428099
URL: http://svn.apache.org/viewvc?rev=428099&view=rev
Log:
- Throw a DeploymentException if the configuration file does not have
<axisconfig> root element
- Get rid of phasesinfo from DeploymentEngine
- Fix typo (setPhasesinfo -> setPhasesInfo)
Modified:
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
Modified:
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties?rev=428099&r1=428098&r2=428099&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
(original)
+++
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
Wed Aug 2 12:20:02 2006
@@ -171,6 +171,7 @@
nomoduledirfound=no modules directory found , new one created
confdirnotfound=conf directory not found , and no axis2.xml file is given !
System will continue using default_axis2.xml
noaxis2xmlfound=axis2.xml file not found in conf directory , system will
continue using default_axis2.xml
+badelementfound=Looking for ''{0}'' element, but found ''{1}''
messagelabelcannotfound=message lebel can not be null
paramterlockedbyparent=Parameter: {0} is already locked, hence value cannot be
overridden
modulealredyengaged={0} module has already engaged to the operation operation
terminated !!!
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=428099&r1=428098&r2=428099&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
Wed Aug 2 12:20:02 2006
@@ -57,6 +57,9 @@
try {
OMElement config_element = buildOM();
+ if(!TAG_AXISCONFIG.equals(config_element.getLocalName())) {
+ throw new
DeploymentException(Messages.getMessage("badelementfound",TAG_AXISCONFIG,config_element.getLocalName()));
+ }
// processing Parameters
// Processing service level parameters
Iterator itr = config_element.getChildrenWithName(new
QName(TAG_PARAMETER));
@@ -257,7 +260,7 @@
* @param phaserders
*/
private void processPhaseOrders(Iterator phaserders) throws
DeploymentException {
- PhasesInfo info = engine.getPhasesinfo();
+ PhasesInfo info = axisConfig.getPhasesInfo();
while (phaserders.hasNext()) {
OMElement phaseOrders = (OMElement) phaserders.next();
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=428099&r1=428098&r2=428099&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
Wed Aug 2 12:20:02 2006
@@ -33,6 +33,7 @@
int TYPE_DEFAULT= -1; // is it a service
int TYPE_MODULE = 1; // is it a module
+ String TAG_AXISCONFIG = "axisconfig";
String TAG_PHASE_ORDER = "phaseOrder";
String TAG_PHASE = "phase";
String TAG_PARAMETER = "parameter";
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=428099&r1=428098&r2=428099&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 Aug 2 12:20:02 2006
@@ -63,7 +63,6 @@
* Stores all the web Services to undeploy.
*/
private List wsToUnDeploy = new ArrayList();
- private PhasesInfo phasesinfo = new PhasesInfo(); // to store phases
list in axis2.xml
/**
* Stores the module specified in the server.xml at the document parsing
time.
@@ -514,7 +513,6 @@
throws DeploymentException {
AxisModule axismodule;
try {
- this.setPhasesinfo(config.getPhasesInfo());
currentArchiveFile = new ArchiveFileData(modulearchive,
TYPE_MODULE, false);
axismodule = new AxisModule();
ArchiveReader archiveReader = new ArchiveReader();
@@ -612,7 +610,7 @@
Iterator operations =
service.getOperations();
while (operations.hasNext()) {
AxisOperation axisOperation =
(AxisOperation) operations.next();
-
phasesinfo.setOperationPhases(axisOperation);
+
axisConfig.getPhasesInfo().setOperationPhases(axisOperation);
}
}
}
@@ -769,7 +767,6 @@
axisConfig = new AxisConfiguration();
AxisConfigBuilder builder = new AxisConfigBuilder(in, this,
axisConfig);
builder.populateConfig();
- axisConfig.setPhasesinfo(phasesinfo);
try {
if (in != null) {
in.close();
@@ -816,10 +813,11 @@
* @throws DeploymentException
*/
private void validateSystemPredefinedPhases() throws DeploymentException {
-
axisConfig.setInPhasesUptoAndIncludingPostDispatch(phasesinfo.getGlobalInflow());
- axisConfig.setInFaultPhases(phasesinfo.getGlobalInFaultPhases());
- axisConfig.setGlobalOutPhase(phasesinfo.getGlobalOutPhaseList());
- axisConfig.setOutFaultPhases(phasesinfo.getOUT_FaultPhases());
+ PhasesInfo phasesInfo = axisConfig.getPhasesInfo();
+
axisConfig.setInPhasesUptoAndIncludingPostDispatch(phasesInfo.getGlobalInflow());
+ axisConfig.setInFaultPhases(phasesInfo.getGlobalInFaultPhases());
+ axisConfig.setGlobalOutPhase(phasesInfo.getGlobalOutPhaseList());
+ axisConfig.setOutFaultPhases(phasesInfo.getOUT_FaultPhases());
}
/**
@@ -860,10 +858,6 @@
return axisConfig.getModule(moduleName);
}
- public PhasesInfo getPhasesinfo() {
- return phasesinfo;
- }
-
public boolean isHotUpdate() {
return hotUpdate;
}
@@ -949,10 +943,6 @@
antiJARLocking = true;
}
}
- }
-
- public void setPhasesinfo(PhasesInfo phasesinfo) {
- this.phasesinfo = phasesinfo;
}
/**
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=428099&r1=428098&r2=428099&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
Wed Aug 2 12:20:02 2006
@@ -695,7 +695,7 @@
outFaultPhases = list;
}
- public void setPhasesinfo(PhasesInfo phasesInfo) {
+ public void setPhasesInfo(PhasesInfo phasesInfo) {
this.phasesinfo = phasesInfo;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
