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 2006/05/03 08:29:43 UTC
svn commit: r399167 - in /webservices/axis2/trunk/java: etc/ modules/adb/
modules/codegen/ modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/
modules/core/ modules/core/src/org/apache/axis2/deployment/
modules/core/src/org/apache/axis2/deployme...
Author: deepal
Date: Tue May 2 23:29:39 2006
New Revision: 399167
URL: http://svn.apache.org/viewcvs?rev=399167&view=rev
Log:
-fixing http://issues.apache.org/jira/browse/AXIS2-658
http://issues.apache.org/jira/browse/AXIS2-657
- removed all snapshot dependencies
- add a method into AxisService to create a service for a given java class with schema and target namespace
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/modules/adb/project.xml
webservices/axis2/trunk/java/modules/codegen/project.xml
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/trunk/java/modules/core/project.xml
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AdminAgent.java
webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml
webservices/axis2/trunk/java/modules/integration/project.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-fileCache-enabled-axis2.xml
webservices/axis2/trunk/java/modules/java2wsdl/project.xml
webservices/axis2/trunk/java/modules/jibx/project.xml
webservices/axis2/trunk/java/modules/saaj/project.xml
webservices/axis2/trunk/java/modules/security/project.xml
webservices/axis2/trunk/java/modules/webapp/project.xml
webservices/axis2/trunk/java/modules/webapp/viewphases.jsp
webservices/axis2/trunk/java/modules/xmlbeans/project.xml
webservices/axis2/trunk/java/release-docs/release-etc/min/project.properties
webservices/axis2/trunk/java/release-docs/release-etc/std/project.properties
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Tue May 2 23:29:39 2006
@@ -117,7 +117,7 @@
xbean.version=2.1.0
xerces.version=2.7.1
xml_apis.version=1.3.02
-XmlSchema.version=SNAPSHOT
+XmlSchema.version=1.0.2
xmlsec.version=1.3.0
xmlunit.version=1.0
Modified: webservices/axis2/trunk/java/modules/adb/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/adb/project.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/project.xml (original)
+++ webservices/axis2/trunk/java/modules/adb/project.xml Tue May 2 23:29:39 2006
@@ -52,7 +52,7 @@
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
</dependency>
Modified: webservices/axis2/trunk/java/modules/codegen/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/project.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/project.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/project.xml Tue May 2 23:29:39 2006
@@ -57,7 +57,7 @@
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
</dependency>
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Tue May 2 23:29:39 2006
@@ -8,21 +8,18 @@
import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.util.PolicyUtil;
import org.apache.axis2.util.XSLTUtils;
+import org.apache.axis2.wsdl.SOAPHeaderMessage;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
import org.apache.axis2.wsdl.codegen.writer.*;
import org.apache.axis2.wsdl.databinding.TypeMapper;
-import org.apache.axis2.wsdl.i18n.CodegenMessages;
import org.apache.axis2.wsdl.util.XSLTConstants;
import org.apache.axis2.wsdl.util.XSLTIncludeResolver;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.wsdl.SOAPHeaderMessage;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.policy.Policy;
import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaExternal;
+import org.apache.ws.policy.Policy;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -43,8 +40,6 @@
import java.io.StringWriter;
import java.util.*;
-import com.ibm.wsdl.util.xml.DOM2Writer;
-
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -146,7 +141,8 @@
private Map InstantiatableFaultClassNameMap = new HashMap();
private Map faultClassNameMap = new HashMap();
- private Map instantiatableMessageClassNames = new HashMap();;
+ private Map instantiatableMessageClassNames = new HashMap();
+ ;
public AxisServiceBasedMultiLanguageEmitter() {
@@ -183,7 +179,7 @@
updateMapperClassnames(getFullyQualifiedStubName());
}
- private String getFullyQualifiedStubName(){
+ private String getFullyQualifiedStubName() {
String packageName = codeGenConfiguration.getPackageName();
String localPart = makeJavaClassName(axisService.getName());
return packageName + "." + localPart + STUB_SUFFIX;
@@ -192,30 +188,31 @@
/**
*
*/
- private void resetFaultNames(){
+ private void resetFaultNames() {
fullyQualifiedFaultClassNameMap.clear();
faultClassNameMap.clear();
}
+
/**
* Populate a map of fault class names
*/
- private void generateAndPopulateFaultNames(){
+ private void generateAndPopulateFaultNames() {
//loop through and find the faults
Iterator operations = axisService.getOperations();
AxisOperation operation;
AxisMessage faultMessage;
while (operations.hasNext()) {
- operation = (AxisOperation)operations.next();
+ operation = (AxisOperation) operations.next();
ArrayList faultMessages = operation.getFaultMessages();
for (int i = 0; i < faultMessages.size(); i++) {
- faultMessage = (AxisMessage)faultMessages.get(i);
+ faultMessage = (AxisMessage) faultMessages.get(i);
//make a unique name and put that in the hashmap
if (!fullyQualifiedFaultClassNameMap.
- containsKey(faultMessage.getElementQName())){
+ containsKey(faultMessage.getElementQName())) {
//make a name
String className = makeJavaClassName(faultMessage.getName()
+ FAULT_SUFFIX);
- while(fullyQualifiedFaultClassNameMap.containsValue(className)){
+ while (fullyQualifiedFaultClassNameMap.containsValue(className)) {
className = makeJavaClassName(className + (uniqueFaultNameCounter++));
}
@@ -247,7 +244,7 @@
// calling this method
if (mapper.isObjectMappingPresent()) {
updateMapperForStub();
- }else{
+ } else {
copyToFaultMap();
}
@@ -274,12 +271,11 @@
// write the test classes
writeTestClasses();
-
// write an ant build file
//Note that ant build is generated only once
//and that has to happen here only if the
//client side code is required
- if (!codeGenConfiguration.isGenerateAll()){
+ if (!codeGenConfiguration.isGenerateAll()) {
writeAntBuild();
}
@@ -453,7 +449,7 @@
}
private Element getUniqueListofFaults(Document doc) {
- Element rootElement = doc.createElement("fault-list");
+ Element rootElement = doc.createElement("fault-list");
Element faultElement;
QName key;
Iterator iterator = fullyQualifiedFaultClassNameMap.keySet().iterator();
@@ -463,16 +459,15 @@
//as for the name of a fault, we generate an exception
addAttribute(doc, "name",
- (String)fullyQualifiedFaultClassNameMap.get(key),
+ (String) fullyQualifiedFaultClassNameMap.get(key),
faultElement);
addAttribute(doc, "intantiatiableName",
- (String)InstantiatableFaultClassNameMap.get(key),
+ (String) InstantiatableFaultClassNameMap.get(key),
faultElement);
addAttribute(doc, "shortName",
- (String)faultClassNameMap.get(key),
+ (String) faultClassNameMap.get(key),
faultElement);
-
//the type represents the type that will be wrapped by this
//name
String typeMapping =
@@ -484,7 +479,7 @@
get(key);
addAttribute(doc, "instantiatableType",
- attribValue==null?"":attribValue,
+ attribValue == null ? "" : attribValue,
faultElement);
// add an extra attribute to say whether the type mapping is
@@ -654,27 +649,24 @@
}
/**
- *
* @return fully qualified MR name
*/
- private String getFullyQualifiedMessageReceiverName(){
+ private String getFullyQualifiedMessageReceiverName() {
String packageName = codeGenConfiguration.getPackageName();
String localPart = makeJavaClassName(axisService.getName());
- return packageName + "."+localPart + MESSAGE_RECEIVER_SUFFIX;
+ return packageName + "." + localPart + MESSAGE_RECEIVER_SUFFIX;
}
/**
- *
* @return fully qualified MR name
*/
- private String getFullyQualifiedSkeletonName(){
+ private String getFullyQualifiedSkeletonName() {
String packageName = codeGenConfiguration.getPackageName();
String localPart = makeJavaClassName(axisService.getName());
- return packageName + "."+localPart + SKELETON_CLASS_SUFFIX;
+ return packageName + "." + localPart + SKELETON_CLASS_SUFFIX;
}
/**
- *
* @throws Exception
*/
private void emitSkeletonService() throws Exception {
@@ -682,7 +674,7 @@
// calling this method
if (mapper.isObjectMappingPresent()) {
updateMapperForMessageReceiver();
- }else{
+ } else {
copyToFaultMap();
}
@@ -731,10 +723,10 @@
Hashtable schemaMappings = axisService.getSchemaMappingTable();
Iterator keys = schemaMappings.keySet().iterator();
while (keys.hasNext()) {
- Object key = keys.next();
+ Object key = keys.next();
schemaWriter.writeSchema(
- (XmlSchema)schemaMappings.get(key),
- (String)key
+ (XmlSchema) schemaMappings.get(key),
+ (String) key
);
}
@@ -744,7 +736,6 @@
wsdlWriter.writeWSDL(axisService);
-
}
private void copyToFaultMap() {
@@ -763,13 +754,13 @@
private void updateFaultPackageForStub() {
Iterator faultClassNameKeys = fullyQualifiedFaultClassNameMap.keySet().iterator();
while (faultClassNameKeys.hasNext()) {
- Object key = faultClassNameKeys.next();
- String className = (String)fullyQualifiedFaultClassNameMap.get(key);
+ Object key = faultClassNameKeys.next();
+ String className = (String) fullyQualifiedFaultClassNameMap.get(key);
//append the skelton name
String fullyQualifiedStubName = getFullyQualifiedStubName();
- fullyQualifiedFaultClassNameMap.put(key,fullyQualifiedStubName + "."
+ fullyQualifiedFaultClassNameMap.put(key, fullyQualifiedStubName + "."
+ className);
- InstantiatableFaultClassNameMap.put(key,fullyQualifiedStubName + "$"
+ InstantiatableFaultClassNameMap.put(key, fullyQualifiedStubName + "$"
+ className);
}
}
@@ -780,13 +771,13 @@
private void updateFaultPackageForSkeleton() {
Iterator faultClassNameKeys = fullyQualifiedFaultClassNameMap.keySet().iterator();
while (faultClassNameKeys.hasNext()) {
- Object key = faultClassNameKeys.next();
- String className = (String)fullyQualifiedFaultClassNameMap.get(key);
+ Object key = faultClassNameKeys.next();
+ String className = (String) fullyQualifiedFaultClassNameMap.get(key);
//append the skelton name
String fullyQualifiedSkeletonName = getFullyQualifiedSkeletonName();
- fullyQualifiedFaultClassNameMap.put(key,fullyQualifiedSkeletonName + "."
+ fullyQualifiedFaultClassNameMap.put(key, fullyQualifiedSkeletonName + "."
+ className);
- InstantiatableFaultClassNameMap.put(key,fullyQualifiedSkeletonName + "$"
+ InstantiatableFaultClassNameMap.put(key, fullyQualifiedSkeletonName + "$"
+ className);
}
}
@@ -826,7 +817,7 @@
addAttribute(doc, "name", localPart + MEPtoSuffixMap.get(mep), rootElement);
addAttribute(doc, "skeletonname", localPart + SKELETON_CLASS_SUFFIX, rootElement);
- addAttribute(doc, "skeletonInterfaceName", localPart + SKELETON_INTERFACE_SUFFIX,
+ addAttribute(doc, "skeletonInterfaceName", localPart + SKELETON_INTERFACE_SUFFIX,
rootElement);
addAttribute(doc, "basereceiver", (String) MEPtoClassMap.get(mep), rootElement);
@@ -1015,10 +1006,10 @@
while (keys.hasNext()) {
Object key = keys.next();
- String className = (String)classNameMap.get(key);
- classNameMap.put(key, fullyQulifiedIncludingClassNamePrefix +"."+ className);
+ String className = (String) classNameMap.get(key);
+ classNameMap.put(key, fullyQulifiedIncludingClassNamePrefix + "." + className);
instantiatableMessageClassNames.put(key,
- fullyQulifiedIncludingClassNamePrefix +"$"+ className);
+ fullyQulifiedIncludingClassNamePrefix + "$" + className);
}
}
@@ -1089,9 +1080,10 @@
/**
* Write the skeletonInterface
+ *
* @throws Exception
*/
- private void writeSkeletonInterface() throws Exception {
+ private void writeSkeletonInterface() throws Exception {
Document skeletonModel = createDOMDocumentForSkeletonInterface();
debugLogDocument("Document for skeleton Interface:", skeletonModel);
ClassWriter skeletonInterfaceWriter = new SkeletonInterfaceWriter(getOutputDirectory(this.codeGenConfiguration.getOutputLocation(),
@@ -1124,25 +1116,25 @@
}
private Document createDOMDocumentForSkeletonInterface() {
- Document doc = getEmptyDocument();
- Element rootElement = doc.createElement("interface");
+ Document doc = getEmptyDocument();
+ Element rootElement = doc.createElement("interface");
- String serviceName = makeJavaClassName(axisService.getName());
- addAttribute(doc, "package", codeGenConfiguration.getPackageName(), rootElement);
- addAttribute(doc, "name", serviceName + SKELETON_INTERFACE_SUFFIX, rootElement);
- addAttribute(doc, "callbackname", serviceName + CALL_BACK_HANDLER_SUFFIX,
- rootElement);
+ String serviceName = makeJavaClassName(axisService.getName());
+ addAttribute(doc, "package", codeGenConfiguration.getPackageName(), rootElement);
+ addAttribute(doc, "name", serviceName + SKELETON_INTERFACE_SUFFIX, rootElement);
+ addAttribute(doc, "callbackname", serviceName + CALL_BACK_HANDLER_SUFFIX,
+ rootElement);
- fillSyncAttributes(doc, rootElement);
- loadOperations(doc, rootElement, null);
+ fillSyncAttributes(doc, rootElement);
+ loadOperations(doc, rootElement, null);
- //attach a list of faults
- rootElement.appendChild(getUniqueListofFaults(doc));
+ //attach a list of faults
+ rootElement.appendChild(getUniqueListofFaults(doc));
- doc.appendChild(rootElement);
- return doc;
+ doc.appendChild(rootElement);
+ return doc;
- }
+ }
private boolean loadOperations(Document doc, Element rootElement, String mep) {
Element methodElement;
@@ -1289,7 +1281,6 @@
}
/**
- *
* @param doc
* @param rootElement
*/
@@ -1304,6 +1295,7 @@
/**
* debugging method - write the output to the debugger
+ *
* @param description
* @param doc
*/
@@ -1375,6 +1367,7 @@
/**
* populate the header parameters
+ *
* @param soapHeaderParameterQNameList
* @param axisOperation
* @param input
@@ -1383,7 +1376,7 @@
boolean input) {
ArrayList headerparamList = new ArrayList();
String MEP = axisOperation.getMessageExchangePattern();
- if (input){
+ if (input) {
if (isInputPresentForMEP(MEP)) {
AxisMessage inaxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
@@ -1392,7 +1385,7 @@
}
}
- }else{
+ } else {
if (isOutputPresentForMEP(MEP)) {
AxisMessage outAxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
@@ -1438,6 +1431,7 @@
/**
* Get the fault element - No header faults are supported
+ *
* @param doc
* @param operation
*/
@@ -1491,17 +1485,17 @@
AxisMessage msg;
for (int i = 0; i < faultMessages.size(); i++) {
paramElement = doc.createElement("param");
- msg = (AxisMessage)faultMessages.get(i);
+ msg = (AxisMessage) faultMessages.get(i);
//as for the name of a fault, we generate an exception
addAttribute(doc, "name",
- (String)fullyQualifiedFaultClassNameMap.get(msg.getElementQName()),
+ (String) fullyQualifiedFaultClassNameMap.get(msg.getElementQName()),
paramElement);
addAttribute(doc, "intantiatiableName",
- (String)InstantiatableFaultClassNameMap.get(msg.getElementQName()),
+ (String) InstantiatableFaultClassNameMap.get(msg.getElementQName()),
paramElement);
addAttribute(doc, "shortName",
- (String)faultClassNameMap.get(msg.getElementQName()),
+ (String) faultClassNameMap.get(msg.getElementQName()),
paramElement);
// attach the namespace and the localName
@@ -1522,7 +1516,7 @@
get(msg.getElementQName());
addAttribute(doc, "instantiatableType",
- attribValue==null?"":attribValue,
+ attribValue == null ? "" : attribValue,
paramElement);
// add an extra attribute to say whether the type mapping is
@@ -1541,7 +1535,7 @@
params.add(paramElement);
}
- return (Element[])params.toArray(new Element[params.size()]);
+ return (Element[]) params.toArray(new Element[params.size()]);
} else {
return new Element[]{};//return empty array
}
@@ -1630,7 +1624,6 @@
}
/**
- *
* @param paramType
*/
private String getParamInitializer(String paramType) {
@@ -1646,7 +1639,6 @@
}
/**
- *
* @param doc
* @param parameters
* @param location
Modified: webservices/axis2/trunk/java/modules/core/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/project.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/project.xml (original)
+++ webservices/axis2/trunk/java/modules/core/project.xml Tue May 2 23:29:39 2006
@@ -116,7 +116,7 @@
</dependency>
<!--added this to support to keep WSDL information in AxisService-->
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
</dependency>
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=399167&r1=399166&r2=399167&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 Tue May 2 23:29:39 2006
@@ -815,7 +815,7 @@
*/
private void validateSystemPredefinedPhases() throws DeploymentException {
axisConfig.setInPhasesUptoAndIncludingPostDispatch(phasesinfo.getGlobalInflow());
- axisConfig.setInFaultPhases(phasesinfo.getIN_FaultPhases());
+ axisConfig.setInFaultPhases(phasesinfo.getGlobalInFaultPhases());
axisConfig.setGlobalOutPhase(phasesinfo.getGlobalOutPhaseList());
axisConfig.setOutFaultPhases(phasesinfo.getOUT_FaultPhases());
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java Tue May 2 23:29:39 2006
@@ -160,16 +160,41 @@
}
public ArrayList getOperationInFaultPhases() throws DeploymentException {
- ArrayList oprationIN_FaultPhases = new ArrayList();
-
+ ArrayList operationINPhases = new ArrayList();
+ boolean foundDispathPhase = false;
for (int i = 0; i < IN_FaultPhases.size(); i++) {
Phase phase = (Phase) IN_FaultPhases.get(i);
-
- oprationIN_FaultPhases.add(copyPhase(phase));
+ String phaseName = phase.getPhaseName();
+ if (foundDispathPhase) {
+ operationINPhases.add(copyPhase(phase));
+ }
+ if (PhaseMetadata.PHASE_DISPATCH.equals(phaseName)) {
+ foundDispathPhase = true;
+ }
}
+ return operationINPhases;
+ }
- return oprationIN_FaultPhases;
+ public ArrayList getGlobalInFaultPhases() throws DeploymentException {
+ ArrayList globalInfaultphase = new ArrayList();
+ boolean foundDispathcPase = false;
+ for (int i = 0; i < IN_FaultPhases.size(); i++) {
+ Phase phase = (Phase) IN_FaultPhases.get(i);
+ String phaseName = phase.getPhaseName();
+ if (!foundDispathcPase) {
+ if (PhaseMetadata.PHASE_DISPATCH.equals(phaseName)) {
+ foundDispathcPase = true;
+ }
+ globalInfaultphase.add(phase);
+ }
+ }
+ if (!foundDispathcPase) {
+ throw new DeploymentException(
+ Messages.getMessage(DeploymentErrorMsgs.INVALID_PHASE));
+ }
+ return globalInfaultphase;
}
+
public ArrayList getOperationInPhases() throws DeploymentException {
ArrayList operationINPhases = new ArrayList();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Tue May 2 23:29:39 2006
@@ -37,8 +37,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaExternal;
+import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.java2wsdl.Java2WSDLConstants;
import org.apache.ws.java2wsdl.SchemaGenerator;
import org.apache.ws.java2wsdl.utils.TypeTable;
@@ -535,12 +535,13 @@
/**
* Print the WSDL with a default URL
+ *
* @param out
* @throws AxisFault
*/
public void printWSDL(OutputStream out) throws AxisFault {
//pick the endpoint and take it as the epr for the WSDL
- getWSDL(out,new String[]{getEndpoint()});
+ getWSDL(out, new String[]{getEndpoint()});
}
private void getWSDL(OutputStream out, String [] serviceURL) throws AxisFault {
@@ -1075,6 +1076,94 @@
}
+ /**
+ * To create a service for a given java class with user defined schema and target
+ * namespaces
+ *
+ * @param implClass : full name of the class
+ * @param axisConfig : currcent AxisConfgiuration
+ * @param messageReceiverClass : Messge reciver that you want to use
+ * @param targetNameSpace : Service namespace
+ * @param scheamNameSpace : Scheam Name space
+ * @return
+ * @throws AxisFault
+ */
+
+ public static AxisService createService(String implClass,
+ AxisConfiguration axisConfig,
+ Class messageReceiverClass,
+ String targetNameSpace,
+ String scheamNameSpace) throws AxisFault {
+ Parameter parameter = new Parameter(Constants.SERVICE_CLASS, implClass);
+ OMElement paraElement = Utils.getParameter(Constants.SERVICE_CLASS, implClass, false);
+ parameter.setParameterElement(paraElement);
+ AxisService axisService = new AxisService();
+ axisService.setUseDefaultChains(false);
+ axisService.addParameter(parameter);
+
+ int index = implClass.lastIndexOf(".");
+ String serviceName;
+ if (index > 0) {
+ serviceName = implClass.substring(index + 1, implClass.length());
+ } else {
+ serviceName = implClass;
+ }
+
+ axisService.setName(serviceName);
+ axisService.setClassLoader(axisConfig.getServiceClassLoader());
+
+ ClassLoader serviceClassLoader = axisService.getClassLoader();
+ SchemaGenerator schemaGenerator;
+ try {
+ schemaGenerator = new SchemaGenerator(serviceClassLoader,
+ implClass, scheamNameSpace,
+ axisService.getSchematargetNamespacePrefix());
+ ArrayList excludeOpeartion = new ArrayList();
+ excludeOpeartion.add("init");
+ excludeOpeartion.add("setOperationContext");
+ excludeOpeartion.add("destroy");
+ schemaGenerator.setExcludeMethods(excludeOpeartion);
+ axisService.addSchema(schemaGenerator.generateSchema());
+ if (targetNameSpace != null && !"".equals(targetNameSpace)) {
+ axisService.setTargetNamespace(targetNameSpace);
+ }
+ } catch (Exception e) {
+ throw new AxisFault(e);
+ }
+
+ JMethod [] method = schemaGenerator.getMethods();
+ TypeTable table = schemaGenerator.getTypeTable();
+
+ PhasesInfo pinfo = axisConfig.getPhasesInfo();
+
+ for (int i = 0; i < method.length; i++) {
+ JMethod jmethod = method[i];
+ if (!jmethod.isPublic()) {
+ // no need to expose , private and protected methods
+ continue;
+ } else if ("init".equals(jmethod.getSimpleName())) {
+ continue;
+ }
+ AxisOperation operation = Utils.getAxisOperationforJmethod(jmethod, table);
+
+ // loading message receivers
+ try {
+ MessageReceiver messageReceiver = (MessageReceiver) messageReceiverClass.newInstance();
+ operation.setMessageReceiver(messageReceiver);
+ } catch (IllegalAccessException e) {
+ throw new AxisFault("IllegalAccessException occured during message receiver loading"
+ + e.getMessage());
+ } catch (InstantiationException e) {
+ throw new AxisFault("InstantiationException occured during message receiver loading"
+ + e.getMessage());
+ }
+ pinfo.setOperationPhases(operation);
+ axisService.addOperation(operation);
+ }
+ return axisService;
+
+ }
+
public static AxisService createService(String implClass,
AxisConfiguration axisConfig) throws AxisFault {
Class clazz;
@@ -1167,19 +1256,19 @@
XmlSchemaObjectCollection includes = schema.getIncludes();
for (int j = 0; j < includes.getCount(); j++) {
Object item = includes.getItem(j);
- XmlSchema s = null;
+ XmlSchema s ;
if (item instanceof XmlSchemaExternal) {
//recursively call the calculating
XmlSchemaExternal externalSchema = (XmlSchemaExternal) item;
s = externalSchema.getSchema();
- if (s != null){
+ if (s != null) {
calcualteSchemaNames(Arrays.asList(
new XmlSchema[]{s}),
nameTable);
nameTable.put(s,
("xsd" + count++)
- +(customSchemaNameSuffix!=null?
- customSchemaNameSuffix:
+ + (customSchemaNameSuffix != null ?
+ customSchemaNameSuffix :
""));
}
@@ -1205,7 +1294,7 @@
//recursively call the name adjusting
XmlSchemaExternal xmlSchemaExternal = (XmlSchemaExternal) item;
XmlSchema s = xmlSchemaExternal.getSchema();
- if (s!=null){
+ if (s != null) {
adjustSchemaNames(Arrays.asList(
new XmlSchema[]{s}), nameTable);
xmlSchemaExternal.setSchemaLocation(
@@ -1228,7 +1317,6 @@
* Swap the key,value pairs
*
* @param originalTable
- * @return
*/
private Hashtable swapMappingTable(Hashtable originalTable) {
Hashtable swappedTable = new Hashtable(originalTable.size());
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AdminAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AdminAgent.java?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AdminAgent.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AdminAgent.java Tue May 2 23:29:39 2006
@@ -318,7 +318,7 @@
req.getSession().setAttribute(Constants.ENGAGE_STATUS, null);
req.getSession().setAttribute("modules", null);
- String serviceName = req.getParameter("service");
+ String serviceName = req.getParameter("axisService");
req.getSession().setAttribute(Constants.ENGAGE_STATUS, null);
@@ -335,7 +335,7 @@
}
}
- req.getSession().setAttribute("service", null);
+ req.getSession().setAttribute("axisService", null);
renderView(ENGAGING_MODULE_TO_SERVICE_JSP_NAME, req, res);
}
@@ -354,7 +354,7 @@
req.getSession().setAttribute(Constants.ENGAGE_STATUS, null);
req.getSession().setAttribute("modules", null);
- String serviceName = req.getParameter("service");
+ String serviceName = req.getParameter("axisService");
req.getSession().setAttribute(Constants.ENGAGE_STATUS, null);
@@ -366,7 +366,7 @@
+ " module engaged to the serviceGroup Successfully");
}
- req.getSession().setAttribute("service", null);
+ req.getSession().setAttribute("axisService", null);
renderView(ENGAGING_MODULE_TO_SERVICE_GROUP_JSP_NAME, req, res);
}
@@ -454,20 +454,8 @@
protected void processListPhases(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
- ArrayList phaselist = new ArrayList();
-
PhasesInfo info = configContext.getAxisConfiguration().getPhasesInfo();
-
- phaselist.add(info.getINPhases());
- phaselist.add(info.getIN_FaultPhases());
- phaselist.add(info.getOUTPhases());
- phaselist.add(info.getOUT_FaultPhases());
- phaselist.add(info.getOperationInPhases());
- phaselist.add(info.getOperationInFaultPhases());
- phaselist.add(info.getOperationOutPhases());
- phaselist.add(info.getOperationOutFaultPhases());
- req.getSession().setAttribute(Constants.PHASE_LIST, phaselist);
-
+ req.getSession().setAttribute(Constants.PHASE_LIST, info);
renderView(LIST_PHASES_JSP_NAME, req, res);
}
Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml Tue May 2 23:29:39 2006
@@ -46,7 +46,36 @@
<phase name="MessageOut"/>
</phaseOrder>
<phaseOrder type="INfaultflow">
- <!-- user can add his own phases to this area -->
+ <!-- System pre defined phases -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.engine.AddressingBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
<phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="Outfaultflow">
Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/project.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Tue May 2 23:29:39 2006
@@ -286,7 +286,7 @@
</properties>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
</dependency>
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml Tue May 2 23:29:39 2006
@@ -151,7 +151,35 @@
<phase name="MessageOut"/>
</phaseOrder>
<phaseOrder type="INfaultflow">
- <!-- user can add his own phases to this area -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.engine.AddressingBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
<phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="Outfaultflow">
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml Tue May 2 23:29:39 2006
@@ -109,7 +109,35 @@
<phase name="MessageOut"/>
</phaseOrder>
<phaseOrder type="INfaultflow">
- <!-- user can add his own phases to this area -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.engine.AddressingBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
<phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="Outfaultflow">
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml Tue May 2 23:29:39 2006
@@ -91,7 +91,35 @@
<phase name="MessageOut"/>
</phaseOrder>
<phaseOrder type="INfaultflow">
- <!-- user can add his own phases to this area -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.engine.AddressingBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
<phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="Outfaultflow">
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml Tue May 2 23:29:39 2006
@@ -112,7 +112,36 @@
<phase name="MessageOut"/>
</phaseOrder>
<phaseOrder type="INfaultflow">
- <!-- user can add his own phases to this area -->
+ <!-- System pre defined phases -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.engine.AddressingBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
<phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="Outfaultflow">
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-fileCache-enabled-axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-fileCache-enabled-axis2.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-fileCache-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-fileCache-enabled-axis2.xml Tue May 2 23:29:39 2006
@@ -114,7 +114,36 @@
<phase name="MessageOut"/>
</phaseOrder>
<phaseOrder type="INfaultflow">
- <!-- user can add his own phases to this area -->
+ <!-- System pre defined phases -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.engine.AddressingBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
<phase name="userphase1"/>
</phaseOrder>
<phaseOrder type="Outfaultflow">
Modified: webservices/axis2/trunk/java/modules/java2wsdl/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/java2wsdl/project.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/project.xml (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/project.xml Tue May 2 23:29:39 2006
@@ -81,7 +81,7 @@
</dependency>
<!--added this to support to keep WSDL information in AxisService-->
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
</dependency>
Modified: webservices/axis2/trunk/java/modules/jibx/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/jibx/project.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jibx/project.xml Tue May 2 23:29:39 2006
@@ -37,7 +37,7 @@
<version>${axiom.version}</version>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
</dependency>
Modified: webservices/axis2/trunk/java/modules/saaj/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/project.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/project.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/project.xml Tue May 2 23:29:39 2006
@@ -222,7 +222,7 @@
</properties>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
</dependency>
Modified: webservices/axis2/trunk/java/modules/security/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/project.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/project.xml (original)
+++ webservices/axis2/trunk/java/modules/security/project.xml Tue May 2 23:29:39 2006
@@ -218,7 +218,7 @@
</properties>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
</dependency>
Modified: webservices/axis2/trunk/java/modules/webapp/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/project.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/project.xml (original)
+++ webservices/axis2/trunk/java/modules/webapp/project.xml Tue May 2 23:29:39 2006
@@ -68,7 +68,7 @@
</properties>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
</dependency>
Modified: webservices/axis2/trunk/java/modules/webapp/viewphases.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/viewphases.jsp?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/viewphases.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/viewphases.jsp Tue May 2 23:29:39 2006
@@ -26,18 +26,18 @@
<%@ page import="org.apache.axis2.Constants,
org.apache.axis2.engine.Phase,
java.util.ArrayList"%>
+ <%@ page import="org.apache.axis2.deployment.util.PhasesInfo"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:include page="include/adminheader.jsp"></jsp:include>
<h1>Available Phases</h1>
<%
- ArrayList phases = (ArrayList)request.getSession().getAttribute(Constants.PHASE_LIST);
+ PhasesInfo phases = (PhasesInfo)request.getSession().getAttribute(Constants.PHASE_LIST);
request.getSession().setAttribute(Constants.PHASE_LIST,null);
- ArrayList tempList;
+ ArrayList tempList = phases.getGlobalInflow();
%><h2><font color="blue">System Pre-defined Phases</font></h2>
<b>InFlow Up to Dispatcher</b>
<blockquote>
<%
- tempList = (ArrayList)phases.get(0);
for (int i = 0; i < tempList.size(); i++) {
Phase phase = (Phase) tempList.get(i);
%><%=phase.getPhaseName()%><br><%
@@ -46,40 +46,40 @@
</blockquote>
<b>InFaultFlow </b>
<blockquote>
-<%-- <%--%>
-<%-- tempList = (ArrayList)phases.get(1);--%>
-<%-- for (int i = 0; i < tempList.size(); i++) {--%>
-<%-- String phase = (String) tempList.get(i);--%>
-<%-- %><%=phase%><br><%--%>
-<%-- }--%>
-<%-- %>--%>
+ <%
+ tempList = phases.getGlobalInFaultPhases();
+ for (int i = 0; i < tempList.size(); i++) {
+ Phase phase = (Phase) tempList.get(i);
+ %><%=phase.getPhaseName()%><br><%
+ }
+ %>
</blockquote>
<b>OutFlow </b>
<blockquote>
-<%-- <%--%>
-<%-- tempList = (ArrayList)phases.get(2);--%>
-<%-- for (int i = 0; i < tempList.size(); i++) {--%>
-<%-- String phase = (String) tempList.get(i);--%>
-<%-- %><%=phase%><br><%--%>
-<%-- }--%>
-<%-- %>--%>
+ <%
+ tempList = phases.getGlobalOutPhaseList();
+ for (int i = 0; i < tempList.size(); i++) {
+ Phase phase = (Phase) tempList.get(i);
+ %><%=phase.getPhaseName()%><br><%
+ }
+ %>
</blockquote>
<b>OutFaultFlow </b>
<blockquote>
-<%-- <%--%>
-<%-- tempList = (ArrayList)phases.get(3);--%>
-<%-- for (int i = 0; i < tempList.size(); i++) {--%>
-<%-- String phase = (String) tempList.get(i);--%>
-<%-- %><%=phase%><br><%--%>
-<%-- }--%>
-<%-- %>--%>
+ <%
+ tempList = phases.getOUT_FaultPhases();
+ for (int i = 0; i < tempList.size(); i++) {
+ Phase phase = (Phase) tempList.get(i);
+ %><%=phase.getPhaseName()%><br><%
+ }
+ %>
</blockquote>
<br>
<h2><font color="blue">User Defined Phases</font></h2>
<b>Inflow after Dispatcher</b>
<blockquote>
<%
- tempList = (ArrayList)phases.get(4);
+ tempList = phases.getOperationInPhases();
for (int i = 0; i < tempList.size(); i++) {
Phase phase = (Phase) tempList.get(i);
%><%=phase.getPhaseName()%><br><%
@@ -89,7 +89,7 @@
<b>InFaultFlow after Dispatcher</b>
<blockquote>
<%
- tempList = (ArrayList)phases.get(5);
+ tempList = phases.getOperationInFaultPhases();
for (int i = 0; i < tempList.size(); i++) {
Phase phase = (Phase) tempList.get(i);
%><%=phase.getPhaseName()%><br><%
@@ -99,7 +99,7 @@
<b>OutFlow </b>
<blockquote>
<%
- tempList = (ArrayList)phases.get(6);
+ tempList = phases.getOperationOutPhases();
for (int i = 0; i < tempList.size(); i++) {
Phase phase = (Phase) tempList.get(i);
%><%=phase.getPhaseName()%><br><%
@@ -109,7 +109,7 @@
<b>OutFaultFlow </b>
<blockquote>
<%
- tempList = (ArrayList)phases.get(7);
+ tempList = phases.getOperationOutFaultPhases();
for (int i = 0; i < tempList.size(); i++) {
Phase phase = (Phase) tempList.get(i);
%><%=phase.getPhaseName()%><br><%
Modified: webservices/axis2/trunk/java/modules/xmlbeans/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xmlbeans/project.xml?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/project.xml (original)
+++ webservices/axis2/trunk/java/modules/xmlbeans/project.xml Tue May 2 23:29:39 2006
@@ -60,7 +60,7 @@
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
</dependency>
Modified: webservices/axis2/trunk/java/release-docs/release-etc/min/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/release-docs/release-etc/min/project.properties?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/release-docs/release-etc/min/project.properties (original)
+++ webservices/axis2/trunk/java/release-docs/release-etc/min/project.properties Tue May 2 23:29:39 2006
@@ -96,7 +96,7 @@
xbean.version=2.1.0
xerces.version=2.7.1
xml_apis.version=1.3.02
-XmlSchema.version=SNAPSHOT
+XmlSchema.version=1.0.2
xmlsec.version=1.3.0
xmlunit.version=1.0
Modified: webservices/axis2/trunk/java/release-docs/release-etc/std/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/release-docs/release-etc/std/project.properties?rev=399167&r1=399166&r2=399167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/release-docs/release-etc/std/project.properties (original)
+++ webservices/axis2/trunk/java/release-docs/release-etc/std/project.properties Tue May 2 23:29:39 2006
@@ -107,7 +107,7 @@
xbean.version=2.1.0
xerces.version=2.7.1
xml_apis.version=1.3.02
-XmlSchema.version=SNAPSHOT
+XmlSchema.version=1.0.2
xmlsec.version=1.3.0
xmlunit.version=1.0