If -l or -h -p -s are not set, the
* AdminClient will invoke
- * http://localhost:8080/axis/servlet/AxisServlet.
http://localhost:8080/axis/servlet/AxisServlet.
+ *
* outputs XML result or null in case of failure. In the case of multiple
* commands, the XML results will be concatenated, separated by \n
*
diff --git a/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamItem.java b/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamItem.java
index 35de41cfeb..6051cac5b9 100644
--- a/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamItem.java
+++ b/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamItem.java
@@ -16,7 +16,7 @@
package org.apache.axis.tools.ant.foreach;
/**
- * Inner class stores
* The safe way to use this task is to have it generate the java source in
- * a build directory, then have a <copy> task selectively copy the
+ * a build directory, then have a <copy> task selectively copy the
* files you need into a safe location. Again, copying into the source tree
* is dangerous, but a separate build/src tree is safe. Then include this
* separate tree in the <javac> task's src attribute to include it in the
diff --git a/axis-ant/src/site/site.xml b/axis-ant/src/site/site.xml
index 7da4ca3181..5690e9b05d 100644
--- a/axis-ant/src/site/site.xml
+++ b/axis-ant/src/site/site.xml
@@ -17,16 +17,18 @@
~ specific language governing permissions and limitations
~ under the License.
-->
- Call a target foreach entry in a set of parameters based on a fileset. For Axis development; there is no support or stability associated with this task Really this just a wrapper around "AntCall" param (org.apache.axis.tools.ant.foreach.ParamSet) Ant task for starting / stopping servers and running junit in the middle. Based on the Cactus org.apache.commons.cactus.ant package, heavily munged and cruftily dumped into one file. For Axis development; there is no support or stability associated with this task
* This method will time out after the number of milliseconds specified
* by our timeoutms member.
*
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/GeneratedFileInfo.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/GeneratedFileInfo.java
index 2eb2ff895a..cc1871ca5e 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/GeneratedFileInfo.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/GeneratedFileInfo.java
@@ -145,8 +145,7 @@ public List findType(String type) {
/**
* Lookup an entry by file name
*
- * @param file name you want info about
- * @param fileName
+ * @param fileName name you want info about
* @return The entry for the file name specified. Null if not found
*/
public Entry findName(String fileName) {
@@ -166,8 +165,7 @@ public Entry findName(String fileName) {
/**
* Lookup an entry by class name
*
- * @param class name you want info about
- * @param className
+ * @param className name you want info about
* @return The entry for the class specified. Null if not found
*/
public Entry findClass(String className) {
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanFaultWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanFaultWriter.java
index 04c102346e..8548dbf33b 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanFaultWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanFaultWriter.java
@@ -36,7 +36,7 @@ public class JavaBeanFaultWriter extends JavaBeanWriter {
* that may potentially conflict with those that would be generated by
* this class for an XSD complex type used as a fault. The following
* immutable object contains all property names that must be excluded
- * when generating a service specific exception. Note:
+ * when generating a service specific exception. Note:
* {@link org.apache.axis.encoding.ser.BeanSerializer} always excludes
*
* NOTE: This function is written in JavaFaultWriter.java also.
*
* @param pw
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
index 61343ecbb6..368279557a 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
@@ -32,7 +32,7 @@
import java.util.Set;
/**
- * This is Wsdl2java's Helper Type Writer. It writes the For example, when Emitter calls JavaWriterFactory for a Binding Writer, it
* returns a JavaBindingWriter. JavaBindingWriter, in turn, contains a
* JavaStubWriter, JavaSkelWriter, and JavaImplWriter since a Binding may cause
* a stub, skeleton, and impl template to be generated.
- * Note that the writers that are given to Emitter by JavaWriterFactory DO NOT
* extend JavaWriter. They simply implement Writer and delegate the actual
* task of writing to extensions of JavaWriter.
- * All of Wsdl2java's Writer implementations follow a common behaviour.
* JavaWriter is the abstract base class that dictates this common behaviour.
* Many of the files generated are .java files, so this abstract class -
@@ -79,7 +76,7 @@
*
* Additional behaviour that JavaClassWriter introduces beyond JavaWriter is
* related to the class header and definition:
*
* NOTE: This only writes simple type faults, the JavaTypeWriter emits
* faults that are complex types.
*/
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
index 4e44e9580c..8b67fa6d04 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
@@ -64,7 +64,7 @@
* This is Wsdl2java's implementation of the GeneratorFactory
*/
public class JavaGeneratorFactory implements GeneratorFactory {
- private static final Log log_ =
+ private static final Log log =
LogFactory.getLog(JavaGeneratorFactory.class.getName());
/** Field emitter */
@@ -450,6 +450,10 @@ public void generate() throws IOException {
gen.generate();
}
} // generate
+
+ public String toString() {
+ return "Writers[baseWriter=" + baseWriter + ",writers=" + writers + ",entry.name=" + (entry == null ? "N/A" : entry.getName()) + "]";
+ }
} // class Writers
/**
@@ -459,6 +463,9 @@ public void generate() throws IOException {
* @param generator
*/
public void addGenerator(Class wsdlClass, Class generator) {
+ if (log.isDebugEnabled()) {
+ log.debug("Adding generator for " + wsdlClass.getName() + ": " + generator.getName());
+ }
// This is just a hack right now... it just works with Service
if (Message.class.isAssignableFrom(wsdlClass)) {
@@ -805,10 +812,7 @@ private void setFaultContext(FaultInfo fault, SymbolTable symbolTable) {
} else {
// Complex Type Exception
- Boolean isComplexFault = (Boolean) te.getDynamicVar(
- JavaGeneratorFactory.COMPLEX_TYPE_FAULT);
-
- if ((isComplexFault == null) || !isComplexFault.booleanValue()) {
+ if (!Utils.isFaultComplex(te)) {
// Mark the type as a complex type fault
te.setDynamicVar(JavaGeneratorFactory.COMPLEX_TYPE_FAULT,
@@ -1011,7 +1015,9 @@ protected void resolveNameClashes(SymbolTable symbolTable) {
if (v.elementAt(index) instanceof MessageEntry) {
// Need to resolve a Exception message.
MessageEntry msgEntry = (MessageEntry) v.elementAt(index);
- if (msgEntry.getDynamicVar(EXCEPTION_CLASS_NAME) == null) {
+ // AXIS-2900: Only simple type faults generate additional classes; message entries for
+ // complex type faults don't cause any collisions.
+ if (Utils.isFaultComplex(msgEntry) || msgEntry.getDynamicVar(EXCEPTION_CLASS_NAME) == null) {
v.removeElementAt(index);
} else {
index++;
@@ -1089,7 +1095,7 @@ protected void resolveNameClashes(SymbolTable symbolTable) {
SymTabEntry entry = (SymTabEntry) v.elementAt(i);
if (entry instanceof Element) {
- entry.setName(mangleName(entry.getName(), ELEMENT_SUFFIX));
+ mangleName(entry, ELEMENT_SUFFIX);
// If this global element was defined using
// an anonymous type, then need to change the
@@ -1153,13 +1159,8 @@ && sameJavaClass(entry.getName(),
}
// Appended Suffix for avoiding name collisions (JAX-RPC 1.1)
- Boolean isComplexTypeFault = (Boolean)entry.getDynamicVar(COMPLEX_TYPE_FAULT);
- if ((isComplexTypeFault != null) && isComplexTypeFault.booleanValue()) {
- entry.setName(mangleName(entry.getName(), EXCEPTION_SUFFIX));
- }
- else {
- entry.setName(mangleName(entry.getName(), TYPE_SUFFIX));
- }
+ boolean isComplexTypeFault = Utils.isFaultComplex(entry);
+ mangleName(entry, isComplexTypeFault ? EXCEPTION_SUFFIX : TYPE_SUFFIX);
// should update the class name of ElementEntry which references this type entry
Map elementIndex = symbolTable.getElementIndex();
@@ -1173,13 +1174,12 @@ && sameJavaClass(entry.getName(),
}
// Need to resolve a complex-type exception message.
- if ((isComplexTypeFault != null) && isComplexTypeFault.booleanValue()) {
+ if (isComplexTypeFault) {
// SHOULD update the exception class name of a referencing message entry.
List messageEntries = symbolTable.getMessageEntries();
for (int j = 0; j < messageEntries.size(); j++) {
MessageEntry messageEntry = (MessageEntry)messageEntries.get(j);
- Boolean isComplexTypeFaultMsg = (Boolean)messageEntry.getDynamicVar(COMPLEX_TYPE_FAULT);
- if ((isComplexTypeFaultMsg != null) && (isComplexTypeFaultMsg.booleanValue())) {
+ if (Utils.isFaultComplex(messageEntry)) {
QName exceptionDataType = (QName)messageEntry.getDynamicVar(EXCEPTION_DATA_TYPE);
if (((TypeEntry)entry).getQName().equals(exceptionDataType)) {
String className = (String)messageEntry.getDynamicVar(EXCEPTION_CLASS_NAME);
@@ -1190,13 +1190,11 @@ && sameJavaClass(entry.getName(),
}
}
} else if (entry instanceof PortTypeEntry) {
- entry.setName(mangleName(entry.getName(), PORT_TYPE_SUFFIX)); // "_Port" --> "_PortType" for JAX-RPC 1.1
+ mangleName(entry, PORT_TYPE_SUFFIX); // "_Port" --> "_PortType" for JAX-RPC 1.1
} else if (entry instanceof ServiceEntry) {
- entry.setName(mangleName(entry.getName(), SERVICE_SUFFIX));
+ mangleName(entry, SERVICE_SUFFIX);
} else if (entry instanceof MessageEntry) {
- Boolean complexTypeFault =
- (Boolean) entry.getDynamicVar(COMPLEX_TYPE_FAULT);
- if ((complexTypeFault == null) || !complexTypeFault.booleanValue()) {
+ if (!Utils.isFaultComplex(entry)) {
String exceptionClassName = (String) entry.getDynamicVar(EXCEPTION_CLASS_NAME);
entry.setDynamicVar(EXCEPTION_CLASS_NAME, exceptionClassName + EXCEPTION_SUFFIX);
}
@@ -1214,8 +1212,7 @@ else if (entry instanceof BindingEntry) {
// named after the binding name, so there is the
// possibility of a name clash.
if (bEntry.hasLiteral()) {
- entry.setName(mangleName(entry.getName(),
- BINDING_SUFFIX));
+ mangleName(entry, BINDING_SUFFIX);
}
}
}
@@ -1225,23 +1222,31 @@ else if (entry instanceof BindingEntry) {
} // resolveNameClashes
/**
- * Change the indicated type name into a mangled form using the mangle string.
+ * Change the type name of the given symbol table entry into a mangled
+ * form using the given suffix.
*
- * @param name
- * @param mangle
- * @return
+ * @param entry
+ * @param suffix
*/
- private String mangleName(String name, String mangle) {
+ private void mangleName(SymTabEntry entry, String suffix) {
+ String name = entry.getName();
int index = name.indexOf("[");
+ String newName;
if (index >= 0) {
String pre = name.substring(0, index);
String post = name.substring(index);
- return pre + mangle + post;
+ newName = pre + suffix + post;
} else {
- return name + mangle;
+ newName = name + suffix;
+ }
+
+ entry.setName(newName);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Symbol table of type " + entry.getClass().getName() + " mangled: " + name + " -> " + newName);
}
}
@@ -1619,20 +1624,20 @@ public String getBaseName(QName qNameIn) {
/**
* Determines whether the QName supplied should be generated by comparing
* the namespace for the QName against the included and excluded names.
- For example, when Emitter calls JavaWriterFactory for a Binding Writer, it
* returns a JavaBindingWriter. JavaBindingWriter, in turn, contains a
* JavaStubWriter, JavaSkelWriter, and JavaImplWriter since a Binding may cause
* a stub, skeleton, and impl template to be generated.
- * Note that the writers that are given to Emitter by JavaWriterFactory DO NOT
* extend JavaWriter. They simply implement Writer and delegate the actual
* task of writing to extensions of JavaWriter.
- * All of Wsdl2java's Writer implementations follow a common behaviour.
* JavaWriter is the abstract base class that dictates this common behaviour.
* This behaviour is primarily placed within the generate method. The generate
@@ -76,6 +75,7 @@
*
* Foo var = string returned
- *
* Handles basic java types (int, float, etc), wrapper types (Integer, etc)
* and certain java.math (BigDecimal, BigInteger) types.
* Will also handle all Axis specific types (org.apache.axis.types.*)
- *
* Caller should expect to wrap the construction in a try/catch block
* if bThrow is set to true.
*
diff --git a/axis-codegen/src/site/site.xml b/axis-codegen/src/site/site.xml
new file mode 100644
index 0000000000..18866594ab
--- /dev/null
+++ b/axis-codegen/src/site/site.xml
@@ -0,0 +1,24 @@
+
+
+ Type: Type: Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- *
- *
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#eNS_URI
- * @see #init()
- * @generated
- */
- private SOAPPackageImpl() {
- super(eNS_URI, ((EFactory)SOAPFactory.INSTANCE));
- }
-
- /**
- *
- *
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
- *
- * This method is used to initialize {@link SOAPPackageImpl#eINSTANCE} when that field is accessed.
- * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
- *
- *
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static SOAPPackageImpl init() {
- if (isInited) return (SOAPPackageImpl)EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI);
-
- // Obtain or create and register package
- SOAPPackageImpl theSOAPPackage = (SOAPPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SOAPPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SOAPPackageImpl());
-
- isInited = true;
-
- // Obtain or create and register interdependencies
- WSDDPackageImpl theWSDDPackage = (WSDDPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI) instanceof WSDDPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI) : WSDDPackageImpl.eINSTANCE);
- XmlPackageImpl theXmlPackage = (XmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI) instanceof XmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI) : XmlPackageImpl.eINSTANCE);
-
- // Create package meta-data objects
- theSOAPPackage.createPackageContents();
- theWSDDPackage.createPackageContents();
- theXmlPackage.createPackageContents();
-
- // Initialize created meta-data
- theSOAPPackage.initializePackageContents();
- theWSDDPackage.initializePackageContents();
- theXmlPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theSOAPPackage.freeze();
-
-
- // Update the registry and return the package
- EPackage.Registry.INSTANCE.put(SOAPPackageImpl.eNS_URI, theSOAPPackage);
- return theSOAPPackage;
- }
-
-
- /**
- * Returns the meta object for data type '{@link org.apache.axis.constants.Use Use}'.
- *
- *
- * @return the meta object for data type 'Use'.
- * @see org.apache.axis.constants.Use
- * @model instanceClass="org.apache.axis.constants.Use"
- * @generated
- */
- public EDataType getUse() {
- return useEDataType;
- }
-
- /**
- * Returns the meta object for data type '{@link org.apache.axis.constants.Style Style}'.
- *
- *
- * @return the meta object for data type 'Style'.
- * @see org.apache.axis.constants.Style
- * @model instanceClass="org.apache.axis.constants.Style"
- * @generated
- */
- public EDataType getStyle() {
- return styleEDataType;
- }
-
- /**
- * Returns the factory that creates the instances of the model.
- *
- *
- * @return the factory that creates the instances of the model.
- * @generated
- */
- public SOAPFactory getSOAPFactory() {
- return (SOAPFactory)getEFactoryInstance();
- }
-
- /**
- *
- *
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- *
- *
- * @generated
- */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create data types
- useEDataType = createEDataType(USE);
- styleEDataType = createEDataType(STYLE);
- }
-
- /**
- *
- *
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- *
- *
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Initialize data types
- initEDataType(useEDataType, Use.class, "Use", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
- initEDataType(styleEDataType, Style.class, "Style", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
- // Create resource
- createResource(eNS_URI);
- }
-
- /**
- *
- * Defines literals for the meta objects that represent
- *
- * The following features are supported:
- *
- * If the meaning of the 'Inner Type' attribute isn't clear,
- * there really should be more of a description here...
- *
- * The following features are supported:
- *
- * If the meaning of the 'Request Flow' reference isn't clear,
- * there really should be more of a description here...
- *
- * If the meaning of the 'Response Flow' reference isn't clear,
- * there really should be more of a description here...
- *
- * The following features are supported:
- *
- * If the meaning of the 'Name' attribute isn't clear,
- * there really should be more of a description here...
- *
- * If the meaning of the 'Global Configuration' containment reference isn't clear,
- * there really should be more of a description here...
- *
- * If the meaning of the 'Handlers' reference list isn't clear,
- * there really should be more of a description here...
- *
- * If the meaning of the 'Transports' reference list isn't clear,
- * there really should be more of a description here...
- *
- * If the meaning of the 'Services' containment reference list isn't clear,
- * there really should be more of a description here...
- *
- * The following features are supported:
- *
- * If the meaning of the 'Name' attribute isn't clear,
- * there really should be more of a description here...
- *
- * If the meaning of the 'Qname' attribute isn't clear,
- * there really should be more of a description here...
- *
- * If the meaning of the 'Class' attribute isn't clear,
- * there really should be more of a description here...
- *
- * If the meaning of the 'Type' attribute isn't clear,
- * there really should be more of a description here...
- *
- * The following features are supported:
- *
- * If the meaning of the 'Handlers' reference list isn't clear,
- * there really should be more of a description here...
- *
- * The following features are supported:
- *
+ Added a "type" attribute that works precisely like
+ its equivalent in ExecuteOn. It allows
+ the user to specify whether directories, files, or
+ both directories and files from the filesets are
+ included as entries in the parameter set.
+
+
+
+
+ Attribute
+ Description
+ Type
+
+
+ fork
+ If true, forks the ant invocation.
+ boolean
+
+
+ inheritall
+ If true, pass all properties to the new Ant project. Defaults to true.
+ boolean
+
+
+ inheritrefs
+ If true, pass all references to the new Ant project. Defaults to false
+ boolean
+
+
+ target
+ Target to execute, required.
+ java.lang.String
+
+
+verbose
+ Enable verbose output when signing ; optional: default false
+ boolean
+
+
+
+
+
+ Attribute
+ Description
+ Type
+
+
+ httpservertarget
+ Sets the target to call to start server 2.
+ java.lang.String
+
+
+ httpstoptarget
+ Sets the stop target. This is the target which does a HTTP admin shutdown on the simple server.
+ java.lang.String
+
+
+ tcpservertarget
+ Sets the target to call to start server 1.
+ java.lang.String
+
+
+ testtarget
+ Sets the target to call to run the tests.
+ java.lang.String
+
+
+url
+ Sets the target URL (just http://host:port)
+ java.lang.String
+ Throwable's and AxisFault's properties
* when marshalling a service Java exception.
@@ -95,7 +95,7 @@ protected JavaBeanFaultWriter(Emitter emitter, TypeEntry type,
/**
* Returns the appropriate extends text
*
- * @return "" or " extends
@@ -136,7 +133,7 @@ protected JavaClassWriter(Emitter emitter, String fullClassName,
/**
* Return the file name as a string of the form:
- * "
*/
public abstract class JavaWriter implements Generator {
+ private static final Log log = LogFactory.getLog(JavaWriter.class.getName());
/** This controls how many characters per line for javadoc comments */
protected final static int LINE_LENGTH = 65;
@@ -121,6 +121,10 @@ public void generate() throws IOException {
}
}
+ if (log.isDebugEnabled()) {
+ log.debug("Start generating file " + file);
+ }
+
PrintWriter pw = getPrintWriter(file);
writeFileHeader(pw);
@@ -162,7 +166,7 @@ protected void registerFile(String file) {
} // registerFile
/**
- * Return the string: "Generating
-
+ *
+ * @param qName
+ * @return
*/
protected boolean include(QName qName) {
String namespace =
@@ -1650,7 +1655,7 @@ protected boolean include(QName qName) {
doInclude = true;
}
else {
- log_.info(
+ log.info(
"excluding code generation for non-included QName:" + qName);
}
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaHolderWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaHolderWriter.java
index 636b13b696..08e5e41a51 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaHolderWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaHolderWriter.java
@@ -23,7 +23,7 @@
import java.io.PrintWriter;
/**
- * This is Wsdl2java's Holder Writer. It writes the java.lang.String
+ * java.lang.String
*/
public static final String USERNAME_PROPERTY =
"javax.xml.rpc.security.auth.username";
@@ -126,7 +126,7 @@ public interface Call {
* @param parameterMode Mode of the parameter-whether
* ParameterMode.IN,
* ParameterMode.OUT,
- * or ParameterMode.INOUT
+ * or ParameterMode.INOUT
* @throws JAXRPCException This exception may
* be thrown if the method isParameterAndReturnSpecRequired
* returns false for this operation.
diff --git a/axis-jaxrpc/src/site/site.xml b/axis-jaxrpc/src/site/site.xml
new file mode 100644
index 0000000000..18866594ab
--- /dev/null
+++ b/axis-jaxrpc/src/site/site.xml
@@ -0,0 +1,24 @@
+
+
+
- *
- *
- * @see org.apache.axis.model.soap.SOAPFactory
- * @model kind="package"
- * @generated
- */
-public class SOAPPackageImpl extends EPackageImpl {
- /**
- * The package name.
- *
- *
- * @generated
- */
- public static final String eNAME = "soap";
-
- /**
- * The package namespace URI.
- *
- *
- * @generated
- */
- public static final String eNS_URI = "http://axis.apache.org/emf/soap";
-
- /**
- * The package namespace name.
- *
- *
- * @generated
- */
- public static final String eNS_PREFIX = "soap";
-
- /**
- * The singleton instance of the package.
- *
- *
- * @generated
- */
- public static final SOAPPackageImpl eINSTANCE = org.apache.axis.model.soap.impl.SOAPPackageImpl.init();
-
- /**
- * The meta object id for the 'Use' data type.
- *
- *
- * @see org.apache.axis.constants.Use
- * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getUse()
- * @generated
- */
- public static final int USE = 0;
-
- /**
- * The meta object id for the 'Style' data type.
- *
- *
- * @see org.apache.axis.constants.Style
- * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getStyle()
- * @generated
- */
- public static final int STYLE = 1;
-
- /**
- *
- *
- * @generated
- */
- private EDataType useEDataType = null;
-
- /**
- *
- *
- * @generated
- */
- private EDataType styleEDataType = null;
-
- /**
- * Creates an instance of the model Package, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- *
- *
- *
- * @generated
- */
- public interface Literals {
- /**
- * The meta object literal for the 'Use' data type.
- *
- *
- * @see org.apache.axis.constants.Use
- * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getUse()
- * @generated
- */
- public static final EDataType USE = eINSTANCE.getUse();
-
- /**
- * The meta object literal for the 'Style' data type.
- *
- *
- * @see org.apache.axis.constants.Style
- * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getStyle()
- * @generated
- */
- public static final EDataType STYLE = eINSTANCE.getStyle();
-
- }
-
-} //SOAPPackageImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLHelper.java b/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLHelper.java
index 3b834c1c9e..f383b7b756 100644
--- a/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLHelper.java
+++ b/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLHelper.java
@@ -22,6 +22,9 @@
import javax.xml.namespace.QName;
+import org.apache.axis.constants.Style;
+import org.apache.axis.constants.Use;
+import org.apache.axis.model.soap.impl.SOAPPackageImpl;
import org.apache.axis.model.xml.impl.XmlPackageImpl;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EFactory;
@@ -51,8 +54,8 @@ public void setOptions(Map options) {
ignoreNamespaceForUnqualifiedQName = (String)options.get(AxisXMLResource.OPTION_IGNORE_NAMESPACE_FOR_UNQUALIFIED_QNAME);
}
- protected Object createFromString(EFactory eFactory, EDataType eDataType, String value) {
- if (eDataType == XmlPackageImpl.eINSTANCE.getQName()) {
+ protected Object createFromString(EFactory eFactory, EDataType dataType, String value) {
+ if (dataType == XmlPackageImpl.eINSTANCE.getQName()) {
String prefix;
String localName;
int idx = value.indexOf(':');
@@ -77,8 +80,22 @@ protected Object createFromString(EFactory eFactory, EDataType eDataType, String
namespaceURI = "";
}
return new QName(namespaceURI, localName, prefix);
+ } else if (dataType == SOAPPackageImpl.eINSTANCE.getStyle()) {
+ return Style.getStyle(value);
+ } else if (dataType == SOAPPackageImpl.eINSTANCE.getUse()) {
+ return Use.getUse(value);
} else {
- return super.createFromString(eFactory, eDataType, value);
+ return super.createFromString(eFactory, dataType, value);
+ }
+ }
+
+ public String convertToString(EFactory factory, EDataType dataType, Object value) {
+ if (dataType == SOAPPackageImpl.eINSTANCE.getStyle()) {
+ return ((Style)value).getName();
+ } else if (dataType == SOAPPackageImpl.eINSTANCE.getUse()) {
+ return ((Use)value).getName();
+ } else {
+ return super.convertToString(factory, dataType, value);
}
}
diff --git a/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLResource.java b/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLResource.java
index f5a87116e6..071fdf1b45 100644
--- a/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLResource.java
+++ b/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLResource.java
@@ -40,14 +40,14 @@ public class AxisXMLResource extends XMLResourceImpl {
*
*
* <deployment xmlns="http://xml.apache.org/axis/wsdd/"
- * xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
- * <transport name="http">
- * <requestFlow>
- * <handler type="URLMapper"/>
- * <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
- * </requestFlow>
- * </transport>
- * </deployment>
+ * xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
+ * <transport name="http">
+ * <requestFlow>
+ * <handler type="URLMapper"/>
+ * <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
+ * </requestFlow>
+ * </transport>
+ * </deployment>
*
*
* If the type attribute is assumed to be of type xsd:QName, then the
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java
deleted file mode 100644
index 94aa465afd..0000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- * If the meaning of the 'Name' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @model - * @generated - */ - String getName(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Handler#getName Name}' attribute. - * - * - * @param value the new value of the 'Name' attribute. - * @see #getName() - * @generated - */ - void setName(String value); - - /** - * Returns the value of the 'Type' attribute. - * - *- * If the meaning of the 'Type' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Type' attribute. - * @see #setType(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getType(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Handler#getType Type}' attribute. - * - * - * @param value the new value of the 'Type' attribute. - * @see #getType() - * @generated - */ - void setType(QName value); -} // Handler diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java deleted file mode 100644 index 661d8e8026..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - *- * The following features are supported: - *
- * If the meaning of the 'Qname' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Qname' attribute. - * @see #setQname(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getQname(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Mapping#getQname Qname}' attribute. - * - * - * @param value the new value of the 'Qname' attribute. - * @see #getQname() - * @generated - */ - void setQname(QName value); - - /** - * Returns the value of the 'Type' attribute. - * - *- * If the meaning of the 'Type' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Type' attribute. - * @see #setType(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getType(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Mapping#getType Type}' attribute. - * - * - * @param value the new value of the 'Type' attribute. - * @see #getType() - * @generated - */ - void setType(QName value); - - /** - * Returns the value of the 'Encoding Style' attribute. - * - *- * If the meaning of the 'Encoding Style' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Encoding Style' attribute. - * @see #setEncodingStyle(String) - * @model - * @generated - */ - String getEncodingStyle(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Mapping#getEncodingStyle Encoding Style}' attribute. - * - * - * @param value the new value of the 'Encoding Style' attribute. - * @see #getEncodingStyle() - * @generated - */ - void setEncodingStyle(String value); - -} // Mapping diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java deleted file mode 100644 index 7769b35671..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java +++ /dev/null @@ -1,295 +0,0 @@ -/** - *- * The following features are supported: - *
- * If the meaning of the 'Name' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @model - * @generated - */ - String getName(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getName Name}' attribute. - * - * - * @param value the new value of the 'Name' attribute. - * @see #getName() - * @generated - */ - void setName(String value); - - /** - * Returns the value of the 'Qname' attribute. - * - *- * If the meaning of the 'Qname' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Qname' attribute. - * @see #setQname(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getQname(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getQname Qname}' attribute. - * - * - * @param value the new value of the 'Qname' attribute. - * @see #getQname() - * @generated - */ - void setQname(QName value); - - /** - * Returns the value of the 'Return QName' attribute. - * - *- * If the meaning of the 'Return QName' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Return QName' attribute. - * @see #setReturnQName(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getReturnQName(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getReturnQName Return QName}' attribute. - * - * - * @param value the new value of the 'Return QName' attribute. - * @see #getReturnQName() - * @generated - */ - void setReturnQName(QName value); - - /** - * Returns the value of the 'Return Type' attribute. - * - *- * If the meaning of the 'Return Type' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Return Type' attribute. - * @see #setReturnType(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getReturnType(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getReturnType Return Type}' attribute. - * - * - * @param value the new value of the 'Return Type' attribute. - * @see #getReturnType() - * @generated - */ - void setReturnType(QName value); - - /** - * Returns the value of the 'Return Item QName' attribute. - * - *- * If the meaning of the 'Return Item QName' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Return Item QName' attribute. - * @see #setReturnItemQName(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getReturnItemQName(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getReturnItemQName Return Item QName}' attribute. - * - * - * @param value the new value of the 'Return Item QName' attribute. - * @see #getReturnItemQName() - * @generated - */ - void setReturnItemQName(QName value); - - /** - * Returns the value of the 'Return Item Type' attribute. - * - *- * If the meaning of the 'Return Item Type' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Return Item Type' attribute. - * @see #setReturnItemType(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getReturnItemType(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getReturnItemType Return Item Type}' attribute. - * - * - * @param value the new value of the 'Return Item Type' attribute. - * @see #getReturnItemType() - * @generated - */ - void setReturnItemType(QName value); - - /** - * Returns the value of the 'Soap Action' attribute. - * - *- * If the meaning of the 'Soap Action' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Soap Action' attribute. - * @see #setSoapAction(String) - * @model - * @generated - */ - String getSoapAction(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getSoapAction Soap Action}' attribute. - * - * - * @param value the new value of the 'Soap Action' attribute. - * @see #getSoapAction() - * @generated - */ - void setSoapAction(String value); - - /** - * Returns the value of the 'Mep' attribute. - * - *- * If the meaning of the 'Mep' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Mep' attribute. - * @see #setMep(String) - * @model - * @generated - */ - String getMep(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getMep Mep}' attribute. - * - * - * @param value the new value of the 'Mep' attribute. - * @see #getMep() - * @generated - */ - void setMep(String value); - - /** - * Returns the value of the 'Return Header' attribute. - * - *- * If the meaning of the 'Return Header' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Return Header' attribute. - * @see #setReturnHeader(Boolean) - * @model - * @generated - */ - Boolean getReturnHeader(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getReturnHeader Return Header}' attribute. - * - * - * @param value the new value of the 'Return Header' attribute. - * @see #getReturnHeader() - * @generated - */ - void setReturnHeader(Boolean value); - - /** - * Returns the value of the 'Parameters' containment reference list. - * The list contents are of type {@link org.apache.axis.model.wsdd.OperationParameter}. - * - *- * If the meaning of the 'Parameters' containment reference list isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Parameters' containment reference list. - * @model type="org.apache.axis.model.wsdd.OperationParameter" containment="true" - * extendedMetaData="kind='element' name='parameter' namespace='##targetNamespace'" - * @generated - */ - List getParameters(); - - /** - * Returns the value of the 'Faults' containment reference list. - * The list contents are of type {@link org.apache.axis.model.wsdd.Fault}. - * - *- * If the meaning of the 'Faults' containment reference list isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Faults' containment reference list. - * @model type="org.apache.axis.model.wsdd.Fault" containment="true" - * extendedMetaData="kind='element' name='fault' namespace='##targetNamespace'" - * @generated - */ - List getFaults(); - -} // Operation diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java deleted file mode 100644 index 0820d4f5f5..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java +++ /dev/null @@ -1,211 +0,0 @@ -/** - *- * The following features are supported: - *
- * If the meaning of the 'Name' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @model - * @generated - */ - String getName(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getName Name}' attribute. - * - * - * @param value the new value of the 'Name' attribute. - * @see #getName() - * @generated - */ - void setName(String value); - - /** - * Returns the value of the 'Qname' attribute. - * - *- * If the meaning of the 'Qname' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Qname' attribute. - * @see #setQname(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getQname(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getQname Qname}' attribute. - * - * - * @param value the new value of the 'Qname' attribute. - * @see #getQname() - * @generated - */ - void setQname(QName value); - - /** - * Returns the value of the 'Type' attribute. - * - *- * If the meaning of the 'Type' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Type' attribute. - * @see #setType(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getType(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getType Type}' attribute. - * - * - * @param value the new value of the 'Type' attribute. - * @see #getType() - * @generated - */ - void setType(QName value); - - /** - * Returns the value of the 'Mode' attribute. - * The literals are from the enumeration {@link org.apache.axis.model.wsdd.ParameterMode}. - * - *- * If the meaning of the 'Mode' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Mode' attribute. - * @see org.apache.axis.model.wsdd.ParameterMode - * @see #setMode(ParameterMode) - * @model - * @generated - */ - ParameterMode getMode(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getMode Mode}' attribute. - * - * - * @param value the new value of the 'Mode' attribute. - * @see org.apache.axis.model.wsdd.ParameterMode - * @see #getMode() - * @generated - */ - void setMode(ParameterMode value); - - /** - * Returns the value of the 'In Header' attribute. - * - *- * If the meaning of the 'In Header' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'In Header' attribute. - * @see #setInHeader(Boolean) - * @model - * @generated - */ - Boolean getInHeader(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getInHeader In Header}' attribute. - * - * - * @param value the new value of the 'In Header' attribute. - * @see #getInHeader() - * @generated - */ - void setInHeader(Boolean value); - - /** - * Returns the value of the 'Out Header' attribute. - * - *- * If the meaning of the 'Out Header' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Out Header' attribute. - * @see #setOutHeader(Boolean) - * @model - * @generated - */ - Boolean getOutHeader(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getOutHeader Out Header}' attribute. - * - * - * @param value the new value of the 'Out Header' attribute. - * @see #getOutHeader() - * @generated - */ - void setOutHeader(Boolean value); - - /** - * Returns the value of the 'Item QName' attribute. - * - *- * If the meaning of the 'Item QName' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Item QName' attribute. - * @see #setItemQName(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getItemQName(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getItemQName Item QName}' attribute. - * - * - * @param value the new value of the 'Item QName' attribute. - * @see #getItemQName() - * @generated - */ - void setItemQName(QName value); - -} // OperationParameter diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java deleted file mode 100644 index 475e4e368a..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - *- * The following features are supported: - *
- * If the meaning of the 'Name' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @model - * @generated - */ - String getName(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Parameter#getName Name}' attribute. - * - * - * @param value the new value of the 'Name' attribute. - * @see #getName() - * @generated - */ - void setName(String value); - - /** - * Returns the value of the 'Value' attribute. - * - *- * If the meaning of the 'Value' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Value' attribute. - * @see #setValue(String) - * @model - * @generated - */ - String getValue(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Parameter#getValue Value}' attribute. - * - * - * @param value the new value of the 'Value' attribute. - * @see #getValue() - * @generated - */ - void setValue(String value); - -} // Parameter diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java deleted file mode 100644 index 1294888398..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java +++ /dev/null @@ -1,194 +0,0 @@ -/** - *- * If the meaning of 'IN' literal object isn't clear, - * there really should be more of a description here... - *
- * - * @see #IN_LITERAL - * @model - * @generated - * @ordered - */ - public static final int IN = 1; - - /** - * The 'OUT' literal value. - * - *- * If the meaning of 'OUT' literal object isn't clear, - * there really should be more of a description here... - *
- * - * @see #OUT_LITERAL - * @model - * @generated - * @ordered - */ - public static final int OUT = 2; - - /** - * The 'INOUT' literal value. - * - *- * If the meaning of 'INOUT' literal object isn't clear, - * there really should be more of a description here... - *
- * - * @see #INOUT_LITERAL - * @model - * @generated - * @ordered - */ - public static final int INOUT = 3; - - /** - * The 'IN' literal object. - * - * - * @see #IN - * @generated - * @ordered - */ - public static final ParameterMode IN_LITERAL = new ParameterMode(IN, "IN", "IN"); - - /** - * The 'OUT' literal object. - * - * - * @see #OUT - * @generated - * @ordered - */ - public static final ParameterMode OUT_LITERAL = new ParameterMode(OUT, "OUT", "OUT"); - - /** - * The 'INOUT' literal object. - * - * - * @see #INOUT - * @generated - * @ordered - */ - public static final ParameterMode INOUT_LITERAL = new ParameterMode(INOUT, "INOUT", "INOUT"); - - /** - * An array of all the 'Parameter Mode' enumerators. - * - * - * @generated - */ - private static final ParameterMode[] VALUES_ARRAY = - new ParameterMode[] { - IN_LITERAL, - OUT_LITERAL, - INOUT_LITERAL, - }; - - /** - * A public read-only list of all the 'Parameter Mode' enumerators. - * - * - * @generated - */ - public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); - - /** - * Returns the 'Parameter Mode' literal with the specified literal value. - * - * - * @generated - */ - public static ParameterMode get(String literal) { - for (int i = 0; i < VALUES_ARRAY.length; ++i) { - ParameterMode result = VALUES_ARRAY[i]; - if (result.toString().equals(literal)) { - return result; - } - } - return null; - } - - /** - * Returns the 'Parameter Mode' literal with the specified name. - * - * - * @generated - */ - public static ParameterMode getByName(String name) { - for (int i = 0; i < VALUES_ARRAY.length; ++i) { - ParameterMode result = VALUES_ARRAY[i]; - if (result.getName().equals(name)) { - return result; - } - } - return null; - } - - /** - * Returns the 'Parameter Mode' literal with the specified integer value. - * - * - * @generated - */ - public static ParameterMode get(int value) { - switch (value) { - case IN: return IN_LITERAL; - case OUT: return OUT_LITERAL; - case INOUT: return INOUT_LITERAL; - } - return null; - } - - /** - * Only this class can construct instances. - * - * - * @generated - */ - private ParameterMode(int value, String name, String literal) { - super(value, name, literal); - } - -} //ParameterMode - -/** - * A private implementation class to construct the instances. - * - * - * @generated - */ -class InternalParameterMode extends org.eclipse.emf.common.util.AbstractEnumerator { - /** - * Only this class can construct instances. - * - * - * @generated - */ - protected InternalParameterMode(int value, String name, String literal) { - super(value, name, literal); - } -} diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java deleted file mode 100644 index 85e607b118..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - *- * The following features are supported: - *
- * If the meaning of the 'Parameters' containment reference list isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Parameters' containment reference list. - * @model type="org.apache.axis.model.wsdd.Parameter" containment="true" - * extendedMetaData="kind='element' name='parameter' namespace='##targetNamespace'" - * @generated - */ - List getParameters(); - - /** - * - * - * @model nameRequired="true" valueRequired="true" - * @generated - */ - void setParameter(String name, String value); - -} // Parameterizable diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java deleted file mode 100644 index e152652569..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java +++ /dev/null @@ -1,217 +0,0 @@ -/** - *- * The following features are supported: - *
- * If the meaning of the 'Name' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @model - * @generated - */ - String getName(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Service#getName Name}' attribute. - * - * - * @param value the new value of the 'Name' attribute. - * @see #getName() - * @generated - */ - void setName(String value); - - /** - * Returns the value of the 'Provider' attribute. - * - *- * If the meaning of the 'Provider' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Provider' attribute. - * @see #setProvider(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getProvider(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Service#getProvider Provider}' attribute. - * - * - * @param value the new value of the 'Provider' attribute. - * @see #getProvider() - * @generated - */ - void setProvider(QName value); - - /** - * Returns the value of the 'Use' attribute. - * - *- * If the meaning of the 'Use' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Use' attribute. - * @see #setUse(Use) - * @model dataType="org.apache.axis.model.soap.Use" - * @generated - */ - Use getUse(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Service#getUse Use}' attribute. - * - * - * @param value the new value of the 'Use' attribute. - * @see #getUse() - * @generated - */ - void setUse(Use value); - - /** - * Returns the value of the 'Style' attribute. - * - *- * If the meaning of the 'Style' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Style' attribute. - * @see #setStyle(Style) - * @model dataType="org.apache.axis.model.soap.Style" - * @generated - */ - Style getStyle(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Service#getStyle Style}' attribute. - * - * - * @param value the new value of the 'Style' attribute. - * @see #getStyle() - * @generated - */ - void setStyle(Style value); - - /** - * Returns the value of the 'Namespaces' attribute list. - * The list contents are of type {@link java.lang.String}. - * - *- * If the meaning of the 'Namespaces' attribute list isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Namespaces' attribute list. - * @model extendedMetaData="kind='element' name='namespace' namespace='##targetNamespace'" - * @generated - */ - List getNamespaces(); - - /** - * Returns the value of the 'Operations' containment reference list. - * The list contents are of type {@link org.apache.axis.model.wsdd.Operation}. - * - *- * If the meaning of the 'Operations' containment reference list isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Operations' containment reference list. - * @model type="org.apache.axis.model.wsdd.Operation" containment="true" - * extendedMetaData="kind='element' name='operation' namespace='##targetNamespace'" - * @generated - */ - List getOperations(); - - /** - * Returns the value of the 'Type Mappings' containment reference list. - * The list contents are of type {@link org.apache.axis.model.wsdd.TypeMapping}. - * - *- * If the meaning of the 'Type Mappings' containment reference list isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Type Mappings' containment reference list. - * @model type="org.apache.axis.model.wsdd.TypeMapping" containment="true" - * extendedMetaData="kind='element' name='typeMapping' namespace='##targetNamespace'" - * @generated - */ - List getTypeMappings(); - - /** - * Returns the value of the 'Bean Mappings' containment reference list. - * The list contents are of type {@link org.apache.axis.model.wsdd.BeanMapping}. - * - *- * If the meaning of the 'Bean Mappings' containment reference list isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Bean Mappings' containment reference list. - * @model type="org.apache.axis.model.wsdd.BeanMapping" containment="true" - * extendedMetaData="kind='element' name='beanMapping' namespace='##targetNamespace'" - * @generated - */ - List getBeanMappings(); - - /** - * Returns the value of the 'Array Mappings' containment reference list. - * The list contents are of type {@link org.apache.axis.model.wsdd.ArrayMapping}. - * - *- * If the meaning of the 'Array Mappings' containment reference list isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Array Mappings' containment reference list. - * @model type="org.apache.axis.model.wsdd.ArrayMapping" containment="true" - * extendedMetaData="kind='element' name='arrayMapping' namespace='##targetNamespace'" - * @generated - */ - List getArrayMappings(); - -} // Service diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java deleted file mode 100644 index a058039928..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java +++ /dev/null @@ -1,79 +0,0 @@ -/** - *- * The following features are supported: - *
- * If the meaning of the 'Name' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @model - * @generated - */ - String getName(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Transport#getName Name}' attribute. - * - * - * @param value the new value of the 'Name' attribute. - * @see #getName() - * @generated - */ - void setName(String value); - - /** - * Returns the value of the 'Pivot' attribute. - * - *- * If the meaning of the 'Pivot' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Pivot' attribute. - * @see #setPivot(QName) - * @model dataType="org.apache.axis.model.xml.QName" - * @generated - */ - QName getPivot(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.Transport#getPivot Pivot}' attribute. - * - * - * @param value the new value of the 'Pivot' attribute. - * @see #getPivot() - * @generated - */ - void setPivot(QName value); - -} // Transport diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java deleted file mode 100644 index a89f3ca9db..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - *- * The following features are supported: - *
- * If the meaning of the 'Serializer' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Serializer' attribute. - * @see #setSerializer(String) - * @model - * @generated - */ - String getSerializer(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.TypeMapping#getSerializer Serializer}' attribute. - * - * - * @param value the new value of the 'Serializer' attribute. - * @see #getSerializer() - * @generated - */ - void setSerializer(String value); - - /** - * Returns the value of the 'Deserializer' attribute. - * - *- * If the meaning of the 'Deserializer' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Deserializer' attribute. - * @see #setDeserializer(String) - * @model - * @generated - */ - String getDeserializer(); - - /** - * Sets the value of the '{@link org.apache.axis.model.wsdd.TypeMapping#getDeserializer Deserializer}' attribute. - * - * - * @param value the new value of the 'Deserializer' attribute. - * @see #getDeserializer() - * @generated - */ - void setDeserializer(String value); - -} // TypeMapping diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDExtendedMetaData.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDExtendedMetaData.java new file mode 100644 index 0000000000..1f5f4726ef --- /dev/null +++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDExtendedMetaData.java @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis.model.wsdd; + +import org.apache.axis.model.wsdd.impl.WSDDPackageImpl; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.util.BasicExtendedMetaData; + +final class WSDDExtendedMetaData extends BasicExtendedMetaData { + private static final EClass mapping = WSDDPackageImpl.eINSTANCE.getMapping(); + + public EStructuralFeature getAttribute(EClass eClass, String namespace, String name) { + if (mapping.isSuperTypeOf(eClass) && namespace == null && name.equals("languageSpecificType")) { + // TODO: emit warning + return mapping.getEStructuralFeature(WSDDPackageImpl.MAPPING__TYPE); + } else { + return super.getAttribute(eClass, namespace, name); + } + } +} diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java deleted file mode 100644 index aea67e665e..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java +++ /dev/null @@ -1,150 +0,0 @@ -/** - *- * The following features are implemented: - *
- *
- * - * @generated - */ -public class BeanMappingImpl extends MappingImpl implements BeanMapping { - /** - * - * - * @generated - */ - protected BeanMappingImpl() { - super(); - } - - /** - * - * - * @generated - */ - protected EClass eStaticClass() { - return WSDDPackageImpl.Literals.BEAN_MAPPING; - } - -} //BeanMappingImpl diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java deleted file mode 100644 index 0aa4b27f5d..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java +++ /dev/null @@ -1,222 +0,0 @@ -/** - *- * The following features are implemented: - *
- * The following features are implemented: - *
- * The following features are implemented: - *
- * The following features are implemented: - *
- *
- * - * @generated - */ -public class GlobalConfigurationImpl extends DeployableItemImpl implements GlobalConfiguration { - /** - * - * - * @generated - */ - protected GlobalConfigurationImpl() { - super(); - } - - /** - * - * - * @generated - */ - protected EClass eStaticClass() { - return WSDDPackageImpl.Literals.GLOBAL_CONFIGURATION; - } - -} //GlobalConfigurationImpl diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java deleted file mode 100644 index fa7620670e..0000000000 --- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java +++ /dev/null @@ -1,201 +0,0 @@ -/** - *- * The following features are implemented: - *
- * The following features are implemented: - *
- * The following features are implemented: - *
- * The following features are implemented: - *
- * The following features are implemented: - *
- * The following features are implemented: - *
- * The following features are implemented: - *
- * The following features are implemented: - *
- * The following features are implemented: - *
Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * - * - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#eNS_URI - * @see #init() - * @generated - */ - private WSDDPackageImpl() { - super(eNS_URI, ((EFactory)WSDDFactory.INSTANCE)); - } - - /** - * - * - * @generated - */ - private static boolean isInited = false; - - /** - * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * - *
This method is used to initialize {@link WSDDPackageImpl#eINSTANCE} when that field is accessed. - * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. - * - * - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() - * @generated - */ - public static WSDDPackageImpl init() { - if (isInited) return (WSDDPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI); - - // Obtain or create and register package - WSDDPackageImpl theWSDDPackage = (WSDDPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof WSDDPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new WSDDPackageImpl()); - - isInited = true; - - // Obtain or create and register interdependencies - XmlPackageImpl theXmlPackage = (XmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI) instanceof XmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI) : XmlPackageImpl.eINSTANCE); - SOAPPackageImpl theSOAPPackage = (SOAPPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI) instanceof SOAPPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI) : SOAPPackageImpl.eINSTANCE); - - // Create package meta-data objects - theWSDDPackage.createPackageContents(); - theXmlPackage.createPackageContents(); - theSOAPPackage.createPackageContents(); - - // Initialize created meta-data - theWSDDPackage.initializePackageContents(); - theXmlPackage.initializePackageContents(); - theSOAPPackage.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theWSDDPackage.freeze(); - - - // Update the registry and return the package - EPackage.Registry.INSTANCE.put(WSDDPackageImpl.eNS_URI, theWSDDPackage); - return theWSDDPackage; - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Parameter Parameter}'. - * - * - * @return the meta object for class 'Parameter'. - * @see org.apache.axis.model.wsdd.Parameter - * @generated - */ - public EClass getParameter() { - return parameterEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Parameter#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see org.apache.axis.model.wsdd.Parameter#getName() - * @see #getParameter() - * @generated - */ - public EAttribute getParameter_Name() { - return (EAttribute)parameterEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Parameter#getValue Value}'. - * - * - * @return the meta object for the attribute 'Value'. - * @see org.apache.axis.model.wsdd.Parameter#getValue() - * @see #getParameter() - * @generated - */ - public EAttribute getParameter_Value() { - return (EAttribute)parameterEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Flow Flow}'. - * - * - * @return the meta object for class 'Flow'. - * @see org.apache.axis.model.wsdd.Flow - * @generated - */ - public EClass getFlow() { - return flowEClass; - } - - /** - * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Flow#getHandlers Handlers}'. - * - * - * @return the meta object for the containment reference list 'Handlers'. - * @see org.apache.axis.model.wsdd.Flow#getHandlers() - * @see #getFlow() - * @generated - */ - public EReference getFlow_Handlers() { - return (EReference)flowEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Mapping Mapping}'. - * - * - * @return the meta object for class 'Mapping'. - * @see org.apache.axis.model.wsdd.Mapping - * @generated - */ - public EClass getMapping() { - return mappingEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Mapping#getQname Qname}'. - * - * - * @return the meta object for the attribute 'Qname'. - * @see org.apache.axis.model.wsdd.Mapping#getQname() - * @see #getMapping() - * @generated - */ - public EAttribute getMapping_Qname() { - return (EAttribute)mappingEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Mapping#getType Type}'. - * - * - * @return the meta object for the attribute 'Type'. - * @see org.apache.axis.model.wsdd.Mapping#getType() - * @see #getMapping() - * @generated - */ - public EAttribute getMapping_Type() { - return (EAttribute)mappingEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Mapping#getEncodingStyle Encoding Style}'. - * - * - * @return the meta object for the attribute 'Encoding Style'. - * @see org.apache.axis.model.wsdd.Mapping#getEncodingStyle() - * @see #getMapping() - * @generated - */ - public EAttribute getMapping_EncodingStyle() { - return (EAttribute)mappingEClass.getEStructuralFeatures().get(2); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.TypeMapping Type Mapping}'. - * - * - * @return the meta object for class 'Type Mapping'. - * @see org.apache.axis.model.wsdd.TypeMapping - * @generated - */ - public EClass getTypeMapping() { - return typeMappingEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.TypeMapping#getSerializer Serializer}'. - * - * - * @return the meta object for the attribute 'Serializer'. - * @see org.apache.axis.model.wsdd.TypeMapping#getSerializer() - * @see #getTypeMapping() - * @generated - */ - public EAttribute getTypeMapping_Serializer() { - return (EAttribute)typeMappingEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.TypeMapping#getDeserializer Deserializer}'. - * - * - * @return the meta object for the attribute 'Deserializer'. - * @see org.apache.axis.model.wsdd.TypeMapping#getDeserializer() - * @see #getTypeMapping() - * @generated - */ - public EAttribute getTypeMapping_Deserializer() { - return (EAttribute)typeMappingEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.ArrayMapping Array Mapping}'. - * - * - * @return the meta object for class 'Array Mapping'. - * @see org.apache.axis.model.wsdd.ArrayMapping - * @generated - */ - public EClass getArrayMapping() { - return arrayMappingEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.ArrayMapping#getInnerType Inner Type}'. - * - * - * @return the meta object for the attribute 'Inner Type'. - * @see org.apache.axis.model.wsdd.ArrayMapping#getInnerType() - * @see #getArrayMapping() - * @generated - */ - public EAttribute getArrayMapping_InnerType() { - return (EAttribute)arrayMappingEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.BeanMapping Bean Mapping}'. - * - * - * @return the meta object for class 'Bean Mapping'. - * @see org.apache.axis.model.wsdd.BeanMapping - * @generated - */ - public EClass getBeanMapping() { - return beanMappingEClass; - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.OperationParameter Operation Parameter}'. - * - * - * @return the meta object for class 'Operation Parameter'. - * @see org.apache.axis.model.wsdd.OperationParameter - * @generated - */ - public EClass getOperationParameter() { - return operationParameterEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see org.apache.axis.model.wsdd.OperationParameter#getName() - * @see #getOperationParameter() - * @generated - */ - public EAttribute getOperationParameter_Name() { - return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getQname Qname}'. - * - * - * @return the meta object for the attribute 'Qname'. - * @see org.apache.axis.model.wsdd.OperationParameter#getQname() - * @see #getOperationParameter() - * @generated - */ - public EAttribute getOperationParameter_Qname() { - return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getType Type}'. - * - * - * @return the meta object for the attribute 'Type'. - * @see org.apache.axis.model.wsdd.OperationParameter#getType() - * @see #getOperationParameter() - * @generated - */ - public EAttribute getOperationParameter_Type() { - return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(2); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getMode Mode}'. - * - * - * @return the meta object for the attribute 'Mode'. - * @see org.apache.axis.model.wsdd.OperationParameter#getMode() - * @see #getOperationParameter() - * @generated - */ - public EAttribute getOperationParameter_Mode() { - return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(3); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getInHeader In Header}'. - * - * - * @return the meta object for the attribute 'In Header'. - * @see org.apache.axis.model.wsdd.OperationParameter#getInHeader() - * @see #getOperationParameter() - * @generated - */ - public EAttribute getOperationParameter_InHeader() { - return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(4); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getOutHeader Out Header}'. - * - * - * @return the meta object for the attribute 'Out Header'. - * @see org.apache.axis.model.wsdd.OperationParameter#getOutHeader() - * @see #getOperationParameter() - * @generated - */ - public EAttribute getOperationParameter_OutHeader() { - return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(5); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getItemQName Item QName}'. - * - * - * @return the meta object for the attribute 'Item QName'. - * @see org.apache.axis.model.wsdd.OperationParameter#getItemQName() - * @see #getOperationParameter() - * @generated - */ - public EAttribute getOperationParameter_ItemQName() { - return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(6); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Fault Fault}'. - * - * - * @return the meta object for class 'Fault'. - * @see org.apache.axis.model.wsdd.Fault - * @generated - */ - public EClass getFault() { - return faultEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Fault#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see org.apache.axis.model.wsdd.Fault#getName() - * @see #getFault() - * @generated - */ - public EAttribute getFault_Name() { - return (EAttribute)faultEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Fault#getQname Qname}'. - * - * - * @return the meta object for the attribute 'Qname'. - * @see org.apache.axis.model.wsdd.Fault#getQname() - * @see #getFault() - * @generated - */ - public EAttribute getFault_Qname() { - return (EAttribute)faultEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Fault#getClass_ Class}'. - * - * - * @return the meta object for the attribute 'Class'. - * @see org.apache.axis.model.wsdd.Fault#getClass_() - * @see #getFault() - * @generated - */ - public EAttribute getFault_Class() { - return (EAttribute)faultEClass.getEStructuralFeatures().get(2); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Fault#getType Type}'. - * - * - * @return the meta object for the attribute 'Type'. - * @see org.apache.axis.model.wsdd.Fault#getType() - * @see #getFault() - * @generated - */ - public EAttribute getFault_Type() { - return (EAttribute)faultEClass.getEStructuralFeatures().get(3); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Operation Operation}'. - * - * - * @return the meta object for class 'Operation'. - * @see org.apache.axis.model.wsdd.Operation - * @generated - */ - public EClass getOperation() { - return operationEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see org.apache.axis.model.wsdd.Operation#getName() - * @see #getOperation() - * @generated - */ - public EAttribute getOperation_Name() { - return (EAttribute)operationEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getQname Qname}'. - * - * - * @return the meta object for the attribute 'Qname'. - * @see org.apache.axis.model.wsdd.Operation#getQname() - * @see #getOperation() - * @generated - */ - public EAttribute getOperation_Qname() { - return (EAttribute)operationEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getReturnQName Return QName}'. - * - * - * @return the meta object for the attribute 'Return QName'. - * @see org.apache.axis.model.wsdd.Operation#getReturnQName() - * @see #getOperation() - * @generated - */ - public EAttribute getOperation_ReturnQName() { - return (EAttribute)operationEClass.getEStructuralFeatures().get(2); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getReturnType Return Type}'. - * - * - * @return the meta object for the attribute 'Return Type'. - * @see org.apache.axis.model.wsdd.Operation#getReturnType() - * @see #getOperation() - * @generated - */ - public EAttribute getOperation_ReturnType() { - return (EAttribute)operationEClass.getEStructuralFeatures().get(3); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getReturnItemQName Return Item QName}'. - * - * - * @return the meta object for the attribute 'Return Item QName'. - * @see org.apache.axis.model.wsdd.Operation#getReturnItemQName() - * @see #getOperation() - * @generated - */ - public EAttribute getOperation_ReturnItemQName() { - return (EAttribute)operationEClass.getEStructuralFeatures().get(4); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getReturnItemType Return Item Type}'. - * - * - * @return the meta object for the attribute 'Return Item Type'. - * @see org.apache.axis.model.wsdd.Operation#getReturnItemType() - * @see #getOperation() - * @generated - */ - public EAttribute getOperation_ReturnItemType() { - return (EAttribute)operationEClass.getEStructuralFeatures().get(5); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getSoapAction Soap Action}'. - * - * - * @return the meta object for the attribute 'Soap Action'. - * @see org.apache.axis.model.wsdd.Operation#getSoapAction() - * @see #getOperation() - * @generated - */ - public EAttribute getOperation_SoapAction() { - return (EAttribute)operationEClass.getEStructuralFeatures().get(6); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getMep Mep}'. - * - * - * @return the meta object for the attribute 'Mep'. - * @see org.apache.axis.model.wsdd.Operation#getMep() - * @see #getOperation() - * @generated - */ - public EAttribute getOperation_Mep() { - return (EAttribute)operationEClass.getEStructuralFeatures().get(7); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getReturnHeader Return Header}'. - * - * - * @return the meta object for the attribute 'Return Header'. - * @see org.apache.axis.model.wsdd.Operation#getReturnHeader() - * @see #getOperation() - * @generated - */ - public EAttribute getOperation_ReturnHeader() { - return (EAttribute)operationEClass.getEStructuralFeatures().get(8); - } - - /** - * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Operation#getParameters Parameters}'. - * - * - * @return the meta object for the containment reference list 'Parameters'. - * @see org.apache.axis.model.wsdd.Operation#getParameters() - * @see #getOperation() - * @generated - */ - public EReference getOperation_Parameters() { - return (EReference)operationEClass.getEStructuralFeatures().get(9); - } - - /** - * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Operation#getFaults Faults}'. - * - * - * @return the meta object for the containment reference list 'Faults'. - * @see org.apache.axis.model.wsdd.Operation#getFaults() - * @see #getOperation() - * @generated - */ - public EReference getOperation_Faults() { - return (EReference)operationEClass.getEStructuralFeatures().get(10); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Parameterizable Parameterizable}'. - * - * - * @return the meta object for class 'Parameterizable'. - * @see org.apache.axis.model.wsdd.Parameterizable - * @generated - */ - public EClass getParameterizable() { - return parameterizableEClass; - } - - /** - * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Parameterizable#getParameters Parameters}'. - * - * - * @return the meta object for the containment reference list 'Parameters'. - * @see org.apache.axis.model.wsdd.Parameterizable#getParameters() - * @see #getParameterizable() - * @generated - */ - public EReference getParameterizable_Parameters() { - return (EReference)parameterizableEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Handler Handler}'. - * - * - * @return the meta object for class 'Handler'. - * @see org.apache.axis.model.wsdd.Handler - * @generated - */ - public EClass getHandler() { - return handlerEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Handler#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see org.apache.axis.model.wsdd.Handler#getName() - * @see #getHandler() - * @generated - */ - public EAttribute getHandler_Name() { - return (EAttribute)handlerEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Handler#getType Type}'. - * - * - * @return the meta object for the attribute 'Type'. - * @see org.apache.axis.model.wsdd.Handler#getType() - * @see #getHandler() - * @generated - */ - public EAttribute getHandler_Type() { - return (EAttribute)handlerEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.DeployableItem Deployable Item}'. - * - * - * @return the meta object for class 'Deployable Item'. - * @see org.apache.axis.model.wsdd.DeployableItem - * @generated - */ - public EClass getDeployableItem() { - return deployableItemEClass; - } - - /** - * Returns the meta object for the containment reference '{@link org.apache.axis.model.wsdd.DeployableItem#getRequestFlow Request Flow}'. - * - * - * @return the meta object for the containment reference 'Request Flow'. - * @see org.apache.axis.model.wsdd.DeployableItem#getRequestFlow() - * @see #getDeployableItem() - * @generated - */ - public EReference getDeployableItem_RequestFlow() { - return (EReference)deployableItemEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the containment reference '{@link org.apache.axis.model.wsdd.DeployableItem#getResponseFlow Response Flow}'. - * - * - * @return the meta object for the containment reference 'Response Flow'. - * @see org.apache.axis.model.wsdd.DeployableItem#getResponseFlow() - * @see #getDeployableItem() - * @generated - */ - public EReference getDeployableItem_ResponseFlow() { - return (EReference)deployableItemEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.GlobalConfiguration Global Configuration}'. - * - * - * @return the meta object for class 'Global Configuration'. - * @see org.apache.axis.model.wsdd.GlobalConfiguration - * @generated - */ - public EClass getGlobalConfiguration() { - return globalConfigurationEClass; - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Transport Transport}'. - * - * - * @return the meta object for class 'Transport'. - * @see org.apache.axis.model.wsdd.Transport - * @generated - */ - public EClass getTransport() { - return transportEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Transport#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see org.apache.axis.model.wsdd.Transport#getName() - * @see #getTransport() - * @generated - */ - public EAttribute getTransport_Name() { - return (EAttribute)transportEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Transport#getPivot Pivot}'. - * - * - * @return the meta object for the attribute 'Pivot'. - * @see org.apache.axis.model.wsdd.Transport#getPivot() - * @see #getTransport() - * @generated - */ - public EAttribute getTransport_Pivot() { - return (EAttribute)transportEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Service Service}'. - * - * - * @return the meta object for class 'Service'. - * @see org.apache.axis.model.wsdd.Service - * @generated - */ - public EClass getService() { - return serviceEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Service#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see org.apache.axis.model.wsdd.Service#getName() - * @see #getService() - * @generated - */ - public EAttribute getService_Name() { - return (EAttribute)serviceEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Service#getProvider Provider}'. - * - * - * @return the meta object for the attribute 'Provider'. - * @see org.apache.axis.model.wsdd.Service#getProvider() - * @see #getService() - * @generated - */ - public EAttribute getService_Provider() { - return (EAttribute)serviceEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Service#getUse Use}'. - * - * - * @return the meta object for the attribute 'Use'. - * @see org.apache.axis.model.wsdd.Service#getUse() - * @see #getService() - * @generated - */ - public EAttribute getService_Use() { - return (EAttribute)serviceEClass.getEStructuralFeatures().get(2); - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Service#getStyle Style}'. - * - * - * @return the meta object for the attribute 'Style'. - * @see org.apache.axis.model.wsdd.Service#getStyle() - * @see #getService() - * @generated - */ - public EAttribute getService_Style() { - return (EAttribute)serviceEClass.getEStructuralFeatures().get(3); - } - - /** - * Returns the meta object for the attribute list '{@link org.apache.axis.model.wsdd.Service#getNamespaces Namespaces}'. - * - * - * @return the meta object for the attribute list 'Namespaces'. - * @see org.apache.axis.model.wsdd.Service#getNamespaces() - * @see #getService() - * @generated - */ - public EAttribute getService_Namespaces() { - return (EAttribute)serviceEClass.getEStructuralFeatures().get(4); - } - - /** - * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Service#getOperations Operations}'. - * - * - * @return the meta object for the containment reference list 'Operations'. - * @see org.apache.axis.model.wsdd.Service#getOperations() - * @see #getService() - * @generated - */ - public EReference getService_Operations() { - return (EReference)serviceEClass.getEStructuralFeatures().get(5); - } - - /** - * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Service#getTypeMappings Type Mappings}'. - * - * - * @return the meta object for the containment reference list 'Type Mappings'. - * @see org.apache.axis.model.wsdd.Service#getTypeMappings() - * @see #getService() - * @generated - */ - public EReference getService_TypeMappings() { - return (EReference)serviceEClass.getEStructuralFeatures().get(6); - } - - /** - * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Service#getBeanMappings Bean Mappings}'. - * - * - * @return the meta object for the containment reference list 'Bean Mappings'. - * @see org.apache.axis.model.wsdd.Service#getBeanMappings() - * @see #getService() - * @generated - */ - public EReference getService_BeanMappings() { - return (EReference)serviceEClass.getEStructuralFeatures().get(7); - } - - /** - * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Service#getArrayMappings Array Mappings}'. - * - * - * @return the meta object for the containment reference list 'Array Mappings'. - * @see org.apache.axis.model.wsdd.Service#getArrayMappings() - * @see #getService() - * @generated - */ - public EReference getService_ArrayMappings() { - return (EReference)serviceEClass.getEStructuralFeatures().get(8); - } - - /** - * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Deployment Deployment}'. - * - * - * @return the meta object for class 'Deployment'. - * @see org.apache.axis.model.wsdd.Deployment - * @generated - */ - public EClass getDeployment() { - return deploymentEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Deployment#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see org.apache.axis.model.wsdd.Deployment#getName() - * @see #getDeployment() - * @generated - */ - public EAttribute getDeployment_Name() { - return (EAttribute)deploymentEClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the containment reference '{@link org.apache.axis.model.wsdd.Deployment#getGlobalConfiguration Global Configuration}'. - * - * - * @return the meta object for the containment reference 'Global Configuration'. - * @see org.apache.axis.model.wsdd.Deployment#getGlobalConfiguration() - * @see #getDeployment() - * @generated - */ - public EReference getDeployment_GlobalConfiguration() { - return (EReference)deploymentEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Deployment#getHandlers Handlers}'. - * - * - * @return the meta object for the containment reference list 'Handlers'. - * @see org.apache.axis.model.wsdd.Deployment#getHandlers() - * @see #getDeployment() - * @generated - */ - public EReference getDeployment_Handlers() { - return (EReference)deploymentEClass.getEStructuralFeatures().get(2); - } - - /** - * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Deployment#getTransports Transports}'. - * - * - * @return the meta object for the containment reference list 'Transports'. - * @see org.apache.axis.model.wsdd.Deployment#getTransports() - * @see #getDeployment() - * @generated - */ - public EReference getDeployment_Transports() { - return (EReference)deploymentEClass.getEStructuralFeatures().get(3); - } - - /** - * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Deployment#getServices Services}'. - * - * - * @return the meta object for the containment reference list 'Services'. - * @see org.apache.axis.model.wsdd.Deployment#getServices() - * @see #getDeployment() - * @generated - */ - public EReference getDeployment_Services() { - return (EReference)deploymentEClass.getEStructuralFeatures().get(4); - } - - /** - * Returns the meta object for enum '{@link org.apache.axis.model.wsdd.ParameterMode Parameter Mode}'. - * - * - * @return the meta object for enum 'Parameter Mode'. - * @see org.apache.axis.model.wsdd.ParameterMode - * @generated - */ - public EEnum getParameterMode() { - return parameterModeEEnum; - } - - /** - * Returns the factory that creates the instances of the model. - * - * - * @return the factory that creates the instances of the model. - * @generated - */ - public WSDDFactory getWSDDFactory() { - return (WSDDFactory)getEFactoryInstance(); - } - - /** - * - * - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void createPackageContents() { - if (isCreated) return; - isCreated = true; - - // Create classes and their features - parameterEClass = createEClass(PARAMETER); - createEAttribute(parameterEClass, PARAMETER__NAME); - createEAttribute(parameterEClass, PARAMETER__VALUE); - - mappingEClass = createEClass(MAPPING); - createEAttribute(mappingEClass, MAPPING__QNAME); - createEAttribute(mappingEClass, MAPPING__TYPE); - createEAttribute(mappingEClass, MAPPING__ENCODING_STYLE); - - typeMappingEClass = createEClass(TYPE_MAPPING); - createEAttribute(typeMappingEClass, TYPE_MAPPING__SERIALIZER); - createEAttribute(typeMappingEClass, TYPE_MAPPING__DESERIALIZER); - - arrayMappingEClass = createEClass(ARRAY_MAPPING); - createEAttribute(arrayMappingEClass, ARRAY_MAPPING__INNER_TYPE); - - beanMappingEClass = createEClass(BEAN_MAPPING); - - operationParameterEClass = createEClass(OPERATION_PARAMETER); - createEAttribute(operationParameterEClass, OPERATION_PARAMETER__NAME); - createEAttribute(operationParameterEClass, OPERATION_PARAMETER__QNAME); - createEAttribute(operationParameterEClass, OPERATION_PARAMETER__TYPE); - createEAttribute(operationParameterEClass, OPERATION_PARAMETER__MODE); - createEAttribute(operationParameterEClass, OPERATION_PARAMETER__IN_HEADER); - createEAttribute(operationParameterEClass, OPERATION_PARAMETER__OUT_HEADER); - createEAttribute(operationParameterEClass, OPERATION_PARAMETER__ITEM_QNAME); - - faultEClass = createEClass(FAULT); - createEAttribute(faultEClass, FAULT__NAME); - createEAttribute(faultEClass, FAULT__QNAME); - createEAttribute(faultEClass, FAULT__CLASS); - createEAttribute(faultEClass, FAULT__TYPE); - - operationEClass = createEClass(OPERATION); - createEAttribute(operationEClass, OPERATION__NAME); - createEAttribute(operationEClass, OPERATION__QNAME); - createEAttribute(operationEClass, OPERATION__RETURN_QNAME); - createEAttribute(operationEClass, OPERATION__RETURN_TYPE); - createEAttribute(operationEClass, OPERATION__RETURN_ITEM_QNAME); - createEAttribute(operationEClass, OPERATION__RETURN_ITEM_TYPE); - createEAttribute(operationEClass, OPERATION__SOAP_ACTION); - createEAttribute(operationEClass, OPERATION__MEP); - createEAttribute(operationEClass, OPERATION__RETURN_HEADER); - createEReference(operationEClass, OPERATION__PARAMETERS); - createEReference(operationEClass, OPERATION__FAULTS); - - parameterizableEClass = createEClass(PARAMETERIZABLE); - createEReference(parameterizableEClass, PARAMETERIZABLE__PARAMETERS); - - handlerEClass = createEClass(HANDLER); - createEAttribute(handlerEClass, HANDLER__NAME); - createEAttribute(handlerEClass, HANDLER__TYPE); - - flowEClass = createEClass(FLOW); - createEReference(flowEClass, FLOW__HANDLERS); - - deployableItemEClass = createEClass(DEPLOYABLE_ITEM); - createEReference(deployableItemEClass, DEPLOYABLE_ITEM__REQUEST_FLOW); - createEReference(deployableItemEClass, DEPLOYABLE_ITEM__RESPONSE_FLOW); - - globalConfigurationEClass = createEClass(GLOBAL_CONFIGURATION); - - transportEClass = createEClass(TRANSPORT); - createEAttribute(transportEClass, TRANSPORT__NAME); - createEAttribute(transportEClass, TRANSPORT__PIVOT); - - serviceEClass = createEClass(SERVICE); - createEAttribute(serviceEClass, SERVICE__NAME); - createEAttribute(serviceEClass, SERVICE__PROVIDER); - createEAttribute(serviceEClass, SERVICE__USE); - createEAttribute(serviceEClass, SERVICE__STYLE); - createEAttribute(serviceEClass, SERVICE__NAMESPACES); - createEReference(serviceEClass, SERVICE__OPERATIONS); - createEReference(serviceEClass, SERVICE__TYPE_MAPPINGS); - createEReference(serviceEClass, SERVICE__BEAN_MAPPINGS); - createEReference(serviceEClass, SERVICE__ARRAY_MAPPINGS); - - deploymentEClass = createEClass(DEPLOYMENT); - createEAttribute(deploymentEClass, DEPLOYMENT__NAME); - createEReference(deploymentEClass, DEPLOYMENT__GLOBAL_CONFIGURATION); - createEReference(deploymentEClass, DEPLOYMENT__HANDLERS); - createEReference(deploymentEClass, DEPLOYMENT__TRANSPORTS); - createEReference(deploymentEClass, DEPLOYMENT__SERVICES); - - // Create enums - parameterModeEEnum = createEEnum(PARAMETER_MODE); - } - - /** - * - * - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void initializePackageContents() { - if (isInitialized) return; - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Obtain other dependent packages - XmlPackageImpl theXmlPackage = (XmlPackageImpl)EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI); - SOAPPackageImpl theSOAPPackage = (SOAPPackageImpl)EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI); - - // Add supertypes to classes - typeMappingEClass.getESuperTypes().add(this.getMapping()); - arrayMappingEClass.getESuperTypes().add(this.getMapping()); - beanMappingEClass.getESuperTypes().add(this.getMapping()); - handlerEClass.getESuperTypes().add(this.getParameterizable()); - deployableItemEClass.getESuperTypes().add(this.getParameterizable()); - globalConfigurationEClass.getESuperTypes().add(this.getDeployableItem()); - transportEClass.getESuperTypes().add(this.getDeployableItem()); - serviceEClass.getESuperTypes().add(this.getDeployableItem()); - - // Initialize classes and features; add operations and parameters - initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getParameter_Value(), ecorePackage.getEString(), "value", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(mappingEClass, Mapping.class, "Mapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getMapping_Qname(), theXmlPackage.getQName(), "qname", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMapping_Type(), theXmlPackage.getQName(), "type", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMapping_EncodingStyle(), ecorePackage.getEString(), "encodingStyle", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(typeMappingEClass, TypeMapping.class, "TypeMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getTypeMapping_Serializer(), ecorePackage.getEString(), "serializer", null, 0, 1, TypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTypeMapping_Deserializer(), ecorePackage.getEString(), "deserializer", null, 0, 1, TypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(arrayMappingEClass, ArrayMapping.class, "ArrayMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getArrayMapping_InnerType(), theXmlPackage.getQName(), "innerType", null, 0, 1, ArrayMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(beanMappingEClass, BeanMapping.class, "BeanMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(operationParameterEClass, OperationParameter.class, "OperationParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getOperationParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperationParameter_Qname(), theXmlPackage.getQName(), "qname", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperationParameter_Type(), theXmlPackage.getQName(), "type", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperationParameter_Mode(), this.getParameterMode(), "mode", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperationParameter_InHeader(), ecorePackage.getEBooleanObject(), "inHeader", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperationParameter_OutHeader(), ecorePackage.getEBooleanObject(), "outHeader", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperationParameter_ItemQName(), theXmlPackage.getQName(), "itemQName", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(faultEClass, Fault.class, "Fault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getFault_Name(), ecorePackage.getEString(), "name", null, 0, 1, Fault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getFault_Qname(), theXmlPackage.getQName(), "qname", null, 0, 1, Fault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getFault_Class(), ecorePackage.getEString(), "class", null, 0, 1, Fault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getFault_Type(), theXmlPackage.getQName(), "type", null, 0, 1, Fault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(operationEClass, Operation.class, "Operation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getOperation_Name(), ecorePackage.getEString(), "name", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperation_Qname(), theXmlPackage.getQName(), "qname", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperation_ReturnQName(), theXmlPackage.getQName(), "returnQName", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperation_ReturnType(), theXmlPackage.getQName(), "returnType", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperation_ReturnItemQName(), theXmlPackage.getQName(), "returnItemQName", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperation_ReturnItemType(), theXmlPackage.getQName(), "returnItemType", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperation_SoapAction(), ecorePackage.getEString(), "soapAction", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperation_Mep(), ecorePackage.getEString(), "mep", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOperation_ReturnHeader(), ecorePackage.getEBooleanObject(), "returnHeader", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getOperation_Parameters(), this.getOperationParameter(), null, "parameters", null, 0, -1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getOperation_Faults(), this.getFault(), null, "faults", null, 0, -1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(parameterizableEClass, Parameterizable.class, "Parameterizable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getParameterizable_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Parameterizable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - EOperation op = addEOperation(parameterizableEClass, null, "setParameter"); - addEParameter(op, ecorePackage.getEString(), "name", 1, 1); - addEParameter(op, ecorePackage.getEString(), "value", 1, 1); - - initEClass(handlerEClass, Handler.class, "Handler", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getHandler_Name(), ecorePackage.getEString(), "name", null, 0, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getHandler_Type(), theXmlPackage.getQName(), "type", null, 0, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(flowEClass, Flow.class, "Flow", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getFlow_Handlers(), this.getHandler(), null, "handlers", null, 0, -1, Flow.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(deployableItemEClass, DeployableItem.class, "DeployableItem", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getDeployableItem_RequestFlow(), this.getFlow(), null, "requestFlow", null, 0, 1, DeployableItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDeployableItem_ResponseFlow(), this.getFlow(), null, "responseFlow", null, 0, 1, DeployableItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(globalConfigurationEClass, GlobalConfiguration.class, "GlobalConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(transportEClass, Transport.class, "Transport", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getTransport_Name(), ecorePackage.getEString(), "name", null, 0, 1, Transport.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTransport_Pivot(), theXmlPackage.getQName(), "pivot", null, 0, 1, Transport.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getService_Name(), ecorePackage.getEString(), "name", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getService_Provider(), theXmlPackage.getQName(), "provider", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getService_Use(), theSOAPPackage.getUse(), "use", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getService_Style(), theSOAPPackage.getStyle(), "style", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getService_Namespaces(), ecorePackage.getEString(), "namespaces", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getService_Operations(), this.getOperation(), null, "operations", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getService_TypeMappings(), this.getTypeMapping(), null, "typeMappings", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getService_BeanMappings(), this.getBeanMapping(), null, "beanMappings", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getService_ArrayMappings(), this.getArrayMapping(), null, "arrayMappings", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(deploymentEClass, Deployment.class, "Deployment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getDeployment_Name(), ecorePackage.getEString(), "name", null, 0, 1, Deployment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDeployment_GlobalConfiguration(), this.getGlobalConfiguration(), null, "globalConfiguration", null, 0, 1, Deployment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDeployment_Handlers(), this.getHandler(), null, "handlers", null, 0, -1, Deployment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDeployment_Transports(), this.getTransport(), null, "transports", null, 0, -1, Deployment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDeployment_Services(), this.getService(), null, "services", null, 0, -1, Deployment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - op = addEOperation(deploymentEClass, null, "merge"); - addEParameter(op, this.getDeployment(), "other", 1, 1); - - // Initialize enums and add enum literals - initEEnum(parameterModeEEnum, ParameterMode.class, "ParameterMode"); - addEEnumLiteral(parameterModeEEnum, ParameterMode.IN_LITERAL); - addEEnumLiteral(parameterModeEEnum, ParameterMode.OUT_LITERAL); - addEEnumLiteral(parameterModeEEnum, ParameterMode.INOUT_LITERAL); - - // Create resource - createResource(eNS_URI); - - // Create annotations - // http:///org/eclipse/emf/ecore/util/ExtendedMetaData - createExtendedMetaDataAnnotations(); - } - - /** - * Initializes the annotations for http:///org/eclipse/emf/ecore/util/ExtendedMetaData. - * - * - * @generated - */ - protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; - addAnnotation - (getOperation_Parameters(), - source, - new String[] { - "kind", "element", - "name", "parameter", - "namespace", "##targetNamespace" - }); - addAnnotation - (getOperation_Faults(), - source, - new String[] { - "kind", "element", - "name", "fault", - "namespace", "##targetNamespace" - }); - addAnnotation - (getParameterizable_Parameters(), - source, - new String[] { - "kind", "element", - "name", "parameter", - "namespace", "##targetNamespace" - }); - addAnnotation - (getFlow_Handlers(), - source, - new String[] { - "name", "handler", - "kind", "element", - "namespace", "##targetNamespace" - }); - addAnnotation - (getDeployableItem_RequestFlow(), - source, - new String[] { - "kind", "element", - "name", "requestFlow", - "namespace", "##targetNamespace" - }); - addAnnotation - (getDeployableItem_ResponseFlow(), - source, - new String[] { - "kind", "element", - "name", "responseFlow", - "namespace", "##targetNamespace" - }); - addAnnotation - (getService_Namespaces(), - source, - new String[] { - "kind", "element", - "name", "namespace", - "namespace", "##targetNamespace" - }); - addAnnotation - (getService_Operations(), - source, - new String[] { - "kind", "element", - "name", "operation", - "namespace", "##targetNamespace" - }); - addAnnotation - (getService_TypeMappings(), - source, - new String[] { - "kind", "element", - "name", "typeMapping", - "namespace", "##targetNamespace" - }); - addAnnotation - (getService_BeanMappings(), - source, - new String[] { - "kind", "element", - "name", "beanMapping", - "namespace", "##targetNamespace" - }); - addAnnotation - (getService_ArrayMappings(), - source, - new String[] { - "kind", "element", - "name", "arrayMapping", - "namespace", "##targetNamespace" - }); - addAnnotation - (deploymentEClass, - source, - new String[] { - "name", "deployment", - "kind", "element" - }); - addAnnotation - (getDeployment_GlobalConfiguration(), - source, - new String[] { - "kind", "element", - "name", "globalConfiguration", - "namespace", "##targetNamespace" - }); - addAnnotation - (getDeployment_Handlers(), - source, - new String[] { - "name", "handler", - "kind", "element", - "namespace", "##targetNamespace" - }); - addAnnotation - (getDeployment_Transports(), - source, - new String[] { - "name", "transport", - "kind", "element", - "namespace", "##targetNamespace" - }); - addAnnotation - (getDeployment_Services(), - source, - new String[] { - "name", "service", - "kind", "element", - "namespace", "##targetNamespace" - }); - } - - /** - * - * Defines literals for the meta objects that represent - *
Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * - * - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.apache.axis.model.xml.impl.XmlPackageImpl#eNS_URI - * @see #init() - * @generated - */ - private XmlPackageImpl() { - super(eNS_URI, ((EFactory)XmlFactory.INSTANCE)); - } - - /** - * - * - * @generated - */ - private static boolean isInited = false; - - /** - * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * - *
This method is used to initialize {@link XmlPackageImpl#eINSTANCE} when that field is accessed. - * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. - * - * - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() - * @generated - */ - public static XmlPackageImpl init() { - if (isInited) return (XmlPackageImpl)EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI); - - // Obtain or create and register package - XmlPackageImpl theXmlPackage = (XmlPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XmlPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new XmlPackageImpl()); - - isInited = true; - - // Obtain or create and register interdependencies - WSDDPackageImpl theWSDDPackage = (WSDDPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI) instanceof WSDDPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI) : WSDDPackageImpl.eINSTANCE); - SOAPPackageImpl theSOAPPackage = (SOAPPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI) instanceof SOAPPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI) : SOAPPackageImpl.eINSTANCE); - - // Create package meta-data objects - theXmlPackage.createPackageContents(); - theWSDDPackage.createPackageContents(); - theSOAPPackage.createPackageContents(); - - // Initialize created meta-data - theXmlPackage.initializePackageContents(); - theWSDDPackage.initializePackageContents(); - theSOAPPackage.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theXmlPackage.freeze(); - - - // Update the registry and return the package - EPackage.Registry.INSTANCE.put(XmlPackageImpl.eNS_URI, theXmlPackage); - return theXmlPackage; - } - - - /** - * Returns the meta object for data type '{@link javax.xml.namespace.QName QName}'. - * - * - * @return the meta object for data type 'QName'. - * @see javax.xml.namespace.QName - * @model instanceClass="javax.xml.namespace.QName" - * @generated - */ - public EDataType getQName() { - return qNameEDataType; - } - - /** - * Returns the factory that creates the instances of the model. - * - * - * @return the factory that creates the instances of the model. - * @generated - */ - public XmlFactory getXmlFactory() { - return (XmlFactory)getEFactoryInstance(); - } - - /** - * - * - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void createPackageContents() { - if (isCreated) return; - isCreated = true; - - // Create data types - qNameEDataType = createEDataType(QNAME); - } - - /** - * - * - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void initializePackageContents() { - if (isInitialized) return; - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Initialize data types - initEDataType(qNameEDataType, QName.class, "QName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - - // Create resource - createResource(eNS_URI); - } - - /** - * - * Defines literals for the meta objects that represent - *
Configuration properties for AXIS. - *
+ * Configuration properties for AXIS. * *Manage configuration properties according to a secure * scheme similar to that used by classloaders: @@ -70,7 +69,6 @@ * *
qname.
*
* @param qname the QName to check
- * @return true if this Handler can handle qname,
+ * @return true if this Handler can handle qname,
* false otherwise
*/
public boolean canHandleBlock(QName qname);
diff --git a/axis-rt-core/src/main/java/org/apache/axis/Part.java b/axis-rt-core/src/main/java/org/apache/axis/Part.java
index 39f8ae57ba..04eebf7907 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/Part.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/Part.java
@@ -32,7 +32,6 @@ public interface Part extends java.io.Serializable
* "Content-Type"
* @return a String array giving all the values for
* the specified header
- * @see #setMimeHeader(java.lang.String, java.lang.String) setMimeHeader(java.lang.String, java.lang.String)
*/
public String[] getMimeHeader(String name);
diff --git a/axis-rt-core/src/main/java/org/apache/axis/SOAPPart.java b/axis-rt-core/src/main/java/org/apache/axis/SOAPPart.java
index b14af1833f..a983f36c9d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/SOAPPart.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/SOAPPart.java
@@ -827,7 +827,7 @@ public java.util.Iterator getNonMatchingMimeHeaders( final String[] match){
/**
* Sets the content of the SOAPEnvelope object
* with the data from the given Source object.
- * @param source javax.xml.transform.Source object with the data to
+ * @param source javax.xml.transform.Source object with the data to
* be set
* @throws SOAPException if there is a problem in
* setting the source
@@ -950,7 +950,7 @@ public Iterator getAllMimeHeaders() {
* current value(s) of the first header that is a match if
* there is one. If there is no match, this value will be
* the value for a new MimeHeader object.
- * @ throws java.lang.IllegalArgumentException if
+ * @throws java.lang.IllegalArgumentException if
* there was a problem with the specified mime header name
* or value
* @see #getMimeHeader(java.lang.String) getMimeHeader(java.lang.String)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java b/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java
index 5d9c65d7f9..33020e07b8 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java
@@ -319,51 +319,60 @@ void send(java.io.OutputStream os, byte position, DataHandler dh,
void send(java.io.OutputStream os, byte position, DynamicContentDataHandler dh,
final long maxchunk)
throws java.io.IOException {
-
- BufferedInputStream in = new BufferedInputStream(dh.getInputStream());
-
- final int myChunkSize = dh.getChunkSize();
-
- byte[] buffer1 = new byte[myChunkSize];
- byte[] buffer2 = new byte[myChunkSize];
-
- int bytesRead1 = 0 , bytesRead2 = 0;
-
- bytesRead1 = in.read(buffer1);
-
- if(bytesRead1 < 0) {
+
+ BufferedInputStream in = new BufferedInputStream(dh.getInputStream());
+
+ try {
+ final int myChunkSize = dh.getChunkSize();
+
+ byte[] buffer1 = new byte[myChunkSize];
+ byte[] buffer2 = new byte[myChunkSize];
+
+ int bytesRead1 = 0 , bytesRead2 = 0;
+
+ bytesRead1 = in.read(buffer1);
+
+ if(bytesRead1 < 0) {
sendHeader(os, position, 0, ONLY_CHUNK);
os.write(pad, 0, dimePadding(0));
return;
- }
- byte chunkbyte = CHUNK;
- do {
- bytesRead2 = in.read(buffer2);
-
- if(bytesRead2 < 0) {
- //last record...do not set the chunk bit.
- //buffer1 contains the last chunked record!!
-
- //Need to distinguish if this is the first
- //chunk to ensure the TYPE and ID are sent
- if ( chunkbyte == CHUNK ){
- chunkbyte = ONLY_CHUNK;
- } else {
- chunkbyte = LAST_CHUNK;
- }
- sendChunk(os, position, buffer1, 0, bytesRead1, chunkbyte);
- break;
- }
-
- sendChunk(os, position, buffer1, 0, bytesRead1, chunkbyte);
- //set chunk byte to next chunk flag to avoid
- //sending TYPE and ID on subsequent chunks
- chunkbyte = CHUNK_NEXT;
- //now that we have written out buffer1, copy buffer2 into to buffer1
- System.arraycopy(buffer2,0,buffer1,0,myChunkSize);
- bytesRead1 = bytesRead2;
-
- }while(bytesRead2 > 0);
+ }
+ byte chunkbyte = CHUNK;
+ do {
+ bytesRead2 = in.read(buffer2);
+
+ if(bytesRead2 < 0) {
+ //last record...do not set the chunk bit.
+ //buffer1 contains the last chunked record!!
+
+ //Need to distinguish if this is the first
+ //chunk to ensure the TYPE and ID are sent
+ if ( chunkbyte == CHUNK ){
+ chunkbyte = ONLY_CHUNK;
+ } else {
+ chunkbyte = LAST_CHUNK;
+ }
+ sendChunk(os, position, buffer1, 0, bytesRead1, chunkbyte);
+ break;
+ }
+
+ sendChunk(os, position, buffer1, 0, bytesRead1, chunkbyte);
+ //set chunk byte to next chunk flag to avoid
+ //sending TYPE and ID on subsequent chunks
+ chunkbyte = CHUNK_NEXT;
+ //now that we have written out buffer1, copy buffer2 into to buffer1
+ System.arraycopy(buffer2,0,buffer1,0,myChunkSize);
+ bytesRead1 = bytesRead2;
+
+ }while(bytesRead2 > 0);
+ } finally {
+ try {
+ in.close();
+ }
+ catch (IOException e) {
+ // ignore
+ }
+ }
}
protected void sendChunk(java.io.OutputStream os,
@@ -415,7 +424,7 @@ protected void sendHeader(java.io.OutputStream os,
if ( MB || isFirstChunk ){ //If this is a follow on chunk dont send id again.
fixedHeader[1] = (byte) ((dtnf.toByte() << 4) & 0xf0);
} else {
- fixedHeader[1] = (byte) 0x00;
+ fixedHeader[1] = (byte) 0x00;
}
//OPT_T
@@ -430,7 +439,7 @@ protected void sendHeader(java.io.OutputStream os,
fixedHeader[4] = (byte) ((id.length >>> 8) & 0xff);
fixedHeader[5] = (byte) ((id.length) & 0xff);
} else {
- fixedHeader[4] = (byte) 0;
+ fixedHeader[4] = (byte) 0;
fixedHeader[5] = (byte) 0;
}
@@ -439,7 +448,7 @@ protected void sendHeader(java.io.OutputStream os,
fixedHeader[6] = (byte) ((type.length >>> 8) & 0xff);
fixedHeader[7] = (byte) ((type.length) & 0xff);
} else {
- fixedHeader[6] = (byte) 0;
+ fixedHeader[6] = (byte) 0;
fixedHeader[7] = (byte) 0;
}
diff --git a/axis-rt-core/src/main/java/org/apache/axis/attachments/ImageDataSource.java b/axis-rt-core/src/main/java/org/apache/axis/attachments/ImageDataSource.java
index 0fe4fe621c..c07958e828 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/attachments/ImageDataSource.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/attachments/ImageDataSource.java
@@ -37,7 +37,7 @@ public class ImageDataSource implements DataSource {
protected static Log log =
LogFactory.getLog(ImageDataSource.class.getName());
- public static final String CONTENT_TYPE = "image/jpeg";
+ public static final String CONTENT_TYPE = "image/png";
private final String name;
private final String contentType;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/attachments/MimeUtils.java b/axis-rt-core/src/main/java/org/apache/axis/attachments/MimeUtils.java
index 3028d6efe2..e7061537da 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/attachments/MimeUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/attachments/MimeUtils.java
@@ -249,7 +249,7 @@ public static javax.mail.internet.MimeMultipart createMP(
if(sendType == Attachments.SEND_TYPE_MTOM) {
multipart = new javax.mail.internet.MimeMultipart(
- "related;type=\"application/xop+xml\"; start=\"<" + rootCID + ">\"; start-info=\"text/xml; charset=utf-8\"");
+ "related;type=\"application/xop+xml\"; start=\"<" + rootCID + ">\"; start-info=\"text/xml\"; charset=\"utf-8\"");
} else {
multipart = new javax.mail.internet.MimeMultipart(
"related; type=\"text/xml\"; start=\"<" + rootCID + ">\"");
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java b/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java
index 319d1459b3..39faaaace7 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java
@@ -107,7 +107,7 @@ private static String getUsageInfo()
/**
* Construct an admin client w/o a logger.
* If the client cannot create a call object, then it does not throw an exception.
- * Instead it prints a message to {@link System.err}.
+ * Instead it prints a message to {@link System#err}.
* This is for 'historical reasons'
*/
public AdminClient()
@@ -152,7 +152,7 @@ private void initAdminClient() throws ServiceException {
/**
- * External access to our CallCall object.
* This will be null if the non-excepting constructor was used
* and the construction failed.
* @return the Call object this instance uses
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/AxisClient.java b/axis-rt-core/src/main/java/org/apache/axis/client/AxisClient.java
index 1d64c9ee57..199fd8f766 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/AxisClient.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/AxisClient.java
@@ -35,7 +35,7 @@
/**
* Provides the equivalent of an "Axis engine" on the client side.
- * Subclasses hardcode initialization & setup logic for particular
+ * Subclasses hardcode initialization & setup logic for particular
* client-side transports.
*
* @author Rob Jellinghaus (robj@unrealities.com)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/Call.java b/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
index 9a0ce97fa3..a71362ace6 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
@@ -2340,7 +2340,7 @@ public void registerTypeMapping(Class javaType,
* invoked method. If any of these objects are RPCParams,
* Axis will use the embedded name of the RPCParam as the
* name of the parameter. Otherwise, we will serialize
- * each argument as an XML element called "arg".
+ * each argument as an XML element called "arg<n>".
* @return a deserialized Java Object containing the return value
* @exception AxisFault
*/
@@ -2382,7 +2382,7 @@ public Object invoke(String namespace, String method, Object[] args)
* invoked method. If any of these objects are RPCParams,
* Axis will use the embedded name of the RPCParam as the
* name of the parameter. Otherwise, we will serialize
- * each argument as an XML element called "arg".
+ * each argument as an XML element called "arg<n>".
* @return a deserialized Java Object containing the return value
* @exception AxisFault
*/
@@ -2893,7 +2893,7 @@ public Service getService()
*
* Set the service so that it defers missing property gets to the
* Call. So when client-side Handlers get at the MessageContext,
- * the property scoping will be MC -> SOAPService -> Call
+ * the property scoping will be MC -> SOAPService -> Call
*/
public void setSOAPService(SOAPService service)
{
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java b/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
index 33054a557f..57d7694d85 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
@@ -17,9 +17,11 @@
package org.apache.axis.client;
import org.apache.axis.EngineConfiguration;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.configuration.EngineConfigurationFactoryFinder;
import org.apache.axis.utils.ClassUtils;
import org.apache.axis.utils.Messages;
+import org.apache.commons.logging.Log;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -47,6 +49,9 @@
public class ServiceFactory extends javax.xml.rpc.ServiceFactory
implements ObjectFactory
{
+ protected static Log log =
+ LogFactory.getLog(ServiceFactory.class.getName());
+
// Constants for RefAddrs in the Reference.
public static final String SERVICE_CLASSNAME = "service classname";
public static final String WSDL_LOCATION = "WSDL location";
@@ -106,6 +111,11 @@ public static Service getService(Map environment)
if (context != null) {
String name = (String)environment.get("jndiName");
+
+ if(name!=null && (name.toUpperCase().indexOf("LDAP")!=-1 || name.toUpperCase().indexOf("RMI")!=-1 || name.toUpperCase().indexOf("JMS")!=-1 || name.toUpperCase().indexOf("JMX")!=-1 || name.toUpperCase().indexOf("JRMP")!=-1 || name.toUpperCase().indexOf("JAVA")!=-1 || name.toUpperCase().indexOf("DNS")!=-1 || name.toUpperCase().indexOf("IIOP")!=-1 || name.toUpperCase().indexOf("CORBANAME")!=-1)) {
+ log.warn("returning null, jndiName received by ServiceFactory.getService() is not supported by this method: " + name);
+ return null;
+ }
if (name == null) {
name = "axisServiceName";
}
@@ -120,6 +130,7 @@ public static Service getService(Map environment)
context.bind(name, service);
} catch (NamingException e1) {
// !!! Couldn't do it, what should we do here?
+ return null;
}
}
} else {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/Stub.java b/axis-rt-core/src/main/java/org/apache/axis/client/Stub.java
index 6af6438438..72df6dc7cc 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/Stub.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/Stub.java
@@ -432,11 +432,14 @@ public Service _getService() {
* @return
*/
public Call _createCall() throws ServiceException {
- _call = (Call) service.createCall();
+ // A single stub instance may be used concurrently by multiple threads; therefore we need
+ // to return the value of the local call variable instead of reading the _call attribute.
+ Call call = (Call) service.createCall();
+ _call = call;
// TODO: There is a lot of code in the generated stubs that
// can be moved here.
- return _call;
+ return call;
}
/**
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPSTransportClientProperties.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPSTransportClientProperties.java
index bcd6d6a06a..9c03eb8359 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPSTransportClientProperties.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPSTransportClientProperties.java
@@ -47,7 +47,7 @@ public String getNonProxyHosts() {
}
/**
- * @see org.apache.axis.components.net.TransportClientProperties#getPort()
+ * @see org.apache.axis.components.net.TransportClientProperties#getProxyPort()
*/
public String getProxyPort() {
if (proxyPort == null) {
@@ -58,7 +58,7 @@ public String getProxyPort() {
}
/**
- * @see org.apache.axis.components.net.TransportClientProperties#getUser()
+ * @see org.apache.axis.components.net.TransportClientProperties#getProxyUser()
*/
public String getProxyUser() {
if (proxyUser == null) {
@@ -69,7 +69,7 @@ public String getProxyUser() {
}
/**
- * @see org.apache.axis.components.net.TransportClientProperties#getPassword()
+ * @see org.apache.axis.components.net.TransportClientProperties#getProxyPassword()
*/
public String getProxyPassword() {
if (proxyPassword == null) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
index 45310bc1c1..44784bd1b9 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
@@ -58,7 +58,7 @@ public String getNonProxyHosts() {
}
/**
- * @see org.apache.axis.components.net.TransportClientProperties#getPort()
+ * @see org.apache.axis.components.net.TransportClientProperties#getProxyPort()
*/
public String getProxyPort() {
if (proxyPort == null) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMFakeTrustSocketFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMFakeTrustSocketFactory.java
deleted file mode 100644
index b52de77676..0000000000
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMFakeTrustSocketFactory.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.axis.components.net;
-
-import com.ibm.net.ssl.SSLContext;
-import com.ibm.net.ssl.TrustManager;
-import com.ibm.net.ssl.X509TrustManager;
-import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.utils.Messages;
-import org.apache.commons.logging.Log;
-
-import java.util.Hashtable;
-
-/**
- * Hook for Axis sender, allowing unsigned server certs
- */
-public class IBMFakeTrustSocketFactory extends IBMJSSESocketFactory {
-
- /** Field log */
- protected static Log log =
- LogFactory.getLog(IBMFakeTrustSocketFactory.class.getName());
-
- /**
- * Constructor FakeTrustSocketFactory
- *
- * @param attributes
- */
- public IBMFakeTrustSocketFactory(Hashtable attributes) {
- super(attributes);
- }
-
- /**
- * Method getContext
- *
- * @return
- *
- * @throws Exception
- */
- protected SSLContext getContext() throws Exception {
-
- try {
- SSLContext sc = SSLContext.getInstance("SSL");
-
- sc.init(null, // we don't need no stinkin KeyManager
- new TrustManager[]{new FakeX509TrustManager()},
- new java.security.SecureRandom());
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage("ftsf00"));
- }
- return sc;
- } catch (Exception exc) {
- log.error(Messages.getMessage("ftsf01"), exc);
- throw new Exception(Messages.getMessage("ftsf02"));
- }
- }
-
- /**
- * Class FakeX509TrustManager
- */
- public static class FakeX509TrustManager implements X509TrustManager {
-
- /** Field log */
- protected static Log log =
- LogFactory.getLog(FakeX509TrustManager.class.getName());
-
- /**
- * Method isClientTrusted
- *
- * @param chain
- *
- * @return
- */
- public boolean isClientTrusted(java.security.cert
- .X509Certificate[] chain) {
-
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage("ftsf03"));
- }
- return true;
- }
-
- /**
- * Method isServerTrusted
- *
- * @param chain
- *
- * @return
- */
- public boolean isServerTrusted(java.security.cert
- .X509Certificate[] chain) {
-
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage("ftsf04"));
- }
- return true;
- }
-
- /**
- * Method getAcceptedIssuers
- *
- * @return
- */
- public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage("ftsf05"));
- }
- return null;
- }
- }
-}
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMJSSESocketFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMJSSESocketFactory.java
deleted file mode 100644
index 264de0cd44..0000000000
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMJSSESocketFactory.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.axis.components.net;
-
-import com.ibm.jsse.JSSEProvider;
-import com.ibm.net.ssl.KeyManagerFactory;
-import com.ibm.net.ssl.SSLContext;
-import com.ibm.net.ssl.TrustManager;
-import com.ibm.net.ssl.TrustManagerFactory;
-import org.apache.axis.utils.Messages;
-import org.apache.axis.utils.XMLUtils;
-
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import java.io.BufferedWriter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.net.Socket;
-import java.security.KeyStore;
-import java.security.Security;
-import java.util.Hashtable;
-
-/**
- * SSL socket factory. It _requires_ a valid RSA key and
- * JSSE. (borrowed code from tomcat)
- *
- * @author Davanum Srinivas (dims@yahoo.com)
- */
-public class IBMJSSESocketFactory extends JSSESocketFactory implements SecureSocketFactory {
-
- /** Field keystoreType */
- private String keystoreType;
-
- /** Field defaultKeystoreType */
- static String defaultKeystoreType = "JKS";
-
- /** Field defaultProtocol */
- static String defaultProtocol = "TLS";
-
- /** Field defaultAlgorithm */
- static String defaultAlgorithm = "IbmX509";
-
- /** Field defaultClientAuth */
- static boolean defaultClientAuth = false;
-
- /** Field clientAuth */
- private boolean clientAuth = false;
-
- /** Field defaultKeystoreFile */
- static String defaultKeystoreFile =
- System.getProperty("user.home") + "/.keystore";
-
- /** Field defaultKeyPass */
- static String defaultKeyPass = "changeit";
-
- /**
- * Constructor IBMJSSESocketFactory
- *
- * @param attributes
- */
- public IBMJSSESocketFactory(Hashtable attributes) {
- super(attributes);
- }
-
- /**
- * Read the keystore, init the SSL socket factory
- *
- * @throws IOException
- */
- protected void initFactory() throws IOException {
-
- try {
- Security.addProvider(new com.ibm.jsse.JSSEProvider());
- Security.addProvider(new com.ibm.crypto.provider.IBMJCE());
-
- if(attributes == null) {
- //No configuration specified. Get the default.
- sslFactory = (SSLSocketFactory) SSLSocketFactory.getDefault();
- } else {
- //Configuration specified in wsdd.
- SSLContext context = getContext();
- sslFactory = context.getSocketFactory();
- }
- } catch (Exception e) {
- if (e instanceof IOException) {
- throw (IOException) e;
- }
- throw new IOException(e.getMessage());
- }
- }
-
- /**
- * gets a SSL Context
- *
- * @return SSLContext
- * @throws Exception
- */
- protected SSLContext getContext() throws Exception {
- // Please don't change the name of the attribute - other
- // software may depend on it ( j2ee for sure )
- String keystoreFile = (String) attributes.get("keystore");
- if (keystoreFile == null) {
- keystoreFile = defaultKeystoreFile;
- }
-
- keystoreType = (String) attributes.get("keystoreType");
- if (keystoreType == null) {
- keystoreType = defaultKeystoreType;
- }
-
- // determine whether we want client authentication
- // the presence of the attribute enables client auth
- clientAuth = null != (String) attributes.get("clientauth");
- String keyPass = (String) attributes.get("keypass");
- if (keyPass == null) {
- keyPass = defaultKeyPass;
- }
-
- String keystorePass = (String) attributes.get("keystorePass");
- if (keystorePass == null) {
- keystorePass = keyPass;
- }
-
- // protocol for the SSL ie - TLS, SSL v3 etc.
- String protocol = (String) attributes.get("protocol");
- if (protocol == null) {
- protocol = defaultProtocol;
- }
-
- // Algorithm used to encode the certificate ie - SunX509
- String algorithm = (String) attributes.get("algorithm");
- if (algorithm == null) {
- algorithm = defaultAlgorithm;
- }
-
- // You can't use ssl without a server certificate.
- // Create a KeyStore ( to get server certs )
- KeyStore kstore = initKeyStore(keystoreFile, keystorePass);
-
- // Key manager will extract the server key
- KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
-
- kmf.init(kstore, keyPass.toCharArray());
-
- // If client authentication is needed, set up TrustManager
- TrustManager[] tm = null;
-
- if (clientAuth) {
- TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-
- tmf.init(kstore);
- tm = tmf.getTrustManagers();
- }
-
- // Create a SSLContext ( to create the ssl factory )
- // This is the only way to use server sockets with JSSE 1.0.1
- SSLContext context = SSLContext.getInstance(protocol); // SSL
-
- // init context with the key managers
- context.init(kmf.getKeyManagers(), tm,
- new java.security.SecureRandom());
- return context;
- }
-
- /**
- * intializes a keystore.
- *
- * @param keystoreFile
- * @param keyPass
- *
- * @return keystore
- * @throws IOException
- */
- private KeyStore initKeyStore(String keystoreFile, String keyPass)
- throws IOException {
- try {
- KeyStore kstore = KeyStore.getInstance(keystoreType);
-
- InputStream istream = new FileInputStream(keystoreFile);
- kstore.load(istream, keyPass.toCharArray());
- return kstore;
- } catch (FileNotFoundException fnfe) {
- throw fnfe;
- } catch (IOException ioe) {
- throw ioe;
- } catch (Exception ex) {
- ex.printStackTrace();
- throw new IOException("Exception trying to load keystore "
- + keystoreFile + ": " + ex.getMessage());
- }
- }
-}
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java
index dd3f991fb5..abffcdd06f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java
@@ -15,12 +15,6 @@
*/
package org.apache.axis.components.net;
-import org.apache.axis.utils.Messages;
-import org.apache.axis.utils.XMLUtils;
-import org.apache.axis.utils.StringUtils;
-
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStream;
@@ -28,7 +22,33 @@
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.Socket;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+import javax.naming.InvalidNameException;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
+import org.apache.axis.utils.Messages;
+import org.apache.axis.utils.StringUtils;
+import org.apache.axis.utils.XMLUtils;
/**
@@ -41,6 +61,10 @@
*/
public class JSSESocketFactory extends DefaultSocketFactory implements SecureSocketFactory {
+ // This is a a sorted list, if you insert new elements do it orderdered.
+ private final static String[] BAD_COUNTRY_2LDS =
+ {"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info",
+ "lg", "ne", "net", "or", "org"};
/** Field sslFactory */
protected SSLSocketFactory sslFactory = null;
@@ -187,6 +211,279 @@ public Socket create(
if (log.isDebugEnabled()) {
log.debug(Messages.getMessage("createdSSL00"));
}
+ verifyHostName(host, (SSLSocket) sslSocket);
return sslSocket;
}
+ /**
+ * Verifies that the given hostname in certicifate is the hostname we are trying to connect to.
+ * This resolves CVE-2012-5784 and CVE-2014-3596
+ * @param host
+ * @param ssl
+ * @throws IOException
+ */
+
+ private static void verifyHostName(String host, SSLSocket ssl)
+ throws IOException {
+ if (host == null) {
+ throw new IllegalArgumentException("host to verify was null");
+ }
+
+ SSLSession session = ssl.getSession();
+ if (session == null) {
+ // In our experience this only happens under IBM 1.4.x when
+ // spurious (unrelated) certificates show up in the server's chain.
+ // Hopefully this will unearth the real problem:
+ InputStream in = ssl.getInputStream();
+ in.available();
+ /*
+ If you're looking at the 2 lines of code above because you're
+ running into a problem, you probably have two options:
+
+ #1. Clean up the certificate chain that your server
+ is presenting (e.g. edit "/etc/apache2/server.crt" or
+ wherever it is your server's certificate chain is
+ defined).
+
+ OR
+
+ #2. Upgrade to an IBM 1.5.x or greater JVM, or switch to a
+ non-IBM JVM.
+ */
+
+ // If ssl.getInputStream().available() didn't cause an exception,
+ // maybe at least now the session is available?
+ session = ssl.getSession();
+ if (session == null) {
+ // If it's still null, probably a startHandshake() will
+ // unearth the real problem.
+ ssl.startHandshake();
+
+ // Okay, if we still haven't managed to cause an exception,
+ // might as well go for the NPE. Or maybe we're okay now?
+ session = ssl.getSession();
+ }
+ }
+
+ Certificate[] certs = session.getPeerCertificates();
+ verifyHostName(host.trim().toLowerCase(Locale.US), (X509Certificate) certs[0]);
+ }
+ /**
+ * Extract the names from the certificate and tests host matches one of them
+ * @param host
+ * @param cert
+ * @throws SSLException
+ */
+
+ private static void verifyHostName(final String host, X509Certificate cert)
+ throws SSLException {
+ // I'm okay with being case-insensitive when comparing the host we used
+ // to establish the socket to the hostname in the certificate.
+ // Don't trim the CN, though.
+
+ String[] cns = getCNs(cert);
+ String[] subjectAlts = getDNSSubjectAlts(cert);
+ verifyHostName(host, cns, subjectAlts);
+
+ }
+
+ /**
+ * Extract all alternative names from a certificate.
+ * @param cert
+ * @return
+ */
+ private static String[] getDNSSubjectAlts(X509Certificate cert) {
+ LinkedList subjectAltList = new LinkedList();
+ Collection c = null;
+ try {
+ c = cert.getSubjectAlternativeNames();
+ } catch (CertificateParsingException cpe) {
+ // Should probably log.debug() this?
+ cpe.printStackTrace();
+ }
+ if (c != null) {
+ Iterator it = c.iterator();
+ while (it.hasNext()) {
+ List list = (List) it.next();
+ int type = ((Integer) list.get(0)).intValue();
+ // If type is 2, then we've got a dNSName
+ if (type == 2) {
+ String s = (String) list.get(1);
+ subjectAltList.add(s);
+ }
+ }
+ }
+ if (!subjectAltList.isEmpty()) {
+ String[] subjectAlts = new String[subjectAltList.size()];
+ subjectAltList.toArray(subjectAlts);
+ return subjectAlts;
+ } else {
+ return new String[0];
+ }
+
+ }
+ /**
+ * Verifies
+ * @param host
+ * @param cn
+ * @param subjectAlts
+ * @throws SSLException
+ */
+
+ private static void verifyHostName(final String host, String[] cns, String[] subjectAlts)throws SSLException{
+ StringBuffer cnTested = new StringBuffer();
+
+ for (int i = 0; i < subjectAlts.length; i++){
+ String name = subjectAlts[i];
+ if (name != null) {
+ name = name.toLowerCase(Locale.US);
+ if (verifyHostName(host, name)){
+ return;
+ }
+ cnTested.append("/").append(name);
+ }
+ }
+ for (int i = 0; i < cns.length; i++) {
+ String cn = cns[i];
+ if (cn != null) {
+ cn = cn.toLowerCase(Locale.US);
+ if (verifyHostName(host, cn)) {
+ return;
+ }
+ cnTested.append("/").append(cn);
+ }
+ }
+ throw new SSLException("hostname in certificate didn't match: <"
+ + host + "> != <" + cnTested + ">");
+ }
+
+ private static boolean verifyHostName(final String host, final String cn){
+ if (doWildCard(cn) && !isIPAddress(host)) {
+ return matchesWildCard(cn, host);
+ }
+ return host.equalsIgnoreCase(cn);
+ }
+ private static boolean doWildCard(String cn) {
+ // Contains a wildcard
+ // wildcard in the first block
+ // not an ipaddress (ip addres must explicitily be equal)
+ // not using 2nd level common tld : ex: not for *.co.uk
+ String parts[] = cn.split("\\.");
+ return parts.length >= 3 &&
+ parts[0].endsWith("*") &&
+ acceptableCountryWildcard(cn) &&
+ !isIPAddress(cn);
+ }
+
+ private static final Pattern IPV4_PATTERN =
+ Pattern.compile("^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$");
+
+ private static final Pattern IPV6_STD_PATTERN =
+ Pattern.compile("^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$");
+
+ private static final Pattern IPV6_HEX_COMPRESSED_PATTERN =
+ Pattern.compile("^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$");
+
+
+ private static boolean isIPAddress(final String hostname) {
+ return hostname != null
+ && (
+ IPV4_PATTERN.matcher(hostname).matches()
+ || IPV6_STD_PATTERN.matcher(hostname).matches()
+ || IPV6_HEX_COMPRESSED_PATTERN.matcher(hostname).matches()
+ );
+
+ }
+
+ private static boolean acceptableCountryWildcard(final String cn) {
+ // The CN better have at least two dots if it wants wildcard action,
+ // but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc...
+ // The [*.co.uk] problem is an interesting one. Should we just
+ // hope that CA's would never foolishly allow such a
+ // certificate to happen?
+
+ String[] parts = cn.split("\\.");
+ // Only checks for 3 levels, with country code of 2 letters.
+ if (parts.length > 3 || parts[parts.length - 1].length() != 2) {
+ return true;
+ }
+ String countryCode = parts[parts.length - 2];
+ return Arrays.binarySearch(BAD_COUNTRY_2LDS, countryCode) < 0;
+ }
+
+ private static boolean matchesWildCard(final String cn,
+ final String hostName) {
+ String parts[] = cn.split("\\.");
+ boolean match = false;
+ String firstpart = parts[0];
+ if (firstpart.length() > 1) {
+ // server∗
+ // e.g. server
+ String prefix = firstpart.substring(0, firstpart.length() - 1);
+ // skipwildcard part from cn
+ String suffix = cn.substring(firstpart.length());
+ // skip wildcard part from host
+ String hostSuffix = hostName.substring(prefix.length());
+ match = hostName.startsWith(prefix) && hostSuffix.endsWith(suffix);
+ } else {
+ match = hostName.endsWith(cn.substring(1));
+ }
+ if (match) {
+ // I f we ’ r e i n s t r i c t mode ,
+ // [ ∗.foo.com] is not allowed to match [a.b.foo.com]
+ match = countDots(hostName) == countDots(cn);
+ }
+ return match;
+ }
+
+ private static int countDots(final String data) {
+ int dots = 0;
+ for (int i = 0; i < data.length(); i++) {
+ if (data.charAt(i) == '.') {
+ dots += 1;
+ }
+ }
+ return dots;
+ }
+
+
+ private static String[] getCNs(X509Certificate cert) {
+ // Note: toString() seems to do a better job than getName()
+ //
+ // For example, getName() gives me this:
+ // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d
+ //
+ // whereas toString() gives me this:
+ // EMAILADDRESS=juliusdavies@cucbc.com
+ String subjectPrincipal = cert.getSubjectX500Principal().toString();
+
+ return getCNs(subjectPrincipal);
+
+ }
+ private static String[] getCNs(String subjectPrincipal) {
+ if (subjectPrincipal == null) {
+ return null;
+ }
+ final List cns = new ArrayList();
+ try {
+ final LdapName subjectDN = new LdapName(subjectPrincipal);
+ final List rdns = subjectDN.getRdns();
+ for (int i = rdns.size() - 1; i >= 0; i--) {
+ final Rdn rds = (Rdn) rdns.get(i);
+ final Attributes attributes = rds.toAttributes();
+ final Attribute cn = attributes.get("cn");
+ if (cn != null) {
+ try {
+ final Object value = cn.get();
+ if (value != null) {
+ cns.add(value.toString());
+ }
+ }
+ catch (NamingException ignore) {}
+ }
+ }
+ }
+ catch (InvalidNameException ignore) { }
+ return cns.isEmpty() ? null : (String[]) cns.toArray(new String[ cns.size() ]);
+ }
+
}
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/SecureSocketFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/SecureSocketFactory.java
index d90e38ffa3..d91fd886d8 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/SecureSocketFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/SecureSocketFactory.java
@@ -19,7 +19,7 @@
/**
* Secure Socket factory.
* This has a separate interface to allow discovery (by interface)
- * and runtime distinction to be made between Socket & SecureSockets.
+ * and runtime distinction to be made between Socket & SecureSockets.
*
* @author Richard A. Sitze
* @author Davanum Srinivas (dims@yahoo.com)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/SocketFactoryFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/SocketFactoryFactory.java
index 9de2796fe8..0d50f73472 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/SocketFactoryFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/SocketFactoryFactory.java
@@ -56,7 +56,7 @@ public class SocketFactoryFactory {
/**
* Returns a copy of the environment's default socket factory.
*
- * @param protocol Today this only supports "http" & "https".
+ * @param protocol Today this only supports "http" & "https".
* @param attributes
*
* @return
diff --git a/axis-rt-core/src/main/java/org/apache/axis/configuration/DefaultConfiguration.java b/axis-rt-core/src/main/java/org/apache/axis/configuration/DefaultConfiguration.java
index a77d233136..dffa3a0230 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/configuration/DefaultConfiguration.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/configuration/DefaultConfiguration.java
@@ -33,9 +33,9 @@
/**
* Configuration provider that loads the default Axis configuration. It first loads the
- * org/apache/axis/<type>/<type>-config.wsdd resource and then searches for resources
- * with name META-INF/axis/default-<type>-config.wsdd. All the discovered WSDD documents
- * are merged into a single configuration. <type> identifies the engine type for which
+ * org/apache/axis/<type>/<type>-config.wsdd resource and then searches for resources
+ * with name META-INF/axis/default-<type>-config.wsdd. All the discovered WSDD documents
+ * are merged into a single configuration. <type> identifies the engine type for which
* the configuration is to be built; it is either client or server.
*
* This class looks up the resources using the thread context class loader, except if it determines
@@ -47,8 +47,8 @@
* The algorithm implemented by this class is designed to support the modularized artifacts
* introduced in Axis 1.4.1. It allows individual JARs to contribute items (transports, handlers,
* etc.) to the default configuration. The naming convention for the base configuration file
- * (org/apache/axis/<type>/<type>-config.wsdd) was chosen for consistency with Axis
- * 1.4, while META-INF/axis/default-<type>-config.wsdd is new in Axis 1.4.1.
+ * (org/apache/axis/<type>/<type>-config.wsdd) was chosen for consistency with Axis
+ * 1.4, while META-INF/axis/default-<type>-config.wsdd is new in Axis 1.4.1.
*
* {@link DefaultConfiguration} is also used by {@link FileProvider} to build the configuration if
* no existing configuration file is found.
diff --git a/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java b/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
index 41dcf82975..7d4559491e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
@@ -152,19 +152,20 @@ public void setSearchClasspath(boolean searchClasspath) {
public void configureEngine(AxisEngine engine)
throws ConfigurationException {
try {
- if (getInputStream() == null) {
+ InputStream configFileInputStream = getInputStream();
+ if (configFileInputStream == null) {
try {
- setInputStream(new FileInputStream(configFile));
+ configFileInputStream = new FileInputStream(configFile);
} catch (Exception e) {
// Ignore and continue
}
}
- if (getInputStream() == null && searchClasspath) {
+ if (configFileInputStream == null && searchClasspath) {
// Attempt to load the file from the classpath
- setInputStream(ClassUtils.getResourceAsStream(filename, engine.getClass().getClassLoader()));
+ configFileInputStream = ClassUtils.getResourceAsStream(filename, engine.getClass().getClassLoader());
}
- if (getInputStream() == null) {
+ if (configFileInputStream == null) {
// Load the default configuration. This piece of code provides compatibility with Axis 1.4,
// which ends up loading org/apache/axis/(client|server)/(client|server)-config.wsdd if
// (1) filename is (client|server)-config.wsdd;
@@ -184,7 +185,7 @@ public void configureEngine(AxisEngine engine)
deployment = defaultConfig.getDeployment();
} else {
WSDDDocument doc = new WSDDDocument(XMLUtils.
- newDocument(getInputStream()));
+ newDocument(configFileInputStream));
deployment = doc.getDeployment();
deployment.configureEngine(engine);
diff --git a/axis-rt-core/src/main/java/org/apache/axis/configuration/XMLStringProvider.java b/axis-rt-core/src/main/java/org/apache/axis/configuration/XMLStringProvider.java
index 6c0a33c91c..b30aa4b29c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/configuration/XMLStringProvider.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/configuration/XMLStringProvider.java
@@ -28,14 +28,14 @@
* This provider does not write configuration to persistent storage.
*
* Example of usage:
- * new XMLStringProvider("
- *
+ * <operation name="name" qname="element QName" returnQName="QName">
+ * <parameter ... />
+ * </operation>
*
*/
public class WSDDOperation extends WSDDElement
@@ -55,7 +55,7 @@ public WSDDOperation(OperationDesc desc) {
/**
* Constructor from XML
*
- * @param e (Element) the element
+ * @param e (Element) the <operation> element
* @param parent our ServiceDesc.
* @throws WSDDException XXX
*/
diff --git a/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java b/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java
index 2730061783..30777300d8 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java
@@ -136,7 +136,6 @@ public void setPivotQName(QName pivotQName) {
/**
*
- * @param pivot XXX
* @param registry XXX
* @return XXX
* @throws ConfigurationException XXX
diff --git a/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java b/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
index b5c0b40fb2..2d03bc9eec 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
@@ -36,12 +36,13 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.holders.Holder;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
@@ -140,7 +141,7 @@ public class JavaServiceDesc implements ServiceDesc {
/** Method names for which we have completed any introspection necessary */
private ArrayList completedNames = new ArrayList();
- /** Our typemapping for resolving Java<->XML type issues */
+ /** Our typemapping for resolving Java<->XML type issues */
private TypeMapping tm = null;
private TypeMappingRegistry tmr = null;
@@ -520,11 +521,15 @@ public OperationDesc getOperationByElementQName(QName qname)
getSyncedOperationsForName(implClass,
((OperationDesc)overloads.get(0)).getName());
+ // Convert to array before sorting to avoid concurrency issues
+ OperationDesc[] array = (OperationDesc[])overloads.toArray(
+ new OperationDesc[overloads.size()]);
+
// Sort the overloads by number of arguments - prevents us calling methods
// with more parameters than supplied in the request (with missing parameters
// defaulted to null) when a perfectly good method exists with exactly the
// supplied parameters.
- Collections.sort(overloads,
+ Arrays.sort(array,
new Comparator() {
public int compare(Object o1, Object o2)
{
@@ -535,8 +540,7 @@ public int compare(Object o1, Object o2)
}
});
- OperationDesc [] array = new OperationDesc [overloads.size()];
- return (OperationDesc[])overloads.toArray(array);
+ return array;
}
private synchronized void initQNameMap() {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/description/OperationDesc.java b/axis-rt-core/src/main/java/org/apache/axis/description/OperationDesc.java
index ebc9441945..0e280443a2 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/description/OperationDesc.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/description/OperationDesc.java
@@ -398,7 +398,7 @@ else if ( qname.equals(returnDesc.getQName())) {
/**
* Return a list of ALL "in" params (including INOUTs)
*
- * Note: if we were sure the order went IN->INOUT->OUT, we could optimize
+ * Note: if we were sure the order went IN->INOUT->OUT, we could optimize
* this.
*
* @return
@@ -417,7 +417,7 @@ public ArrayList getAllInParams() {
/**
* Return a list of ALL "out" params (including INOUTs)
*
- * Note: if we were sure the order went IN->INOUT->OUT, we could optimize
+ * Note: if we were sure the order went IN->INOUT->OUT, we could optimize
* this.
*
* @return
diff --git a/axis-rt-core/src/main/java/org/apache/axis/description/TypeDesc.java b/axis-rt-core/src/main/java/org/apache/axis/description/TypeDesc.java
index 66dbfde33c..f44ae27d82 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/description/TypeDesc.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/description/TypeDesc.java
@@ -34,7 +34,7 @@
import java.util.WeakHashMap;
/**
- * A TypeDesc represents a Java<->XML data binding. It is essentially
+ * A TypeDesc represents a Java<->XML data binding. It is essentially
* a collection of FieldDescs describing how to map each field in a Java
* class to XML.
*
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializationContext.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializationContext.java
index dc7b9af450..dccf3dba7e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializationContext.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializationContext.java
@@ -346,7 +346,7 @@ public String getNamespaceURI(String prefix)
}
/**
- * Construct a QName from a string of the form :
+ * Construct a QName from a string of the form <prefix>:<localName>
* @param qNameStr is the prefixed name from the xml text
* @return QName
*/
@@ -670,8 +670,8 @@ public void addObjectById(String id, Object obj)
}
/**
- * During deserialization, an element with an href=#id
- * may be encountered before the element defining id=id is
+ * During deserialization, an element with an href=#id<int>
+ * may be encountered before the element defining id=id<int> is
* read. In these cases, the getObjectByRef method above will
* return null. The deserializer is placed in a table keyed
* by href (a fixup table). After the element id is processed,
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializerFactory.java
index dbfd6fdf53..f2c6195155 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializerFactory.java
@@ -24,8 +24,8 @@
* of the following methods:
*
* public static create(Class javaType, QName xmlType)
- * public (Class javaType, QName xmlType)
- * public ()
+ * public <constructor>(Class javaType, QName xmlType)
+ * public <constructor>()
*
* The deployment code will attempt to invoke these methods in the above order.
* The xmlType, javaType arguments are filled in with the values supplied during the
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java
index 9c39adda33..f33ec28dfc 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java
@@ -79,7 +79,7 @@
* and element stacks.
*
* @author Glen Daniels (gdaniels@apache.org)
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class SerializationContext implements javax.xml.rpc.encoding.SerializationContext
{
@@ -406,7 +406,7 @@ public TypeMappingRegistry getTypeMappingRegistry() {
* return a valid prefix - if the given URI is already mapped in this
* serialization, we return the previous prefix. If it is not mapped,
* we will add a new mapping and return a generated prefix of the form
- * "ns".
+ * "ns<num>".
* @param uri is the namespace uri
* @return prefix
*/
@@ -419,7 +419,7 @@ public String getPrefixForURI(String uri)
* Get a prefix for the given namespace URI. If one has already been
* defined in this serialization, use that. Otherwise, map the passed
* default prefix to the URI, and return that. If a null default prefix
- * is passed, use one of the form "ns"
+ * is passed, use one of the form "ns<num>"
*/
public String getPrefixForURI(String uri, String defaultPrefix)
{
@@ -430,7 +430,7 @@ public String getPrefixForURI(String uri, String defaultPrefix)
* Get a prefix for the given namespace URI. If one has already been
* defined in this serialization, use that. Otherwise, map the passed
* default prefix to the URI, and return that. If a null default prefix
- * is passed, use one of the form "ns"
+ * is passed, use one of the form "ns<num>"
*/
public String getPrefixForURI(String uri, String defaultPrefix, boolean attribute)
{
@@ -522,7 +522,7 @@ public boolean isEncoded() {
}
/**
- * Convert QName to a string of the form :
+ * Convert QName to a string of the form <prefix>:<localpart>
* @param qName
* @return prefixed qname representation for serialization.
*/
@@ -571,7 +571,7 @@ public String qName2String(QName qName)
}
/**
- * Convert attribute QName to a string of the form :
+ * Convert attribute QName to a string of the form <prefix>:<localpart>
* There are slightly different rules for attributes:
* - There is no default namespace
* - any attribute in a namespace must have a prefix
@@ -819,7 +819,7 @@ public void serialize(QName elemQName,
* @param attributes are additional attributes
* @param value is the object to serialize
* @param xmlType is the qname of the type or null.
- * @param javaType is the java type of the value
+ * @param javaClass is the java type of the value
* @param sendNull determines whether to send null values.
* @param sendType determines whether to set xsi:type attribute.
*/
@@ -1181,12 +1181,13 @@ public void startElement(QName qName, Attributes attributes)
sb.append(':');
sb.append(map.getPrefix());
}
- if ((vecQNames==null) || (vecQNames.indexOf(sb.toString())==-1)) {
+ String qname = sb.toString();
+ if ((vecQNames==null) || (vecQNames.indexOf(qname)==-1)) {
writer.write(' ');
- sb.append("=\"");
- sb.append(map.getNamespaceURI());
- sb.append('"');
- writer.write(sb.toString());
+ writer.write(qname);
+ writer.write("=\"");
+ getEncoder().writeEncoded(writer, map.getNamespaceURI());
+ writer.write('"');
}
}
}
@@ -1276,7 +1277,7 @@ public void writeString(String string)
/**
* Convenience operation to write out (to Writer) the String
- * properly encoded with xml entities (like &)
+ * properly encoded with xml entities (like &)
* @param string is the String to write.
*/
public void writeSafeString(String string)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/Serializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/Serializer.java
index 9bbc961ab6..53b6d95412 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/Serializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/Serializer.java
@@ -29,8 +29,8 @@
* An Axis compliant Serializer must provide one or more
* of the following methods:
*
- * public (Class javaType, QName xmlType)
- * public ()
+ * public <constructor>(Class javaType, QName xmlType)
+ * public <constructor>()
*
* This will allow for construction of generic factories that introspect the class
* to determine how to construct a deserializer.
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializerFactory.java
index f49560d9cb..590e2f4981 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializerFactory.java
@@ -24,8 +24,8 @@
* of the following methods:
*
* public static create(Class javaType, QName xmlType)
- * public (Class javaType, QName xmlType)
- * public ()
+ * public <constructor>(Class javaType, QName xmlType)
+ * public <constructor>()
*
* The deployment code will attempt to invoke these methods in the above order.
* The xmlType, javaType arguments are filled in with the values supplied during the
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/TypeMappingRegistryImpl.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/TypeMappingRegistryImpl.java
index 37e99a2189..0d44d90c02 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/TypeMappingRegistryImpl.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/TypeMappingRegistryImpl.java
@@ -22,44 +22,39 @@
import java.util.HashMap;
/**
- *
* The TypeMappingRegistry keeps track of the individual TypeMappings.
- *
*
* The TypeMappingRegistry for axis contains a default type mapping
* that is set for either SOAP 1.1 or SOAP 1.2
* The default type mapping is a singleton used for the entire
* runtime and should not have anything new registered in it.
- *
*
* Instead the new TypeMappings for the deploy and service are
* made in a separate TypeMapping which is identified by
* the soap encoding. These new TypeMappings delegate back to
* the default type mapping when information is not found.
- *
*
* So logically we have:
*
* TMR
* | |
- * | +---------------> DefaultTM
+ * | +---------------> DefaultTM
* | ^
* | |
- * +----> TM --delegate---+
+ * +----> TM --delegate---+
*
*
* But in the implementation, the TMR references
* "delegate" TypeMappings (TM') which then reference the actual TM's
- *
*
* So the picture is really:
*
* TMR
* | |
- * | +-----------TM'------> DefaultTM
+ * | +-----------TM'------> DefaultTM
* | ^
* | |
- * +-TM'-> TM ----+
+ * +-TM'-> TM ----+
*
*
* This extra indirection is necessary because the user may want to
@@ -71,8 +66,8 @@
* | |
* | +-----------TM'--+ DefaultTM
* | ^ |
- * | | +---> New User Defined Default TM
- * +-TM'-> TM ----+
+ * | | +---> New User Defined Default TM
+ * +-TM'-> TM ----+
*
*
* The other reason that it is necessary is when a deploy
@@ -82,26 +77,26 @@
*
* Deploy TMR
* | |
- * | +-----------TM'------> DefaultTM
+ * | +-----------TM'------> DefaultTM
* | ^
* | |
- * +-TM'-> TM ----+
+ * +-TM'-> TM ----+
*
* Service TMR
* | |
- * | +-----------TM'------> DefaultTM
+ * | +-----------TM'------> DefaultTM
* | ^
* | |
- * +-TM'-> TM ----+
+ * +-TM'-> TM ----+
*
* ServiceTMR.delegate(DeployTMR)
*
* Deploy TMR
* | |
- * | +------------TM'------> DefaultTM
+ * | +------------TM'------> DefaultTM
* | ^ ^
* | | |
- * +-TM'-> TM ----+ |
+ * +-TM'-> TM ----+ |
* ^ |
* +-------+ |
* | |
@@ -110,7 +105,7 @@
* | | +----------TM'-+
* | |
* | |
- * | +-TM'-> TM +
+ * | +-TM'-> TM +
* | |
* +----------------+
*
@@ -118,12 +113,11 @@
* So now the service uses the DefaultTM of the Deploy TMR, and
* the Service TM properly delegates to the deploy's TM. And
* if either the deploy defaultTM or TMs change, the links are not broken.
- *
*
* @author James Snell (jasnell@us.ibm.com)
* @author Sam Ruby (rubys@us.ibm.com)
* Re-written for JAX-RPC Compliance by
- * @author Rich Scheuerle (scheu@us.ibm.com
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class TypeMappingRegistryImpl implements TypeMappingRegistry {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializer.java
index cdb690f641..6f2ad0666f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializer.java
@@ -66,7 +66,7 @@ public class ArrayDeserializer extends DeserializerImpl
/**
* This method is invoked after startElement when the element requires
- * deserialization (i.e. the element is not an href & the value is not nil)
+ * deserialization (i.e. the element is not an href & the value is not nil)
* DeserializerImpl provides default behavior, which simply
* involves obtaining a correct Deserializer and plugging its handler.
* @param namespace is the namespace of the element
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializerFactory.java
index 4dc2ab17e7..710a6109e0 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializerFactory.java
@@ -22,7 +22,7 @@
/**
* DeserializerFactory for arrays
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class ArrayDeserializerFactory extends BaseDeserializerFactory {
private QName componentXmlType;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArraySerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArraySerializerFactory.java
index 163670e145..53a38e5f72 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArraySerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArraySerializerFactory.java
@@ -25,7 +25,7 @@
/**
* SerializerFactory for arrays
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class ArraySerializerFactory extends BaseSerializerFactory {
public ArraySerializerFactory() {
@@ -75,7 +75,7 @@ public QName getComponentType() {
return componentType;
}
/**
- * Obtains a serializer by invoking (javaType, xmlType)
+ * Obtains a serializer by invoking <constructor>(javaType, xmlType)
* on the serClass.
*/
protected Serializer getGeneralPurpose(String mechanismType)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Deserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Deserializer.java
index 33d31b7cd3..ae7f827e32 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Deserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Deserializer.java
@@ -23,8 +23,8 @@
/**
* Deserializer for Base64
*
- * @author Sam Ruby
- * Modified by @author Rich scheuerle
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
* @see XML Schema 3.2.16
*/
public class Base64Deserializer extends SimpleDeserializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64DeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64DeserializerFactory.java
index deaf4f3bba..bc24c270d1 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64DeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64DeserializerFactory.java
@@ -20,7 +20,7 @@
/**
* DeserializerFactory for hexBinary.
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class Base64DeserializerFactory extends BaseDeserializerFactory {
public Base64DeserializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Serializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Serializer.java
index 7a585f146e..7ade201c63 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Serializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Serializer.java
@@ -30,8 +30,8 @@
/**
* Serializer for Base64
*
- * @author Sam Ruby
- * Modified by @author Rich Scheuerle
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * Modified by @author Rich Scheuerle (scheu@us.ibm.com)
* @see XML Schema 3.2.16
*/
public class Base64Serializer implements SimpleValueSerializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64SerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64SerializerFactory.java
index 6d74b1ede6..fdb51328be 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64SerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64SerializerFactory.java
@@ -20,7 +20,7 @@
/**
* SerializerFactory for hexBinary.
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class Base64SerializerFactory extends BaseSerializerFactory {
public Base64SerializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseDeserializerFactory.java
index 76bd709828..9409b8b9c4 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseDeserializerFactory.java
@@ -34,7 +34,7 @@
/**
* Base class for Axis Deserialization Factory classes for code reuse
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public abstract class BaseDeserializerFactory extends BaseFactory
implements DeserializerFactory {
@@ -101,7 +101,7 @@ public BaseDeserializerFactory(Class deserClass,
}
/**
- * Obtains a deserializer by invoking (javaType, xmlType)
+ * Obtains a deserializer by invoking <constructor>(javaType, xmlType)
* on the deserClass.
*/
protected Deserializer getGeneralPurpose(String mechanismType) {
@@ -188,8 +188,8 @@ public Iterator getSupportedMechanismTypes() {
* Utility method that intospects on a factory class to decide how to
* create the factory. Tries in the following order:
* public static create(Class javaType, QName xmlType)
- * public (Class javaType, QName xmlType)
- * public ()
+ * public <constructor>(Class javaType, QName xmlType)
+ * public <constructor>()
* @param factory class
* @param javaType
* @param xmlType
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseFactory.java
index 1ab5889d19..ee5ded0f7c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseFactory.java
@@ -25,7 +25,7 @@
* Base Factory for BaseDeserializerFactory and BaseSerializerFactory.
* Code Reuse for the method cache
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
*/
public abstract class BaseFactory {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseSerializerFactory.java
index a9efc6632c..68ba4e8ac4 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseSerializerFactory.java
@@ -34,7 +34,7 @@
/**
* Base class for Axis Serialization Factory classes for code reuse
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public abstract class BaseSerializerFactory extends BaseFactory
implements SerializerFactory {
@@ -111,7 +111,7 @@ protected Serializer getSerializerAsInternal(String mechanismType)
}
/**
- * Obtains a serializer by invoking (javaType, xmlType)
+ * Obtains a serializer by invoking <constructor>(javaType, xmlType)
* on the serClass.
*/
protected Serializer getGeneralPurpose(String mechanismType) {
@@ -217,8 +217,8 @@ public Class getJavaType() {
* Utility method that intospects on a factory class to decide how to
* create the factory. Tries in the following order:
* public static create(Class javaType, QName xmlType)
- * public (Class javaType, QName xmlType)
- * public ()
+ * public <constructor>(Class javaType, QName xmlType)
+ * public <constructor>()
* @param factory class
* @param xmlType
* @param javaType
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializer.java
index 44e518b34b..42f6293edd 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializer.java
@@ -45,9 +45,9 @@
/**
* General purpose deserializer for an arbitrary java bean.
*
- * @author Sam Ruby
- * @author Rich Scheuerle
- * @author Tom Jordahl
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * @author Rich Scheuerle (scheu@us.ibm.com)
+ * @author Tom Jordahl (tomj@macromedia.com)
*/
public class BeanDeserializer extends DeserializerImpl implements Serializable
{
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializerFactory.java
index d39f0cd846..dd5e99c024 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializerFactory.java
@@ -30,8 +30,8 @@
/**
* DeserializerFactory for Bean
*
- * @author Rich Scheuerle
- * @author Sam Ruby
+ * @author Rich Scheuerle (scheu@us.ibm.com)
+ * @author Sam Ruby (rubys@us.ibm.com)
*/
public class BeanDeserializerFactory extends BaseDeserializerFactory {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializer.java
index 62150eba08..8501edb7c5 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializer.java
@@ -48,9 +48,9 @@
/**
* General purpose serializer/deserializerFactory for an arbitrary java bean.
*
- * @author Sam Ruby
- * @author Rich Scheuerle
- * @author Tom Jordahl
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * @author Rich Scheuerle (scheu@us.ibm.com)
+ * @author Tom Jordahl (tomj@macromedia.com)
*/
public class BeanSerializer implements Serializer, Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializerFactory.java
index 9a28aaa0a1..4e415d3d41 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializerFactory.java
@@ -30,7 +30,7 @@
/**
* SerializerFactory for Bean
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class BeanSerializerFactory extends BaseSerializerFactory {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializer.java
index a5e8ef87b3..b8cc8e28ac 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializer.java
@@ -33,8 +33,8 @@
/**
* Serializer for dateTime (Calendar).
*
- * @author Sam Ruby
- * Modified by @author Rich scheuerle
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
* @see XML Schema 3.2.16
*/
public class CalendarSerializer implements SimpleValueSerializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializerFactory.java
index dfa095f583..4fc9d3932a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializerFactory.java
@@ -20,7 +20,7 @@
/**
* SerializerFactory for Calendar(dateTime) primitives
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class CalendarSerializerFactory extends BaseSerializerFactory {
public CalendarSerializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializer.java
index c5a313b5e8..7205ed00f8 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializer.java
@@ -33,8 +33,8 @@
/**
* Serializer for Dates.
*
- * @author Sam Ruby
- * Modified by @author Rich scheuerle
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
* @see XML Schema 3.2.16
*/
public class DateSerializer implements SimpleValueSerializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializerFactory.java
index 33e0517b41..35e4d56dd2 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializerFactory.java
@@ -20,7 +20,7 @@
/**
* SerializerFactory for Date primitives
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class DateSerializerFactory extends BaseSerializerFactory {
public DateSerializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializer.java
index 81fa0d15e9..dd9f57c355 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializer.java
@@ -30,7 +30,7 @@
/**
* Deserializer for DOM Document
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
*/
public class DocumentDeserializer extends DeserializerImpl
{
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializerFactory.java
index 6acdc57317..77ee73b9ff 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializerFactory.java
@@ -21,7 +21,7 @@
/**
* DeserializerFactory for DOM Document.
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
*/
public class DocumentDeserializerFactory extends BaseDeserializerFactory {
public DocumentDeserializerFactory() {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializer.java
index e805a8b917..6627e32bf7 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializer.java
@@ -31,7 +31,7 @@
/**
* Serializer for DOM Document
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
*/
public class DocumentSerializer implements Serializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializerFactory.java
index dda6a81965..8b11d167bf 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializerFactory.java
@@ -21,7 +21,7 @@
/**
* SerializerFactory for DOM Document
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
*/
public class DocumentSerializerFactory extends BaseSerializerFactory {
public DocumentSerializerFactory() {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializer.java
index 7d61e9a1d4..e939ee2ee9 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializer.java
@@ -31,7 +31,7 @@
* Deserializer for DOM elements
*
* @author Glen Daniels (gdaniels@apache.org)
- * Modified by @author Rich scheuerle
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
*/
public class ElementDeserializer extends DeserializerImpl
{
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializerFactory.java
index 40f79aa1a1..8248a4e4a8 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializerFactory.java
@@ -20,7 +20,7 @@
/**
* DeserializerFactory for Element.
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class ElementDeserializerFactory extends BaseDeserializerFactory {
public ElementDeserializerFactory() {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializer.java
index 2e91676e2e..28cd467314 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializer.java
@@ -32,7 +32,7 @@
* Serializer for DOM elements
*
* @author Glen Daniels (gdaniels@apache.org)
- * Modified by @author Rich scheuerle
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
*/
public class ElementSerializer implements Serializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializerFactory.java
index 7afa42d32d..e080e45835 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializerFactory.java
@@ -20,7 +20,7 @@
/**
* SerializerFactory for Element
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class ElementSerializerFactory extends BaseSerializerFactory {
public ElementSerializerFactory() {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializer.java
index 364d399c14..c28628049e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializer.java
@@ -25,8 +25,8 @@
/**
* Deserializer for a JAX-RPC enum.
*
- * @author Rich Scheuerle
- * @author Sam Ruby
+ * @author Rich Scheuerle (scheu@us.ibm.com)
+ * @author Sam Ruby (rubys@us.ibm.com)
*/
public class EnumDeserializer extends SimpleDeserializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializerFactory.java
index 722384c766..9367d59896 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializerFactory.java
@@ -20,7 +20,7 @@
/**
* DeserializerFactory for Enumeration.
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class EnumDeserializerFactory extends BaseDeserializerFactory {
public EnumDeserializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializer.java
index 217f982138..f5f3541c7f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializer.java
@@ -30,8 +30,8 @@
/**
* Serializer for a JAX-RPC enum.
*
- * @author Rich Scheuerle
- * @author Sam Ruby
+ * @author Rich Scheuerle (scheu@us.ibm.com)
+ * @author Sam Ruby (rubys@us.ibm.com)
*/
public class EnumSerializer extends SimpleSerializer
{
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializerFactory.java
index dc9c339cea..20dbefaaab 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializerFactory.java
@@ -20,7 +20,7 @@
/**
* SerializerFactory for Enum
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class EnumSerializerFactory extends BaseSerializerFactory {
public EnumSerializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializer.java
index a1e76d5403..740de2f7c3 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializer.java
@@ -23,8 +23,8 @@
/**
* Deserializer for hexBinary.
*
- * @author Davanum Srinivas
- * Modified by @author Rich scheuerle
+ * @author Davanum Srinivas (dims@yahoo.com)
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
* @see XML Schema 3.2.16
*/
public class HexDeserializer extends SimpleDeserializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializerFactory.java
index c7eb9d0ba4..ea55961cc2 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializerFactory.java
@@ -20,7 +20,7 @@
/**
* DeserializerFactory for hexBinary.
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class HexDeserializerFactory extends BaseDeserializerFactory {
public HexDeserializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializer.java
index 32414e08b8..08197d6efb 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializer.java
@@ -30,8 +30,8 @@
/**
* Serializer for hexBinary.
*
- * @author Davanum Srinivas
- * Modified by @author Rich scheuerle
+ * @author Davanum Srinivas (dims@yahoo.com)
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
* @see XML Schema 3.2.16
*/
public class HexSerializer implements SimpleValueSerializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializerFactory.java
index 4ff02c8c11..f1b9987336 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializerFactory.java
@@ -20,7 +20,7 @@
/**
* SerializerFactory for hexBinary.
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class HexSerializerFactory extends BaseSerializerFactory {
public HexSerializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ImageDataHandlerDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ImageDataHandlerDeserializer.java
index 856430d0ba..e27427d3a2 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ImageDataHandlerDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ImageDataHandlerDeserializer.java
@@ -30,7 +30,7 @@
/**
* ImageDataHandler Deserializer
- * Modified by Russell Butek
+ * Modified by Russell Butek (butek@us.ibm.com)
*/
public class ImageDataHandlerDeserializer extends JAFDataHandlerDeserializer {
protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java
index ad7e102a6a..d223a19ea4 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java
@@ -34,7 +34,7 @@
/**
* JAFDataHandler Serializer
* @author Rick Rineholt
- * Modified by Rich Scheuerle
+ * Modified by Rich Scheuerle (scheu@us.ibm.com)
*/
public class JAFDataHandlerDeserializer extends DeserializerImpl {
protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java
index eb9bd24dc3..e59544f245 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java
@@ -38,7 +38,7 @@
/**
* JAFDataHandler Serializer
* @author Rick Rineholt
- * Modified by Rich Scheuerle
+ * Modified by Rich Scheuerle (scheu@us.ibm.com)
*/
public class JAFDataHandlerSerializer implements Serializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapDeserializer.java
index 3794b443fd..d510fb9ddc 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapDeserializer.java
@@ -31,13 +31,13 @@
import java.util.HashMap;
import java.util.Map;
-/*
+/**
* A MapSerializer is be used to deserialize
* deserialize Maps using the SOAP-ENC
* encoding style.
*
* @author Glen Daniels (gdaniels@apache.org)
- * Modified by @author Rich scheuerle
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
*/
public class MapDeserializer extends DeserializerImpl {
@@ -135,7 +135,7 @@ public void setChildValue(Object value, Object hint) throws SAXException
}
/**
- * A deserializer for an - . Handles getting the key and
+ * A deserializer for an <item>. Handles getting the key and
* value objects from their own deserializers, and then putting
* the values into the HashMap we're building.
*
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapSerializer.java
index e4dbb16db0..22eb4c7415 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapSerializer.java
@@ -55,7 +55,7 @@ public class MapSerializer implements Serializer
/** Serialize a Map
*
* Walk the collection of keys, serializing each key/value pair
- * inside an
- element.
+ * inside an <item> element.
*
* @param name the desired QName for the element
* @param attributes the desired attributes for the element
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/OctetStreamDataHandlerDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/OctetStreamDataHandlerDeserializer.java
index 9a7080fa2d..2093a02289 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/OctetStreamDataHandlerDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/OctetStreamDataHandlerDeserializer.java
@@ -30,7 +30,7 @@
/**
* application/octet-stream DataHandler Deserializer
- * Modified by Davanum Srinivas
+ * Modified by Davanum Srinivas (dims@yahoo.com)
*/
public class OctetStreamDataHandlerDeserializer extends JAFDataHandlerDeserializer {
protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/PlainTextDataHandlerDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/PlainTextDataHandlerDeserializer.java
index f79d202827..8e7a36aa0c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/PlainTextDataHandlerDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/PlainTextDataHandlerDeserializer.java
@@ -27,7 +27,7 @@
/**
* text/plain DataHandler Deserializer
- * Modified by Russell Butek
+ * Modified by Russell Butek (butek@us.ibm.com)
*/
public class PlainTextDataHandlerDeserializer extends JAFDataHandlerDeserializer {
protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializer.java
index 8d00c947ab..f230f50d8d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializer.java
@@ -40,9 +40,9 @@
/**
* Deserializer for
- *
- *
- *
+ * <xsd:simpleType ...>
+ * <xsd:list itemType="...">
+ * </xsd:simpleType>
* based on SimpleDeserializer
*
* @author Ias (iasandcb@tmax.co.kr)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializerFactory.java
index 1c209e0a2e..fdff4d955b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializerFactory.java
@@ -25,9 +25,9 @@
/**
* DeserializerFactory for
- *
- *
- *
+ * <xsd:simpleType ...>
+ * <xsd:list itemType="...">
+ * </xsd:simpleType>
* based on SimpleDeserializerFactory
*
* @author Ias (iasandcb@tmax.co.kr)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java
index 706465691a..da2c3b3803 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java
@@ -36,12 +36,12 @@
/**
* Serializer for
- *
- *
- *
+ * <xsd:simpleType ...>
+ * <xsd:list itemType="...">
+ * </xsd:simpleType>
* based on SimpleSerializer
*
- * @author Ias
+ * @author Ias (iasandcb@tmax.co.kr)
*/
public class SimpleListSerializer implements SimpleValueSerializer {
public QName xmlType;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleSerializer.java
index c067ce4141..9bc1606d1f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleSerializer.java
@@ -38,7 +38,7 @@
/**
* Serializer for primitives and anything simple whose value is obtained with toString()
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (dims@yahoo.com)
*/
public class SimpleSerializer implements SimpleValueSerializer {
public QName xmlType;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java
index 537157da15..4b35219c6a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java
@@ -28,7 +28,7 @@
/**
* SourceDataHandler Deserializer
- * Modified by Russell Butek
+ * Modified by Russell Butek (butek@us.ibm.com)
*/
public class SourceDataHandlerDeserializer extends JAFDataHandlerDeserializer {
protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorDeserializer.java
index 64c88d4529..91a2e4890c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorDeserializer.java
@@ -34,7 +34,7 @@
* Deserializer for SOAP Vectors for compatibility with SOAP 2.2.
*
* @author Carsten Ziegeler (cziegeler@apache.org)
- * Modified by @author Rich scheuerle
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
*/
public class VectorDeserializer extends DeserializerImpl
{
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorSerializer.java
index 3b8a47de89..ade227f040 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorSerializer.java
@@ -48,7 +48,7 @@ public class VectorSerializer implements Serializer
/** Serialize a Vector
*
* Walk the collection of keys, serializing each key/value pair
- * inside an - element.
+ * inside an <item> element.
*
* @param name the desired QName for the element
* @param attributes the desired attributes for the element
diff --git a/axis-rt-core/src/main/java/org/apache/axis/holders/SchemaHolder.java b/axis-rt-core/src/main/java/org/apache/axis/holders/SchemaHolder.java
index acbdc89fb2..5906fdc233 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/holders/SchemaHolder.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/holders/SchemaHolder.java
@@ -19,7 +19,7 @@
/**
* Custom class for supporting XSD schema
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
*/
public final class SchemaHolder implements javax.xml.rpc.holders.Holder {
public org.apache.axis.types.Schema value;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/i18n/MessageBundle.java b/axis-rt-core/src/main/java/org/apache/axis/i18n/MessageBundle.java
index 4d86e2e928..64b3c2658a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/i18n/MessageBundle.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/i18n/MessageBundle.java
@@ -89,9 +89,9 @@ public String getMessage(String key) throws MissingResourceException
* Gets a string message from the resource bundle for the given key. The
* message may contain variables that will be substituted with the given
* arguments. Variables have the format:
- *
+ *
* This message has two variables: {0} and {1}
- *
+ *
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @return The message
@@ -105,9 +105,9 @@ public String getMessage(String key, String arg0) throws MissingResourceExceptio
* Gets a string message from the resource bundle for the given key. The
* message may contain variables that will be substituted with the given
* arguments. Variables have the format:
- *
+ *
* This message has two variables: {0} and {1}
- *
+ *
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @param arg1 The argument to place in variable {1}
@@ -122,9 +122,9 @@ public String getMessage(String key, String arg0, String arg1) throws MissingRes
* Gets a string message from the resource bundle for the given key. The
* message may contain variables that will be substituted with the given
* arguments. Variables have the format:
- *
+ *
* This message has two variables: {0} and {1}
- *
+ *
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @param arg1 The argument to place in variable {1}
@@ -140,9 +140,9 @@ public String getMessage(String key, String arg0, String arg1, String arg2) thro
* Gets a string message from the resource bundle for the given key. The
* message may contain variables that will be substituted with the given
* arguments. Variables have the format:
- *
+ *
* This message has two variables: {0} and {1}
- *
+ *
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @param arg1 The argument to place in variable {1}
@@ -159,9 +159,9 @@ public String getMessage(String key, String arg0, String arg1, String arg2, Stri
* Gets a string message from the resource bundle for the given key. The
* message may contain variables that will be substituted with the given
* arguments. Variables have the format:
- *
+ *
* This message has two variables: {0} and {1}
- *
+ *
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @param arg1 The argument to place in variable {1}
@@ -179,9 +179,9 @@ public String getMessage(String key, String arg0, String arg1, String arg2, Stri
* Gets a string message from the resource bundle for the given key. The
* message may contain variables that will be substituted with the given
* arguments. Variables have the format:
- *
+ *
* This message has two variables: {0} and {1}
- *
+ *
* @param key The resource key
* @param array An array of objects to place in corresponding variables
* @return The message
diff --git a/axis-rt-core/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java b/axis-rt-core/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
index aa47c48663..dc4ee7d3ae 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
@@ -115,10 +115,6 @@ public Enumeration getKeys() {
* @param projectName The name of the project to which the class belongs.
* It must be a proper prefix of the caller's package.
*
- * @param caller The calling class.
- * This is used to get the package name to further construct
- * the basename as well as to get the proper ClassLoader.
- *
* @param resourceName The name of the resource without the
* ".properties" extension
*
@@ -170,10 +166,6 @@ public static ProjectResourceBundle getBundle(String projectName,
* @param projectName The name of the project to which the class belongs.
* It must be a proper prefix of the caller's package.
*
- * @param caller The calling class.
- * This is used to get the package name to further construct
- * the basename as well as to get the proper ClassLoader.
- *
* @param resourceName The name of the resource without the
* ".properties" extension
*
@@ -236,10 +228,6 @@ public static ProjectResourceBundle getBundle(String projectName,
* @param projectName The name of the project to which the class belongs.
* It must be a proper prefix of the caller's package.
*
- * @param caller The calling class.
- * This is used to get the package name to further construct
- * the basename as well as to get the proper ClassLoader.
- *
* @param resourceName The name of the resource without the
* ".properties" extension
*
diff --git a/axis-rt-core/src/main/java/org/apache/axis/i18n/RB.java b/axis-rt-core/src/main/java/org/apache/axis/i18n/RB.java
index f9079085ed..f26a7d6157 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/i18n/RB.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/i18n/RB.java
@@ -43,7 +43,7 @@
* (as returned by Local.getDefault()). As property files are found the
* property values are merged so that inheritance is preserved.
* The order of searching is:
- *
+ *
* basename + "_" + langage + "_" + country + "_" + variant
* basename + "_" + langage + "_" + country
* basename + "_" + langage
@@ -51,7 +51,7 @@
* basename + "_" + defaultLanguage + "_" + defaultCountry
* basename + "_" + defaultLanguage
* basename
- *
+ *
* The basename is the name of the property file without the ".properties"
* extension.
* Properties will be cached for performance.
@@ -106,7 +106,7 @@ public RB(Object caller, String name) throws MissingResourceException
* @param caller The calling object. This is used to get the package name
* to further construct the basename as well as to get the proper ClassLoader
* @param name The name of the property file without the ".properties" extension
- * @param local The local
+ * @param locale The locale
*/
public RB(Object caller, String name, Locale locale) throws MissingResourceException
{
@@ -170,9 +170,9 @@ public String getString(String key) throws MissingResourceException
*
Gets a string message from the resource bundle for the given key. The
* message may contain variables that will be substituted with the given
* arguments. Variables have the format:
- *
+ *
* This message has two variables: {0} and {1}
- *
+ *
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @return The message
@@ -188,9 +188,9 @@ public String getString(String key, Object arg0) throws MissingResourceException
* Gets a string message from the resource bundle for the given key. The
* message may contain variables that will be substituted with the given
* arguments. Variables have the format:
- *
+ *
* This message has two variables: {0} and {1}
- *
+ *
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @param arg1 The argument to place in variable {1}
@@ -208,9 +208,9 @@ public String getString(String key, Object arg0, Object arg1) throws MissingReso
* Gets a string message from the resource bundle for the given key. The
* message may contain variables that will be substituted with the given
* arguments. Variables have the format:
- *
+ *
* This message has two variables: {0} and {1}
- *
+ *
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @param arg1 The argument to place in variable {1}
@@ -230,9 +230,9 @@ public String getString(String key, Object arg0, Object arg1, Object arg2) throw
* Gets a string message from the resource bundle for the given key. The
* message may contain variables that will be substituted with the given
* arguments. Variables have the format:
- *
+ *
* This message has two variables: {0} and {1}
- *
+ *
* @param key The resource key
* @param array An array of objects to place in corresponding variables
* @return The message
@@ -515,7 +515,7 @@ public static String getString(Object caller, String key, Object arg0, Object ar
* Get a message from resource.properties from the package of the given object.
* @param caller The calling object, used to get the package name and class loader
* @param key The resource key
- * @param array An array of objects to place in corresponding variables
+ * @param args An array of objects to place in corresponding variables
* @return The formatted message
*/
public static String getString(Object caller, String key, Object[] args)
@@ -642,7 +642,7 @@ public static String getString(Object caller, Locale locale, String key, Object
* @param caller The calling object, used to get the package name and class loader
* @param locale The locale
* @param key The resource key
- * @param array An array of objects to place in corresponding variables
+ * @param args An array of objects to place in corresponding variables
* @return The formatted message
*/
public static String getString(Object caller, Locale locale, String key, Object[] args)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/message/MessageElement.java b/axis-rt-core/src/main/java/org/apache/axis/message/MessageElement.java
index 9e20fcb5e7..e6f59b95f4 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/message/MessageElement.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/message/MessageElement.java
@@ -68,8 +68,8 @@
*
* Note: it was made Serializable to help users of Apache SOAP who had
* exploited the serializability of the DOM tree to migrate to Axis.
- * @todo implement the NodeList methods properly, with tests.
*/
+// TODO: implement the NodeList methods properly, with tests.
public class MessageElement extends NodeImpl implements SOAPElement,
Serializable,
org.w3c.dom.NodeList, // ADD Nodelist Interfaces for SAAJ 1.2
@@ -378,7 +378,7 @@ public void setEndIndex(int endIndex)
/**
* get the attributes
- * @return attributes. If this equals {@link NullAttributes.singleton} it is null
+ * @return attributes. If this equals {@link NullAttributes#singleton} it is null
*
*/
public Attributes getAttributesEx() { return attributes; }
@@ -1283,9 +1283,9 @@ public String toString() {
/**
* add a new namespace/prefix mapping
* @param map new mapping to add
- * @todo: this code does not verify that the mapping does not exist already; it
- * is possible to create duplicate mappings.
*/
+ // TODO: this code does not verify that the mapping does not exist already; it
+ // is possible to create duplicate mappings.
public void addMapping(Mapping map) {
if (namespaces == null) {
namespaces = new ArrayList();
@@ -1421,11 +1421,11 @@ public SOAPElement addAttribute(Name attrName, String value)
* @param uri
* @return
* @throws SOAPException for any {@link RuntimeException} caught
- * @todo for some reason this logic catches all rutime exceptions and
- * rethrows them as SOAPExceptions. This is unusual behavio, and should
- * be looked at closely.
* @see javax.xml.soap.SOAPElement#addNamespaceDeclaration(String, String)
*/
+ // TODO: for some reason this logic catches all rutime exceptions and
+ // rethrows them as SOAPExceptions. This is unusual behavio, and should
+ // be looked at closely.
public SOAPElement addNamespaceDeclaration(String prefix,
String uri)
throws SOAPException {
@@ -1741,10 +1741,10 @@ public boolean hasAttributeNS(String namespace, String localName) {
* @see org.w3c.dom.Element#getAttributeNode(String)
* @param attrName
* @return null, always.
- * @todo Fix this for SAAJ 1.2 Implementation. marked as deprecated to warn people
- * it is broken
* @deprecated this is not implemented
*/
+ // TODO: Fix this for SAAJ 1.2 Implementation. marked as deprecated to warn people
+ // it is broken
public Attr getAttributeNode(String attrName) {
return null;
}
@@ -1769,8 +1769,8 @@ public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
* @return newAttr
* @throws DOMException
* @deprecated this is not implemented
- * @todo implement
*/
+ // TODO: implement
public Attr setAttributeNode(Attr newAttr) throws DOMException {
return newAttr;
}
@@ -1778,11 +1778,11 @@ public Attr setAttributeNode(Attr newAttr) throws DOMException {
/**
* set an attribute as a node
* @see org.w3c.dom.Element#setAttributeNodeNS(org.w3c.dom.Attr)
- * @todo implement properly.
* @param newAttr
* @return null
* @throws DOMException
*/
+ // TODO: implement properly.
public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
//attributes.
AttributesImpl attributes = makeAttributesEditable();
@@ -1826,8 +1826,8 @@ public NodeList getElementsByTagName(String tagName) {
* @param namespaceURI namespace
* @param localName name
* @return string value or null if not found
- * @todo: this could be refactored to use getAttributeValue()
*/
+ // TODO: this could be refactored to use getAttributeValue()
public String getAttributeNS(String namespaceURI, String localName) {
if(namespaceURI == null) {
namespaceURI = "";
diff --git a/axis-rt-core/src/main/java/org/apache/axis/message/NullAttributes.java b/axis-rt-core/src/main/java/org/apache/axis/message/NullAttributes.java
index 0e3074edf7..4398301449 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/message/NullAttributes.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/message/NullAttributes.java
@@ -6,7 +6,7 @@
* Null implementation of the Attributes interface.
*
* @author David Megginson
- * @author Sam Ruby
+ * @author Sam Ruby (rubys@us.ibm.com)
*/
public class NullAttributes implements Attributes {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java b/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java
index db918a6ae5..4ce33fb31b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java
@@ -46,12 +46,14 @@
* deserializing the XML for a method call or return. In other words for
* this XML:
*
- *
- * Hello!
- * 3.14159
- *
+ *
+ * <methodName>
+ * <param1 xsi:type="xsd:string">Hello!</param1>
+ * <param2>3.14159</param2>
+ * </methodName>
+ *
*
- * ...we'll get onStartChild() events for and .
+ * ...we'll get onStartChild() events for <param1> and <param2>.
*
* @author Glen Daniels (gdaniels@apache.org)
*/
diff --git a/axis-rt-core/src/main/java/org/apache/axis/message/SOAPDocumentImpl.java b/axis-rt-core/src/main/java/org/apache/axis/message/SOAPDocumentImpl.java
index 85e4b10833..2be9d1154d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/message/SOAPDocumentImpl.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/message/SOAPDocumentImpl.java
@@ -44,9 +44,9 @@
* SOAPDcoumentImpl implements the Document API for SOAPPART. At the moment, it
* again delgate the XERCES DOM Implementation Here is my argument on it: I
* guess that there is 3 way to implement this. - fully implement the DOM API
- * here myself. => This is too much and duplicated work. - extends XERCES
- * Implementation => this makes we are fixed to one Implementation - choose
- * delgate depends on the user's parser preference => This is the practically
+ * here myself. => This is too much and duplicated work. - extends XERCES
+ * Implementation => this makes we are fixed to one Implementation - choose
+ * delgate depends on the user's parser preference => This is the practically
* best solution I have now
*
* @author Heejune Ahn (cityboy@tmax.co.kr)
@@ -75,7 +75,7 @@ public SOAPDocumentImpl(SOAPPart sp) {
}
/**
- * @todo : link with SOAP
+ * TODO: link with SOAP
*
* @return
*/
@@ -100,7 +100,7 @@ public Element getDocumentElement() {
* based on the tagName, we will make different kind SOAP Elements Instance
* Is really we can determine the Type by the Tagname???
*
- * @todo : verify this method
+ * TODO: verify this method
*
* @param tagName
* @return @throws
@@ -147,11 +147,11 @@ public org.w3c.dom.Element createElement(String tagName)
/**
*
- * Creates an empty DocumentFragment object. @todo not
- * implemented yet
+ * Creates an empty DocumentFragment object.
*
* @return A new DocumentFragment.
*/
+ // TODO: not implemented yet
public DocumentFragment createDocumentFragment() {
return delegate.createDocumentFragment();
}
@@ -219,7 +219,7 @@ public ProcessingInstruction createProcessingInstruction(
}
/**
- * @todo: How Axis will maintain the Attribute representation ?
+ * TODO: How Axis will maintain the Attribute representation ?
*/
public Attr createAttribute(String name) throws DOMException {
return delegate.createAttribute(name);
@@ -634,7 +634,7 @@ public boolean hasChildNodes() {
}
/**
- * @todo: Study it more.... to implement the deep mode correctly.
+ * TODO: Study it more.... to implement the deep mode correctly.
*
*/
public Node cloneNode(boolean deep) {
@@ -642,7 +642,7 @@ public Node cloneNode(boolean deep) {
}
/**
- * @todo: is it OK to simply call the superclass?
+ * TODO: is it OK to simply call the superclass?
*
*/
public void normalize() {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/providers/ComProvider.java b/axis-rt-core/src/main/java/org/apache/axis/providers/ComProvider.java
deleted file mode 100644
index 8bbded6411..0000000000
--- a/axis-rt-core/src/main/java/org/apache/axis/providers/ComProvider.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.axis.providers;
-
-import org.apache.axis.AxisFault;
-import org.apache.axis.Constants;
-import org.apache.axis.Message;
-import org.apache.axis.MessageContext;
-import org.apache.axis.components.bridge.COMBridge;
-import org.apache.axis.deployment.wsdd.providers.WSDDComProvider;
-import org.apache.axis.description.OperationDesc;
-import org.apache.axis.description.ParameterDesc;
-import org.apache.axis.handlers.soap.SOAPService;
-import org.apache.axis.message.RPCElement;
-import org.apache.axis.message.RPCHeaderParam;
-import org.apache.axis.message.RPCParam;
-import org.apache.axis.message.SOAPBodyElement;
-import org.apache.axis.message.SOAPEnvelope;
-import org.apache.axis.soap.SOAPConstants;
-import org.apache.axis.utils.JavaUtils;
-import org.apache.axis.utils.Messages;
-
-import javax.xml.namespace.QName;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public class ComProvider extends BasicProvider {
-
-
- public void invoke(MessageContext msgContext) throws AxisFault {
- try {
- SOAPService service = msgContext.getService();
- String progID = (String) service.getOption(WSDDComProvider.OPTION_PROGID);
- String threadingModel = (String) service.getOption(WSDDComProvider.OPTION_THREADING_MODEL);
-
- if (log.isDebugEnabled()) {
- log.debug("Enter: COMProvider.processMessage()");
- }
-
- OperationDesc operation = msgContext.getOperation();
-
- Vector bodies = msgContext.getRequestMessage().getSOAPEnvelope().getBodyElements();
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage("bodyElems00", "" + bodies.size()));
- log.debug(Messages.getMessage("bodyIs00", "" + bodies.get(0)));
- }
-
- RPCElement body = null;
-
- // Find the first "root" body element, which is the RPC call.
- for (int bNum = 0; body == null && bNum < bodies.size(); bNum++) {
- // If this is a regular old SOAPBodyElement, and it's a root,
- // we're probably a non-wrapped doc/lit service. In this case,
- // we deserialize the element, and create an RPCElement "wrapper"
- // around it which points to the correct method.
- // FIXME : There should be a cleaner way to do this...
- if (!(bodies.get(bNum) instanceof RPCElement)) {
- SOAPBodyElement bodyEl = (SOAPBodyElement) bodies.get(bNum);
- // igors: better check if bodyEl.getID() != null
- // to make sure this loop does not step on SOAP-ENC objects
- // that follow the parameters! FIXME?
- if (bodyEl.isRoot() && operation != null && bodyEl.getID() == null) {
- ParameterDesc param = operation.getParameter(bNum);
- // at least do not step on non-existent parameters!
- if (param != null) {
- Object val = bodyEl.getValueAsType(param.getTypeQName());
- body = new RPCElement("",
- operation.getName(),
- new Object[]{val});
- }
- }
- } else {
- body = (RPCElement) bodies.get(bNum);
- }
- }
-
- String methodName = body.getMethodName();
- Vector args = body.getParams();
- int numArgs = args.size();
-
- Vector argValues = new Vector();
-
- // Put the values contained in the RPCParams into an array
- // suitable for passing to java.lang.reflect.Method.invoke()
- // Make sure we respect parameter ordering if we know about it
- // from metadata, and handle whatever conversions are necessary
- // (values -> Holders, etc)
- for (int i = 0; i < numArgs; i++) {
- RPCParam rpcParam = (RPCParam) args.get(i);
- Object value = rpcParam.getObjectValue();
-
- // first check the type on the paramter
- ParameterDesc paramDesc = rpcParam.getParamDesc();
-
- // if we found some type info try to make sure the value type is
- // correct. For instance, if we deserialized a xsd:dateTime in
- // to a Calendar and the service takes a Date, we need to convert
- if (paramDesc != null && paramDesc.getJavaType() != null) {
-
- // Get the type in the signature (java type or its holder)
- Class sigType = paramDesc.getJavaType();
-
- // Convert the value into the expected type in the signature
- value = JavaUtils.convert(value,
- sigType);
-
- rpcParam.setObjectValue(value);
- }
- argValues.add(value);
- }
-
- COMBridge bridge = new COMBridge();
- Hashtable props = new Hashtable();
- props.put("progid", progID);
- if (threadingModel != null)
- props.put("threadmodel", threadingModel);
-
- Object result = bridge.execute(methodName, argValues, props);
-
- RPCElement resBody = new RPCElement(methodName + "Response");
- resBody.setPrefix(body.getPrefix());
- resBody.setNamespaceURI(body.getNamespaceURI());
- resBody.setEncodingStyle(msgContext.getEncodingStyle());
-
- Message resMsg = msgContext.getResponseMessage();
- SOAPEnvelope resEnv;
-
- // If we didn't have a response message, make sure we set one up
- if (resMsg == null) {
- resEnv = new SOAPEnvelope(msgContext.getSOAPConstants());
-
- resMsg = new Message(resEnv);
- msgContext.setResponseMessage(resMsg);
- } else {
- resEnv = resMsg.getSOAPEnvelope();
- }
-
- QName returnQName = operation.getReturnQName();
- if (returnQName == null) {
- returnQName = new QName("", methodName + "Return");
- }
-
- // For SOAP 1.2, add a result
- if (msgContext.getSOAPConstants() ==
- SOAPConstants.SOAP12_CONSTANTS) {
- returnQName = Constants.QNAME_RPC_RESULT;
- }
-
- RPCParam param = new RPCParam(returnQName, result);
- param.setParamDesc(operation.getReturnParamDesc());
- if (!operation.isReturnHeader()) {
- resBody.addParam(param);
- } else {
- resEnv.addHeader(new RPCHeaderParam(param));
- }
-
- resEnv.addBodyElement(resBody);
-
- } catch (Exception e) {
- entLog.debug(Messages.getMessage("toAxisFault00"), e);
- throw AxisFault.makeFault(e);
- } catch (Throwable t) {
- entLog.debug(Messages.getMessage("toAxisFault00"));
- throw new AxisFault(Messages.getMessage("toAxisFault00"), t);
- }
- }
-
- public void initServiceDesc(SOAPService service, MessageContext msgContext)
- throws AxisFault {
- }
-}
diff --git a/axis-rt-core/src/main/java/org/apache/axis/providers/java/EJBProvider.java b/axis-rt-core/src/main/java/org/apache/axis/providers/java/EJBProvider.java
index 5a27d3dba1..1511a4f1e5 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/providers/java/EJBProvider.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/providers/java/EJBProvider.java
@@ -444,11 +444,10 @@ protected Object getEJBHome(InitialContext context, String beanJndiName)
/**
* Override the default implementation such that we can include
* special handling for {@link java.rmi.ServerException}.
- *
+ *
* Converts {@link java.rmi.ServerException} exceptions to
* {@link InvocationTargetException} exceptions with the same cause.
* This allows the axis framework to create a SOAP fault.
- *
*
* @see org.apache.axis.providers.java.RPCProvider#invokeMethod(org.apache.axis.MessageContext, java.lang.reflect.Method, java.lang.Object, java.lang.Object[])
*/
diff --git a/axis-rt-core/src/main/java/org/apache/axis/security/servlet/ServletSecurityProvider.java b/axis-rt-core/src/main/java/org/apache/axis/security/servlet/ServletSecurityProvider.java
index 68679aca6c..f0107c331f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/security/servlet/ServletSecurityProvider.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/security/servlet/ServletSecurityProvider.java
@@ -48,8 +48,6 @@ public class ServletSecurityProvider implements SecurityProvider {
/** Authenticate a user from a username/password pair.
*
- * @param username the user name to check
- * @param password the password to check
* @return an AuthenticatedUser or null
*/
public AuthenticatedUser authenticate(MessageContext msgContext) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/security/simple/SimpleSecurityProvider.java b/axis-rt-core/src/main/java/org/apache/axis/security/simple/SimpleSecurityProvider.java
index c9717a4681..9e13842900 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/security/simple/SimpleSecurityProvider.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/security/simple/SimpleSecurityProvider.java
@@ -93,8 +93,6 @@ private synchronized void initialize(MessageContext msgContext)
/** Authenticate a user from a username/password pair.
*
- * @param username the user name to check
- * @param password the password to check
* @return an AuthenticatedUser or null
*/
public AuthenticatedUser authenticate(MessageContext msgContext) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AdminServlet.java b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AdminServlet.java
index 77527692e6..7cfc2a598a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AdminServlet.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AdminServlet.java
@@ -41,9 +41,6 @@
*
* @author Glen Daniels (gdaniels@apache.org)
* @author Steve Loughran
- * xdoclet tags are not active yet; keep web.xml in sync
- * @web.servlet name="AdminServlet" display-name="Axis Admin Servlet" load-on-startup="100"
- * @web.servlet-mapping url-pattern="/servlet/AdminServlet"
*/
public class AdminServlet extends AxisServletBase {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AutoRegisterServlet.java b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AutoRegisterServlet.java
index ad02cfdbae..745b5d4a9a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AutoRegisterServlet.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AutoRegisterServlet.java
@@ -41,8 +41,6 @@
/**
* Servlet that autoregisters
* @author Steve Loughran
- * xdoclet tags are not active yet; keep web.xml in sync
- * @web.servlet name="AutoRegisterServlet" display-name="Axis Autoregister Servlet" load-on-startup="30"
*/
public class AutoRegisterServlet extends AxisServletBase {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisHTTPSessionListener.java b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisHTTPSessionListener.java
index 4d7a8e82d7..f91d67e046 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisHTTPSessionListener.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisHTTPSessionListener.java
@@ -26,7 +26,6 @@
/**
* A simple listener for Servlet 2.3 session lifecycle events.
- * @web.listener
* @author Glen Daniels (gdaniels@apache.org)
*/
public class AxisHTTPSessionListener implements HttpSessionListener {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServlet.java b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServlet.java
index 36db9d0359..8e2515485c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServlet.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServlet.java
@@ -63,11 +63,6 @@
* To change the location of the services, change url-pattern in web.xml and
* set parameter axis.servicesPath in server-config.wsdd. For more information see
* Axis Reference Guide.
- *
- * @web.servlet name="AxisServlet" display-name="Apache-Axis Servlet"
- * @web.servlet-mapping url-pattern="/servlet/AxisServlet"
- * @web.servlet-mapping url-pattern="*.jws"
- * @web.servlet-mapping url-pattern="/services/*"
*/
public class AxisServlet extends AxisServletBase {
protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServletBase.java b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServletBase.java
index 75f2cfe4aa..573a53d576 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServletBase.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServletBase.java
@@ -117,7 +117,7 @@ public void init() throws javax.servlet.ServletException {
* Destroy method is called when the servlet is going away. Pass this
* down to the AxisEngine to let it clean up... But don't create the
* engine if it hasn't already been created.
- * @todo Fixme for multiple servlets.
+ * TODO: Fixme for multiple servlets.
* This has always been slightly broken
* (the context's copy stayed around), but now we have extracted it into
* a superclass it is blatantly broken.
@@ -155,7 +155,7 @@ public AxisServer getEngine() throws AxisFault {
/**
* This is a uniform method of initializing AxisServer in a servlet
* context.
- * @todo add catch for not being able to cast the context attr to an
+ * TODO: add catch for not being able to cast the context attr to an
* engine and reinit the engine if so.
*/
public static AxisServer getEngine(HttpServlet servlet) throws AxisFault
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java b/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
index 1e9cec04ce..d39d156152 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
@@ -34,7 +34,7 @@
/**
* This is meant to be used on a SOAP Client to call a SOAP server.
*
- * @author Sam Ruby
+ * @author Sam Ruby (rubys@us.ibm.com)
*/
public class LocalSender extends BasicHandler {
protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalTransport.java b/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalTransport.java
index 891f9377bc..28d0303e52 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalTransport.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalTransport.java
@@ -81,8 +81,8 @@ public void setRemoteService(String remoteServiceName) {
/**
* Set up any transport-specific derived properties in the message context.
- * @param context the context to set up
- * @param message the client service instance
+ * @param mc the context to set up
+ * @param call the client service instance
* @param engine the engine containing the registries
*/
public void setupMessageContextImpl(MessageContext mc,
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Day.java b/axis-rt-core/src/main/java/org/apache/axis/types/Day.java
index e3db2be371..06fbe53519 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Day.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Day.java
@@ -22,7 +22,7 @@
/**
* Implementation of the XML Schema type gDay
*
- * @author Tom Jordahl
+ * @author Tom Jordahl (tomj@macromedia.com)
* @see XML Schema 3.2.13
*/
public class Day implements java.io.Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java b/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java
index e726d7edd2..2ab0443ae4 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java
@@ -24,7 +24,7 @@
* Implementation of the XML Schema type duration. Duration supports a minimum
* fractional second precision of milliseconds.
*
- * @author Wes Moulder
+ * @author Wes Moulder (wes@themindelectric.com)
* @author Dominik Kacprzak (dominik@opentoolbox.com)
* @see XML Schema 3.2.6
*/
@@ -68,7 +68,7 @@ public Duration(boolean negative, int aYears, int aMonths, int aDays,
* PnYnMnDTnHnMnS.
*
* @param duration String
- * @throws SchemaException if the string doesn't parse correctly.
+ * @throws IllegalArgumentException if the string doesn't parse correctly.
*/
public Duration(String duration) throws IllegalArgumentException {
int position = 1;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Entities.java b/axis-rt-core/src/main/java/org/apache/axis/types/Entities.java
index 1b78005377..0ce90f617b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Entities.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Entities.java
@@ -20,7 +20,7 @@
/**
* Custom class for supporting XSD data type Entities
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
* @see XML Schema 3.3.12 ENTITIES
*/
public class Entities extends NCName {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Entity.java b/axis-rt-core/src/main/java/org/apache/axis/types/Entity.java
index 07e1746db9..0bb4f854f4 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Entity.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Entity.java
@@ -20,7 +20,7 @@
/**
* Custom class for supporting XSD data type Entity
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
* @see XML Schema 3.3.11 ENTITY
*/
public class Entity extends NCName {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/HexBinary.java b/axis-rt-core/src/main/java/org/apache/axis/types/HexBinary.java
index 55aef0392e..39ea253b64 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/HexBinary.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/HexBinary.java
@@ -22,7 +22,7 @@
/**
* Custom class for supporting primitive XSD data type hexBinary.
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
*/
public class HexBinary extends Object implements java.io.Serializable{
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/IDRef.java b/axis-rt-core/src/main/java/org/apache/axis/types/IDRef.java
index e7b9ab6a8a..de26b503e9 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/IDRef.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/IDRef.java
@@ -20,7 +20,7 @@
/**
* Custom class for supporting XSD data type IDRef
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
* @see XML Schema 3.3.10 IDREFS
*/
public class IDRef extends NCName {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/IDRefs.java b/axis-rt-core/src/main/java/org/apache/axis/types/IDRefs.java
index 5572967570..c483e43d48 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/IDRefs.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/IDRefs.java
@@ -23,7 +23,7 @@
/**
* Custom class for supporting XSD data type IDRefs
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
* @see XML Schema 3.3.10 IDREFS
*/
public class IDRefs extends NCName {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Id.java b/axis-rt-core/src/main/java/org/apache/axis/types/Id.java
index 7bfb1ddcce..e8b3e8f7e9 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Id.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Id.java
@@ -21,7 +21,7 @@
* Custom class for supporting XSD data type ID
* The base type of Id is NCName.
*
- * @author Eddie Pick
+ * @author Eddie Pick (eddie@pick.eu.org)
* @see XML Schema 3.3.8
*/
public class Id extends NCName {
@@ -49,7 +49,7 @@ public Id(String stValue) throws IllegalArgumentException {
/**
*
* validates the data and sets the value for the object.
- * @param Token String value
+ * @param stValue String value
* @throws IllegalArgumentException if invalid format
*/
public void setValue(String stValue) throws IllegalArgumentException {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Language.java b/axis-rt-core/src/main/java/org/apache/axis/types/Language.java
index b24a1b6307..fb0e0339a1 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Language.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Language.java
@@ -26,7 +26,7 @@
* as defined in the language identification section of [XML 1.0 (Second Edition)].
* The base type of language is token.
*
- * @author Eddie Pick
+ * @author Eddie Pick (eddie@pick.eu.org)
* @see XML Schema 3.3.3
*/
public class Language extends Token {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Month.java b/axis-rt-core/src/main/java/org/apache/axis/types/Month.java
index b1125d07fa..a73d7fc18c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Month.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Month.java
@@ -22,7 +22,7 @@
/**
* Implementation of the XML Schema type gMonth
*
- * @author Tom Jordahl
+ * @author Tom Jordahl (tomj@macromedia.com)
* @see XML Schema 3.2.14
*/
public class Month implements java.io.Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/MonthDay.java b/axis-rt-core/src/main/java/org/apache/axis/types/MonthDay.java
index c23fc7dc57..c3ed7468eb 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/MonthDay.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/MonthDay.java
@@ -22,7 +22,7 @@
/**
* Implementation of the XML Schema type gMonthDay
*
- * @author Tom Jordahl
+ * @author Tom Jordahl (tomj@macromedia.com)
* @see XML Schema 3.2.12
*/
public class MonthDay implements java.io.Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NCName.java b/axis-rt-core/src/main/java/org/apache/axis/types/NCName.java
index d011c947f2..cea8b93596 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NCName.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NCName.java
@@ -24,7 +24,7 @@
* NCName represents XML "non-colonized" Names
* The base type of NCName is Name.
*
- * @author Chris Haddad
+ * @author Chris Haddad (chaddad@cobia.net)
* @see XML Schema 3.3.7
* @see NCName Production
*/
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NMToken.java b/axis-rt-core/src/main/java/org/apache/axis/types/NMToken.java
index ed9ffd252a..f4cffd8c27 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NMToken.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NMToken.java
@@ -26,7 +26,7 @@
* is the set of tokens that match the Nmtoken production
* in [XML 1.0 (Second Edition)].
* The base type of NMTOKEN is token.
- * @author Chris Haddad
+ * @author Chris Haddad (chaddad@cobia.net)
* @see XML Schema 3.3.4
*/
public class NMToken extends Token {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NMTokens.java b/axis-rt-core/src/main/java/org/apache/axis/types/NMTokens.java
index 14f2932551..7cb5b7f7d1 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NMTokens.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NMTokens.java
@@ -23,7 +23,7 @@
/**
* Custom class for supporting XSD data type NMTokens
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
*/
public class NMTokens extends NCName {
private NMToken[] tokens;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Name.java b/axis-rt-core/src/main/java/org/apache/axis/types/Name.java
index ed80c81cff..4fc1d6fb24 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Name.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Name.java
@@ -25,7 +25,7 @@
* the set of all strings which match the Name production
* of [XML 1.0 (Second Edition)].
* The base type of Name is token.
- * @author Chris Haddad
+ * @author Chris Haddad (chaddad@cobia.net)
* @see XML Schema 3.3.6
*/
public class Name extends Token {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NegativeInteger.java b/axis-rt-core/src/main/java/org/apache/axis/types/NegativeInteger.java
index a09eb1550c..6ff352f79f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NegativeInteger.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NegativeInteger.java
@@ -30,7 +30,7 @@
* negativeInteger is the infinite set {...,-2,-1}.
* The base type of negativeInteger is nonPositiveInteger.
*
- * @author Chris Haddad
+ * @author Chris Haddad (haddadc@apache.org)
* @see XML Schema 3.3.15
*/
public class NegativeInteger extends NonPositiveInteger {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NonNegativeInteger.java b/axis-rt-core/src/main/java/org/apache/axis/types/NonNegativeInteger.java
index 691e602fbf..56087c87f4 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NonNegativeInteger.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NonNegativeInteger.java
@@ -24,7 +24,7 @@
/**
* Custom class for supporting primitive XSD data type nonNegativeInteger
*
- * @author Russell Butek
+ * @author Russell Butek (butek@us.ibm.com)
* @see XML Schema 3.3.20
*/
public class NonNegativeInteger extends BigInteger {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NonPositiveInteger.java b/axis-rt-core/src/main/java/org/apache/axis/types/NonPositiveInteger.java
index 069e7ee369..d1bb293430 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NonPositiveInteger.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NonPositiveInteger.java
@@ -29,7 +29,7 @@
* concept of the non-positive integers. The value space of
* nonPositiveInteger is the infinite set {...,-2,-1,0}.
*
- * @author Chris Haddad XML Schema 3.3.14
*/
public class NonPositiveInteger extends BigInteger {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java b/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java
index 6831a1e817..c80577975a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java
@@ -22,7 +22,7 @@
* normalizedString represents white space normalized strings.
* The base type of normalizedString is string.
*
- * @author Chris Haddad
+ * @author Chris Haddad (chaddad@cobia.net)
* @see XML Schema Part 2: Datatypes 3.3.1
*/
public class NormalizedString extends Object implements java.io.Serializable {
@@ -76,7 +76,7 @@ public int hashCode(){
* nor tab (#x9) characters.
*
* @param stValue the String to test
- * @returns true if valid normalizedString
+ * @return true if valid normalizedString
*/
public static boolean isValid(String stValue) {
int scan;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Notation.java b/axis-rt-core/src/main/java/org/apache/axis/types/Notation.java
index 256d079a8d..53c531d350 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Notation.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Notation.java
@@ -24,7 +24,7 @@
/**
* Custom class for supporting XSD data type NOTATION.
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
* @see XML Schema Part 1: 3.12 Notation Declarations
*/
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/PositiveInteger.java b/axis-rt-core/src/main/java/org/apache/axis/types/PositiveInteger.java
index e63d773759..dc98b7f2e0 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/PositiveInteger.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/PositiveInteger.java
@@ -28,7 +28,7 @@
* This results in the standard mathematical concept of the positive integer numbers. The value space
* of positiveInteger is the infinite set {1,2,...}.
*
- * @author Chris Haddad
+ * @author Chris Haddad (haddadc@apache.org)
* @see XML Schema 3.3.25
*/
public class PositiveInteger extends NonNegativeInteger {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Schema.java b/axis-rt-core/src/main/java/org/apache/axis/types/Schema.java
index 69dcd7cc7d..7a20aa2c6b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Schema.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Schema.java
@@ -19,7 +19,7 @@
/**
* Custom class for supporting XSD schema
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
*/
public class Schema implements java.io.Serializable {
private org.apache.axis.message.MessageElement[] _any;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Token.java b/axis-rt-core/src/main/java/org/apache/axis/types/Token.java
index 821bf8a5a2..d530e30305 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Token.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Token.java
@@ -22,7 +22,7 @@
* token represents tokenized strings.
* The base type of token is normalizedString.
*
- * @author Chris Haddad
+ * @author Chris Haddad (chaddad@cobia.net)
* @see XML Schema 3.3.2
*/
public class Token extends NormalizedString {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/URI.java b/axis-rt-core/src/main/java/org/apache/axis/types/URI.java
index bec9df887b..86cceec94d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/URI.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/URI.java
@@ -1682,7 +1682,7 @@ public boolean equals(Object p_test) {
/**
* Returns a hash-code value for this URI. The hash code is based upon all
* of the URI's components, and satisfies the general contract of the
- * {@link java.lang.Object#hashCode() Object.hashCode} method.
+ * {@link java.lang.Object#hashCode() Object.hashCode} method.
*
* @return A hash-code value for this URI
*/
@@ -1765,7 +1765,7 @@ public static boolean isConformantSchemeName(String p_scheme) {
* '.'. Each group must consist of one to three digits. See RFC 2732 Section 3,
* and RFC 2373 Section 2.2, for the definition of IPv6 references. A hostname
* consists of domain labels (each of which must begin and end with an alphanumeric
- * but may contain '-') separated & by a '.'. See RFC 2396 Section 3.2.2.
+ * but may contain '-') separated & by a '.'. See RFC 2396 Section 3.2.2.
*
* @return true if the string is a syntactically valid IPv4 address,
* IPv6 reference or hostname
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java
index d42361cf64..4050b98f78 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java
@@ -21,7 +21,7 @@
/**
* Custom class for supporting primitive XSD data type UnsignedByte
*
- * @author Chris Haddad
+ * @author Chris Haddad (chaddad@cobia.net)
* @see XML Schema 3.3.24
*/
public class UnsignedByte extends UnsignedShort {
@@ -33,7 +33,7 @@ public UnsignedByte() {
/**
* ctor for UnsignedByte
- * @exception Exception will be thrown if validation fails
+ * @exception NumberFormatException will be thrown if validation fails
*/
public UnsignedByte(long sValue) throws NumberFormatException {
setValue(sValue);
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedInt.java b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedInt.java
index 58bb908d06..9b53d3992e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedInt.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedInt.java
@@ -22,7 +22,7 @@
/**
* Custom class for supporting primitive XSD data type UnsignedInt
*
- * @author Chris Haddad
+ * @author Chris Haddad (chaddad@cobia.net)
* @see XML Schema 3.3.22
*/
public class UnsignedInt extends java.lang.Number implements java.lang.Comparable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedLong.java b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedLong.java
index a545ce5c40..4332d0644d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedLong.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedLong.java
@@ -22,7 +22,7 @@
/**
* Custom class for supporting primitive XSD data type UnsignedLong
*
- * @author Chris Haddad
+ * @author Chris Haddad (chaddad@cobia.net)
* @see XML Schema 3.3.21
*/
public class UnsignedLong extends java.lang.Number
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedShort.java b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedShort.java
index 3939be065e..9da91264cc 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedShort.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedShort.java
@@ -20,7 +20,7 @@
/**
* Custom class for supporting primitive XSD data type UnsignedShort
*
- * @author Chris Haddad
+ * @author Chris Haddad (chaddad@cobia.net)
* @see XML Schema 3.3.23
*/
public class UnsignedShort extends UnsignedInt {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Year.java b/axis-rt-core/src/main/java/org/apache/axis/types/Year.java
index 70aae5df01..94669a094b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Year.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Year.java
@@ -22,7 +22,7 @@
/**
* Implementation of the XML Schema type gYear
*
- * @author Tom Jordahl
+ * @author Tom Jordahl (tomj@macromedia.com)
* @see XML Schema 3.2.11
*/
public class Year implements java.io.Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/YearMonth.java b/axis-rt-core/src/main/java/org/apache/axis/types/YearMonth.java
index 2e77698579..e76db1e825 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/YearMonth.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/YearMonth.java
@@ -22,7 +22,7 @@
/**
* Implementation of the XML Schema type gYearMonth
*
- * @author Tom Jordahl
+ * @author Tom Jordahl (tomj@macromedia.com)
* @see XML Schema 3.2.10
*/
public class YearMonth implements java.io.Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/BeanPropertyDescriptor.java b/axis-rt-core/src/main/java/org/apache/axis/utils/BeanPropertyDescriptor.java
index f7edf1d041..8efd8609aa 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/BeanPropertyDescriptor.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/BeanPropertyDescriptor.java
@@ -38,7 +38,7 @@
* concerned, mostly involving the fact that we manage the arrays here
* rather than relying on the value type class to do it itself.
*
- * @author Rich Scheuerle
+ * @author Rich Scheuerle (scheu@us.ibm.com)
* @author Glen Daniels (gdaniels@apache.org)
**/
public class BeanPropertyDescriptor
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/ByteArrayOutputStream.java b/axis-rt-core/src/main/java/org/apache/axis/utils/ByteArrayOutputStream.java
index d80deac16a..3901a4359c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/ByteArrayOutputStream.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/ByteArrayOutputStream.java
@@ -25,14 +25,14 @@
* This class implements an output stream in which the data is
* written into a byte array. The buffer automatically grows as data
* is written to it.
- *
+ *
* The data can be retrieved using toByteArray() and
* toString().
- *
+ *
* Closing a ByteArrayOutputStream has no effect. The methods in
* this class can be called after the stream has been closed without
* generating an IOException.
- *
+ *
* This is an alternative implementation of the java.io.ByteArrayOutputStream
* class. The original implementation only allocates 32 bytes at the beginning.
* As this class is designed for heavy duty it starts at 1024 bytes. In contrast
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/IOUtils.java b/axis-rt-core/src/main/java/org/apache/axis/utils/IOUtils.java
index 411b1f9aaf..84075d7bca 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/IOUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/IOUtils.java
@@ -44,7 +44,7 @@ public static int readFully(InputStream in, byte[] b)
* Same as the normal in.read(b, off, len), but tries to ensure that
* the entire len number of bytes is read.
*
- * @returns the number of bytes read, or -1 if the end of file is
+ * @return the number of bytes read, or -1 if the end of file is
* reached before any bytes are read
*/
public static int readFully(InputStream in, byte[] b, int off, int len)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/IdentityHashMap.java b/axis-rt-core/src/main/java/org/apache/axis/utils/IdentityHashMap.java
index 50099c7fdd..264bbafda9 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/IdentityHashMap.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/IdentityHashMap.java
@@ -12,7 +12,7 @@
/**
* IdentityHashMap similar to JDK1.4's java.util.IdentityHashMap
- * @author Davanum Srinivas
+ * @author Davanum Srinivas (dims@yahoo.com)
*/
public class IdentityHashMap extends HashMap
{
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/JavaUtils.java b/axis-rt-core/src/main/java/org/apache/axis/utils/JavaUtils.java
index 63803613ec..7375d9eb3a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/JavaUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/JavaUtils.java
@@ -225,8 +225,8 @@ public interface ConvertCache {
/** Utility function to convert an Object to some desired Class.
*
* Right now this works for:
- * arrays <-> Lists,
- * Holders <-> held values
+ * arrays <-> Lists,
+ * Holders <-> held values
* @param arg the array to convert
* @param destClass the actual class we want
*/
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java b/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java
index 8dcfc6ac61..3d1610635a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java
@@ -55,8 +55,6 @@ public class Messages {
/**
* Get a message from resource.properties from the package of the given object.
- * @param caller The calling object, used to get the package name and class loader
- * @param locale The locale
* @param key The resource key
* @return The formatted message
*/
@@ -68,8 +66,6 @@ public static String getMessage(String key)
/**
* Get a message from resource.properties from the package of the given object.
- * @param caller The calling object, used to get the package name and class loader
- * @param locale The locale
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @return The formatted message
@@ -82,8 +78,6 @@ public static String getMessage(String key, String arg0)
/**
* Get a message from resource.properties from the package of the given object.
- * @param caller The calling object, used to get the package name and class loader
- * @param locale The locale
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @param arg1 The argument to place in variable {1}
@@ -97,8 +91,6 @@ public static String getMessage(String key, String arg0, String arg1)
/**
* Get a message from resource.properties from the package of the given object.
- * @param caller The calling object, used to get the package name and class loader
- * @param locale The locale
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @param arg1 The argument to place in variable {1}
@@ -113,8 +105,6 @@ public static String getMessage(String key, String arg0, String arg1, String arg
/**
* Get a message from resource.properties from the package of the given object.
- * @param caller The calling object, used to get the package name and class loader
- * @param locale The locale
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @param arg1 The argument to place in variable {1}
@@ -130,8 +120,6 @@ public static String getMessage(String key, String arg0, String arg1, String arg
/**
* Get a message from resource.properties from the package of the given object.
- * @param caller The calling object, used to get the package name and class loader
- * @param locale The locale
* @param key The resource key
* @param arg0 The argument to place in variable {0}
* @param arg1 The argument to place in variable {1}
@@ -148,10 +136,8 @@ public static String getMessage(String key, String arg0, String arg1, String arg
/**
* Get a message from resource.properties from the package of the given object.
- * @param caller The calling object, used to get the package name and class loader
- * @param locale The locale
* @param key The resource key
- * @param array An array of objects to place in corresponding variables
+ * @param args An array of objects to place in corresponding variables
* @return The formatted message
*/
public static String getMessage(String key, String[] args)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/NSStack.java b/axis-rt-core/src/main/java/org/apache/axis/utils/NSStack.java
index 503af660af..6fcc6829e7 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/NSStack.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/NSStack.java
@@ -200,11 +200,13 @@ public void add(String namespaceURI, String prefix) {
* up the stack IF the prefix which was used has been repeated further
* down the stack. I.e.:
*
- *
- *
+ *
+ * <pre:outer xmlns:pre="namespace">
+ * <pre:inner xmlns:pre="otherNamespace">
* *here's where we're looking*
- *
- *
+ * </pre:inner>
+ * </pre:outer>
+ *
*
* If we look for a prefix for "namespace" at the indicated spot, we won't
* find one because "pre" is actually mapped to "otherNamespace"
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java b/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java
index 383fd37dbe..e5fc76a62f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java
@@ -19,6 +19,8 @@
import org.apache.axis.InternalException;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import java.io.Writer;
import java.io.IOException;
@@ -120,6 +122,30 @@ public static String[] split(String str, char separatorChar) {
return (String[]) list.toArray(new String[list.size()]);
}
+ /**
+ * Joins the elements of the provided collection into a single string using
+ * the given separator.
+ *
+ * @param items
+ * the collection of strings to join together
+ * @param separatorChar
+ * the separator character to use
+ * @return the joined string
+ */
+ public static String join(Collection items, char separatorChar) {
+ StringBuffer buffer = new StringBuffer();
+ boolean first = true;
+ for (Iterator it = items.iterator(); it.hasNext(); ) {
+ if (first) {
+ first = false;
+ } else {
+ buffer.append(separatorChar);
+ }
+ buffer.append((String)it.next());
+ }
+ return buffer.toString();
+ }
+
// Empty checks
//-----------------------------------------------------------------------
/**
@@ -361,7 +387,7 @@ public static void escapeNumericChar(Writer out, String str)
* Unescapes numeric character referencs found in the String.
*
* For example, it will return a unicode string which means the specified numeric
- * character references looks like "ようこそ".
+ * character references looks like "ようこそ".
*
* @param str the String to unescape, may be null
* @return a new unescaped String, null if null string input
@@ -386,7 +412,7 @@ public static String unescapeNumericChar(String str) {
* Writer.
*
* For example, it will return a unicode string which means the specified numeric
- * character references looks like "ようこそ".
+ * character references looks like "ようこそ".
*
* A null string input has no effect.
*
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java b/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java
index 4886fdcc1d..2f0f0a9380 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java
@@ -31,7 +31,7 @@ public class WSDLUtils {
LogFactory.getLog(WSDLUtils.class.getName());
/**
- * Return the endpoint address from a tag
+ * Return the endpoint address from a <soap:address location="..."> tag
*/
public static String getAddressFromPort(Port p) {
// Get the endpoint for a port
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java b/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java
index 62bd888182..027935443c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java
@@ -819,7 +819,7 @@ private static InputSource getInputSourceFromURI(String uri,
uconn.setDefaultUseCaches(false);
uconn.setDoInput(true);
uconn.setDoOutput(false);
- uconn.setInstanceFollowRedirects(true);
+ uconn.setInstanceFollowRedirects(false);
uconn.setUseCaches(false);
// username/password info in the URL overrides passed in values
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java b/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java
index 73c218dca0..2cc0a1d99c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java
@@ -59,6 +59,16 @@ public class ClassReader extends ByteArrayInputStream {
private static final int CONSTANT_Double = 6;
private static final int CONSTANT_NameAndType = 12;
private static final int CONSTANT_Utf8 = 1;
+
+ /*java 8 9 10 11 new tokens https://docs.oracle.com/javase/specs/jvms/se11/html/jvms-4.html*/
+ private static final int CONSTANT_MethodHandle = 15;
+ private static final int CONSTANT_MethodType = 16;
+ private static final int CONSTANT_Dynamic = 17;
+ private static final int CONSTANT_InvokeDynamic = 18;
+ private static final int CONSTANT_Module = 19;
+ private static final int CONSTANT_Package = 20;
+ /*end of ava 8 9 10 11 new tokens*/
+
/**
* the constant pool. constant pool indices in the class file
* directly index into this array. The value stored in this array
@@ -346,12 +356,31 @@ protected final void readCpool() throws IOException {
int len = readShort();
skipFully(len);
+ break;
+ case CONSTANT_MethodHandle:
+
+ read(); // reference kind
+ readShort(); // reference index
+ break;
+
+ case CONSTANT_MethodType:
+
+ readShort(); // descriptor index
+ break;
+
+ case CONSTANT_Dynamic:
+ readShort(); // bootstrap method attr index
+ readShort(); // name and type index
+ break;
+ case CONSTANT_InvokeDynamic:
+
+ readShort(); // bootstrap method attr index
+ readShort(); // name and type index
break;
default:
// corrupt class file
- throw new IllegalStateException(
- Messages.getMessage("unexpectedBytes00"));
+ throw new IllegalStateException("Error looking for paramter names in bytecode: unexpected bytes in file, tag:"+c);
}
}
}
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaClass.java b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaClass.java
index 8c20978e35..a3c271373e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaClass.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaClass.java
@@ -23,7 +23,7 @@
/**
* A simple cache of previously loaded classes, and their methods.
*
- * @author Sam Ruby
+ * @author Sam Ruby (rubys@us.ibm.com)
*/
public class JavaClass implements Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaMethod.java b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaMethod.java
index cf99fbbd4d..f2c2a58641 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaMethod.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaMethod.java
@@ -22,7 +22,7 @@
/**
* A simple cache of previously loaded methods
*
- * @author Sam Ruby
+ * @author Sam Ruby (rubys@us.ibm.com)
*/
public class JavaMethod {
@@ -56,7 +56,6 @@ public JavaMethod(Class jc, String name) {
/**
* Lookup a method based on name. This method returns an array just in
* case there is more than one.
- * @param name name of method
*/
public Method[] getMethod() {
return methods;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/MethodCache.java b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/MethodCache.java
index dca17f0b72..7eb25e4454 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/MethodCache.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/MethodCache.java
@@ -28,8 +28,8 @@
* cache for performance reasons.
* This class is a singleton - so use getInstance to get an instance of it.
*
- * @author Davanum Srinivas
- * @author Sebastian Dietrich
+ * @author Davanum Srinivas (dims@yahoo.com)
+ * @author Sebastian Dietrich (sebastian.dietrich@anecon.com)
*/
public class MethodCache {
/**
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/fromJava/Types.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/fromJava/Types.java
index c9a7b87a43..45daab78a0 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/fromJava/Types.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/fromJava/Types.java
@@ -65,9 +65,9 @@
import java.util.Set;
/**
- * Description:
This class is used to recursively serializes a Java Class into
+ * This class is used to recursively serializes a Java Class into
* an XML Schema representation.
- *
+ *
* It has utility methods to create a schema node, assosiate namespaces to the various types
*
* @author unascribed
@@ -1001,7 +1001,7 @@ private void writeWsdlTypesElement() {
* Write a schema representation for the given Class. Recurse
* through all the public fields as well as fields represented by java
* bean compliant accessor methods.
- *
+ *
* Then return the qualified string representation of the generated type
*
* @param type Class for which to generate schema
@@ -1016,7 +1016,7 @@ public String writeType(Class type) throws AxisFault {
* Write a schema representation for the given Class. Recurse
* through all the public fields as well as fields represented by java
* bean compliant accessor methods.
- *
+ *
* Then return the qualified string representation of the generated type
*
* @param type Class for which to generate schema
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Generator.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Generator.java
index 27ca71026b..8a2db3ffc7 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Generator.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Generator.java
@@ -20,7 +20,7 @@
/**
* This is the interface for all writers. All writers, very simply, must
* support a write method.
- *
+ *
* Writer and WriterFactory are part of the Writer framework. Folks who want
* to use the emitter to generate stuff from WSDL should do 3 things:
* 1. Write implementations of the Writer interface, one each for PortType,
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
index 2ddc0cfdd4..0a6e15431f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
@@ -15,6 +15,7 @@
*/
package org.apache.axis.wsdl.gen;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.utils.Messages;
import org.apache.axis.wsdl.symbolTable.BindingEntry;
import org.apache.axis.wsdl.symbolTable.CollectionElement;
@@ -26,6 +27,7 @@
import org.apache.axis.wsdl.symbolTable.Type;
import org.apache.axis.wsdl.symbolTable.TypeEntry;
import org.apache.axis.wsdl.symbolTable.Utils;
+import org.apache.commons.logging.Log;
import org.w3c.dom.Document;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -34,6 +36,7 @@
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
import javax.xml.parsers.ParserConfigurationException;
+
import java.io.IOException;
import java.util.Collection;
import java.util.Iterator;
@@ -44,6 +47,7 @@
* This is a class with no documentation.
*/
public class Parser {
+ private static final Log log = LogFactory.getLog(Parser.class.getName());
/** Field debug */
protected boolean debug = false;
@@ -304,7 +308,7 @@ public String getWSDLURI() {
/**
* Parse a WSDL at a given URL.
- *
+ *
* This method will time out after the number of milliseconds specified
* by our timeoutms member.
*
@@ -345,7 +349,14 @@ public void run(String wsdlURI) throws Exception {
}
if (runnable.getFailure() != null) {
- throw runnable.getFailure();
+ Throwable failure = runnable.getFailure();
+ if (failure instanceof Exception) {
+ throw (Exception)failure;
+ } else if (failure instanceof Error){
+ throw (Error)failure;
+ } else {
+ throw new Error(failure);
+ }
}
} // run
@@ -363,7 +374,7 @@ private class WSDLRunnable implements Runnable {
private String wsdlURI;
/** Field failure */
- private Exception failure = null;
+ private Throwable failure = null;
/**
* Constructor WSDLRunnable
@@ -384,7 +395,7 @@ public void run() {
try {
symbolTable.populate(wsdlURI, username, password);
generate(symbolTable);
- } catch (Exception e) {
+ } catch (Throwable e) {
failure = e;
}
} // run
@@ -394,7 +405,7 @@ public void run() {
*
* @return
*/
- public Exception getFailure() {
+ public Throwable getFailure() {
return failure;
} // getFailure
} // WSDLRunnable
@@ -435,6 +446,13 @@ protected void sanityCheck(SymbolTable symbolTable) {
// do nothing.
}
+ private static void generate(Generator gen) throws IOException {
+ if (log.isDebugEnabled()) {
+ log.debug("Invoking generator " + gen);
+ }
+ gen.generate();
+ }
+
/**
* Method generate
*
@@ -498,7 +516,7 @@ private void generate(SymbolTable symbolTable) throws IOException {
}
if (gen != null) {
- gen.generate();
+ generate(gen);
}
}
}
@@ -507,7 +525,7 @@ private void generate(SymbolTable symbolTable) throws IOException {
// outside of the recursive emit method.
Generator gen = genFactory.getGenerator(def, symbolTable);
- gen.generate();
+ generate(gen);
} // generate
/**
@@ -542,7 +560,7 @@ private void generateTypes(SymbolTable symbolTable) throws IOException {
&& (type.getBaseType() == null)) {
Generator gen = genFactory.getGenerator(type, symbolTable);
- gen.generate();
+ generate(gen);
}
}
@@ -569,7 +587,7 @@ private void generateTypes(SymbolTable symbolTable) throws IOException {
&& (type.getBaseType() == null)) {
Generator gen = genFactory.getGenerator(type, symbolTable);
- gen.generate();
+ generate(gen);
}
}
} // generateTypes
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java
index 3e88bd50d2..4b0a13e955 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java
@@ -27,7 +27,7 @@
public class BackslashUtil implements java.io.Serializable {
/**
- * @param QName[local] that may contain unescaped backslashes
+ * @param suspectQName QName[local] that may contain unescaped backslashes
* @return QName[local] w/ no backslashes
*/
@@ -40,7 +40,7 @@ public static QName getQNameWithBackslashlessLocal(QName suspectQName) {
}
/**
- * @param QName[local] which may contain unescaped backslashes
+ * @param suspectQName QName[local] which may contain unescaped backslashes
* @return QName[local] w/ escaped backslashes
*/
@@ -78,7 +78,7 @@ public static String stripBackslashes(String string) {
}
/**
- * Slave method for applyBackslashes & stripBackslashes .
+ * Slave method for applyBackslashes & stripBackslashes .
*
*/
public static String transformBackslashes(String string, boolean delete) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BindingEntry.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BindingEntry.java
index ae0ff09437..b597fa5652 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BindingEntry.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BindingEntry.java
@@ -152,7 +152,7 @@ public BindingEntry(Binding binding, int bindingType, Style bindingStyle,
* operation outputBodyTypes = USE_ENCODED
* operation faultBodyTypes = USE_ENCODED
* mimeTypes = null
- *
+ *
* The caller of this constructor should
* also call the various setter methods to fully fill out this object:
* setBindingType, setBindingStyle, setHasLiteral, setAttribute,
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionElement.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionElement.java
index b25c2ab429..1ae3f84fbc 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionElement.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionElement.java
@@ -22,10 +22,10 @@
/**
* This Element is for a QName that is a 'collection'.
* For example,
- * [, ]
+ * added with the special QName <name>[<minOccurs>, <maxOccurs>]
*/
public class CollectionElement extends DefinedElement implements CollectionTE {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionType.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionType.java
index d4e44b9171..6bcaa50175 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionType.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionType.java
@@ -22,10 +22,10 @@
/**
* This Type is for a QName that is a 'collection'.
* For example,
- * [, ]
+ * added with the special QName <name>[<minOccurs>, <maxOccurs>]
*/
public class CollectionType extends DefinedType implements CollectionTE {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ElementDecl.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ElementDecl.java
index c2d09a67a0..45aecda93d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ElementDecl.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ElementDecl.java
@@ -19,7 +19,7 @@
/**
* Simple utility struct for holding element declarations.
- *
+ *
* This simply correlates a QName to a TypeEntry.
*
* @author Glen Daniels (gdaniels@apache.org)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/FaultInfo.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/FaultInfo.java
index ae46774776..8c58f77339 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/FaultInfo.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/FaultInfo.java
@@ -51,11 +51,11 @@ public class FaultInfo {
/**
* This constructor creates FaultInfo for a binding fault.
- *
+ *
* If the part of the fault is a type, then the QName is
* derived from the element name and the provided namespace
* (this namespace SHOULD come from the binding).
- *
+ *
* If the part of the fault is an element, then the QName is
* the QName of the element, and the given namespace is ignored.
*
@@ -187,11 +187,11 @@ public Use getUse() {
/**
* Return the QName of a fault. This method may return null if no parts
* are in the fault message.
- *
+ *
* If the part of the fault is a type, then the QName is
* derived from the element name and the provided namespace
* (this namespace SHOULD come from the binding).
- *
+ *
* If the part of the fault is an element, then the QName is
* the QName of the element, and the given namespace is ignored.
*
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SchemaUtils.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
index e5e71211c3..956d7f982e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
@@ -1338,18 +1338,18 @@ public static QName getArrayComponentQName(Node node,
/**
* If the specified node represents an element that references a collection
* then return the qname repesenting the component of the collection.
- *
- *
+ * <xsd:element name="alias" type="xsd:string" maxOccurs="unbounded"/>
* returns qname for"xsd:string"
- *
- *
- *
- *
- *
+ *
+ * <xsd:complexType>
+ * <xsd:sequence>
+ * <xsd:element name="alias" type="xsd:string" maxOccurs="unbounded"/>
+ * </xsd:sequence>
+ * </xsd:complexType>
* returns qname for"xsd:string"
- *
- *
+ * <xsd:element ref="alias" maxOccurs="unbounded"/>
* returns qname for "alias"
*
* @param node is the Node
@@ -1881,17 +1881,17 @@ private static void addAttributeGroupToVector(Vector v, Node attrGrpnode,
* Return the attribute names and types if any in the node
* The even indices are the attribute types (TypeEntry) and
* the odd indices are the corresponding names (Strings).
- *
+ *
* Example:
- *
- *
- *
- *
+ * <complexType name="Person">
+ * <sequence>
+ * <element minOccurs="1" maxOccurs="1" name="Age" type="double" />
+ * <element minOccurs="1" maxOccurs="1" name="ID" type="xsd:float" />
+ * </sequence>
+ * <attribute name="Name" type="string" />
+ * <attribute name="Male" type="boolean" />
+ * <attributeGroup ref="s0:MyAttrSet" />
+ * </complexType>
*
* @param node
* @param symbolTable
@@ -2062,8 +2062,8 @@ public static TypeEntry getBaseType(TypeEntry type, SymbolTable symbolTable) {
}
/**
- * Returns whether the specified node represents a
- * with a nested .
+ * Returns whether the specified node represents a <xsd:simpleType>
+ * with a nested <xsd:list itemType="...">.
* @param node
* @return
*/
@@ -2073,7 +2073,7 @@ public static boolean isListWithItemType(Node node) {
}
/**
- * Returns the value of itemType attribute of in
+ * Returns the value of itemType attribute of <xsd:list> in <xsd:simpleType>
* @param node
* @return
*/
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ServiceEntry.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ServiceEntry.java
index 01ba5d80d6..9e0fa37ea4 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ServiceEntry.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ServiceEntry.java
@@ -39,11 +39,6 @@ public ServiceEntry(Service service) {
this.service = service;
} // ctor
- /**
- *
- * @param originalServiceName
- *
- */
public String getOriginalServiceName(){
return this.originalServiceName;
}
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java
index 142410b332..5763352bb1 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java
@@ -147,9 +147,11 @@ public String toString() {
*/
protected String toString(String indent) {
- String string = indent + "QName: " + qname + '\n' + indent
- + "name: " + name + '\n' + indent
- + "isReferenced? " + isReferenced + '\n';
+ StringBuffer buffer = new StringBuffer();
+ buffer.append(indent).append("QName: ").append(qname).append('\n');
+ buffer.append(indent).append("Class: ").append(this.getClass().getName()).append('\n');
+ buffer.append(indent).append("name: ").append(name).append('\n');
+ buffer.append(indent).append("isReferenced? ").append(isReferenced).append('\n');
String prefix = indent + "dynamicVars: ";
Iterator entries = dynamicVars.entrySet().iterator();
@@ -157,10 +159,10 @@ protected String toString(String indent) {
Map.Entry entry = (Map.Entry) entries.next();
Object key = entry.getKey();
- string += prefix + key + " = " + entry.getValue() + '\n';
+ buffer.append(prefix).append(key).append(" = ").append(entry.getValue()).append('\n');
prefix = indent + " ";
}
- return string;
+ return buffer.toString();
} // toString
} // abstract class SymTabEntry
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java
index aefb3f12e7..5f295040e5 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java
@@ -89,8 +89,8 @@
/**
* This class represents a table of all of the top-level symbols from a set of WSDL Definitions and
* DOM Documents: XML types; WSDL messages, portTypes, bindings, and services.
- *
- * This symbolTable contains entries of the form where key is of type QName and value is
+ *
+ * This symbolTable contains entries of the form <key, value> where key is of type QName and value is
* of type Vector. The Vector's elements are all of the objects that have the given QName. This is
* necessary since names aren't unique among the WSDL types. message, portType, binding, service,
* could all have the same QName and are differentiated merely by type. SymbolTable contains
@@ -142,7 +142,7 @@ public class SymbolTable {
private final Map typeIndex = Collections.unmodifiableMap(typeTypeEntries);
/**
- * cache of nodes -> base types for complexTypes. The cache is
+ * cache of nodes -> base types for complexTypes. The cache is
* built on nodes because multiple TypeEntry objects may use the
* same node.
*/
@@ -366,7 +366,7 @@ public Vector getTypes() {
} // getTypes
/**
- * Return an unmodifiable map of qnames -> Elements in the symbol
+ * Return an unmodifiable map of qnames -> Elements in the symbol
* table.
*
* @return an unmodifiable Map value
@@ -376,7 +376,7 @@ public Map getElementIndex() {
}
/**
- * Return an unmodifiable map of qnames -> Elements in the symbol
+ * Return an unmodifiable map of qnames -> Elements in the symbol
* table.
*
* @return an unmodifiable Map value
@@ -1515,16 +1515,16 @@ private void populateMessages(Definition def) throws IOException {
/**
* ensures that a message in a <input>, <output>,
- * or <fault> element in an <operation>
+ * or <fault> element in an <operation>
* element is valid. In particular, ensures that
*
* - an attribute
message is present (according to the
* XML Schema for WSDL 1.1 message is required
- *
+ *
*
- the value of attribute
message (a QName) refers to
* an already defined message
*
- *
+ *
* Note: this method should throw a javax.wsdl.WSDLException rather than
* a java.io.IOException
*
@@ -1554,9 +1554,9 @@ protected void ensureOperationMessageValid(Message message)
/**
* ensures that an an element <operation> within
- * an element <portType> is valid. Throws an exception
+ * an element <portType> is valid. Throws an exception
* if the operation is not valid.
- *
+ *
* Note: this method should throw a javax.wsdl.WSDLException
* rather than a java.io.IOException
*
@@ -1619,7 +1619,7 @@ protected void ensureOperationValid(Operation operation)
/**
* ensures that an an element <portType>
* is valid. Throws an exception if the portType is not valid.
- *
+ *
* Note: this method should throw a javax.wsdl.WSDLException
* rather than a java.io.IOException
*
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
index 7b3233f2e7..536b076016 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
@@ -32,7 +32,7 @@
* A TypeEntry object extends SymTabEntry and is built by the SymbolTable class for
* each supported root complexType, simpleType, and elements that are
* defined or encountered.
- *
+ *
* SymTabEntry
* |
* TypeEntry
@@ -43,28 +43,28 @@
* CollectionType CollectionElement,
* DefinedType, UndefinedElement)
* UndefinedType)
- *
+ *
* UndefinedType and UndefinedElement are placeholders when the real type or element
* is not encountered yet. Both of these implement the Undefined interface.
- *
+ *
* A TypeEntry whose java (or other language) name depends on an Undefined type, will
* have its name initialization deferred until the Undefined type is replaced with
* a defined type. The updateUndefined() method is invoked by the UndefinedDelegate to
* update the information.
- *
+ *
* Each TypeEntry whose language name depends on another TypeEntry will have the refType
* field set. For example:
- *
+ *
* Another Example:
- *
- *
- *
- *
- *
- *
+ * <xsd:complexType name="hobbyArray">
+ * <xsd:complexContent>
+ * <xsd:restriction base="soapenc:Array">
+ * <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[]"/>
+ * </xsd:restriction>
+ * </xsd:complexContent>
+ * </xsd:complexType>
* The TypeEntry for "hobbyArray" will have a refType that locates the TypeEntry for xsd:string
* and the dims field will be "[]"
*
@@ -89,7 +89,7 @@ public abstract class TypeEntry extends SymTabEntry implements Serializable {
protected QName componentType = null; // If this is an array, the component type
/** If this TypeEntry represents an array with elements inside a "wrapper"
- * this field can optionally change the inner QName (default is - ).
+ * this field can optionally change the inner QName (default is <item>).
*/
protected QName itemQName = null;
@@ -432,15 +432,6 @@ public void setItemQName(QName itemQName) {
this.itemQName = itemQName;
}
- /**
- * Get string representation.
- *
- * @return
- */
- public String toString() {
- return toString("");
- }
-
/**
* Get string representation with indentation
*
@@ -457,7 +448,6 @@ protected String toString(String indent) {
}
return super.toString(indent)
- + indent + "Class: " + this.getClass().getName() + "\n"
+ indent + "Base?: " + isBaseType + "\n"
+ indent + "Undefined?: " + undefined + "\n"
+ indent + "isSimpleType? " + isSimpleType + "\n"
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
index 05fe4cf46f..a08b203e86 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
@@ -175,7 +175,7 @@ public static Vector getAttributesWithLocalName(Node node,
/**
* An xml element may have a name.
- * For example <.element name="foo" type="b:bar">.
+ * For example <element name="foo" type="b:bar">
* has the name "element". This routine gets the full QName of the element.
*
* @param node
@@ -200,7 +200,7 @@ public static QName getNodeQName(Node node) {
/**
* XML nodes may have a name attribute.
- * For example <.element name="foo" type="b:bar">.
+ * For example <element name="foo" type="b:bar">
* has the name attribute value "foo". This routine gets the QName of the name attribute value.
*
* @param node
@@ -274,12 +274,12 @@ public static QName getNodeNameQName(Node node) {
* - use of an anonymous type (i.e. a nested type underneath itself)
* - a wsdl:part can use the element attribute.
* - an extension can use the base attribute.
- *
+ *
* This routine returns a QName representing this "type".
* The forElement value is also returned to indicate whether the
* QName represents an element (i.e. obtained using the ref attribute)
* or a type.
- *
+ *
* Other attributes affect the QName that is returned.
* If the "minOccurs" and "maxOccurs" are set such that the
* type is a collection of "types", then an artificial qname is
@@ -1022,7 +1022,7 @@ public static String getWrapperType(String type) {
}
/**
- * Determines if the DOM Node represents an xs:
+ * Determines if the DOM Node represents an xs:<node>
*/
public static boolean isXsNode (Node node, String nameName)
{
diff --git a/axis-rt-core/src/site/site.xml b/axis-rt-core/src/site/site.xml
index 6d9b412b90..e36a181372 100644
--- a/axis-rt-core/src/site/site.xml
+++ b/axis-rt-core/src/site/site.xml
@@ -19,9 +19,6 @@
-->
-
+
diff --git a/axis-rt-core/src/test/java/org/apache/axis/attachments/TestDimeBodyPart.java b/axis-rt-core/src/test/java/org/apache/axis/attachments/TestDimeBodyPart.java
new file mode 100644
index 0000000000..b3b3e4b4da
--- /dev/null
+++ b/axis-rt-core/src/test/java/org/apache/axis/attachments/TestDimeBodyPart.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis.attachments;
+
+import junit.framework.TestCase;
+
+import org.apache.axiom.testutils.activation.InstrumentedDataSource;
+import org.apache.axiom.testutils.activation.RandomDataSource;
+import org.apache.commons.io.output.NullOutputStream;
+
+public class TestDimeBodyPart extends TestCase {
+ public void testWriteToWithDynamicContentDataHandlerClosesInputStreams() throws Exception {
+ InstrumentedDataSource ds = new InstrumentedDataSource(new RandomDataSource(1000));
+ DimeBodyPart bp = new DimeBodyPart(new DynamicContentDataHandler(ds), "1234");
+ bp.write(new NullOutputStream(), (byte)0);
+ assertEquals(0, ds.getOpenStreamCount());
+ }
+}
diff --git a/axis-rt-core/src/test/java/test/saaj/TestAttachment.java b/axis-rt-core/src/test/java/test/saaj/TestAttachment.java
index f855d3faa3..8b062b5347 100644
--- a/axis-rt-core/src/test/java/test/saaj/TestAttachment.java
+++ b/axis-rt-core/src/test/java/test/saaj/TestAttachment.java
@@ -50,8 +50,8 @@ public void testMultipleAttachments() throws Exception {
MessageFactory factory = MessageFactory.newInstance();
SOAPMessage msg = factory.createMessage();
- java.net.URL url1 = new java.net.URL("http://slashdot.org/slashdot.xml");
- java.net.URL url2 = new java.net.URL("http://www.apache.org/LICENSE.txt");
+ java.net.URL url1 = TestAttachment.class.getResource("slashdot.xml");
+ java.net.URL url2 = TestAttachment.class.getResource("LICENSE.txt");
AttachmentPart a1 = msg.createAttachmentPart(new javax.activation.DataHandler(url1));
a1.setContentType("text/xml");
diff --git a/axis-rt-core/src/test/java/test/servicedesc/TestServiceDesc.java b/axis-rt-core/src/test/java/test/servicedesc/TestServiceDesc.java
index 69d47d5ec9..ffbf5f39df 100644
--- a/axis-rt-core/src/test/java/test/servicedesc/TestServiceDesc.java
+++ b/axis-rt-core/src/test/java/test/servicedesc/TestServiceDesc.java
@@ -15,6 +15,8 @@
*/
package test.servicedesc;
+import java.util.Arrays;
+import java.util.Comparator;
import java.util.List;
import junit.framework.TestCase;
@@ -30,16 +32,21 @@ public void testFaultSynch() throws Exception {
desc.loadServiceDescByIntrospection(ServiceClass.class);
- List operations = desc.getOperations();
+ OperationDesc[] operations = (OperationDesc[])desc.getOperations().toArray(new OperationDesc[0]);
+ Arrays.sort(operations, new Comparator() {
+ public int compare(Object o1, Object o2) {
+ return ((OperationDesc)o1).getName().compareTo(((OperationDesc)o2).getName());
+ }
+ });
assertTrue(operations != null);
assertEquals("invalid number of registered operations",
- 2, operations.size());
+ 2, operations.length);
OperationDesc operation;
List faults;
- operation = (OperationDesc)operations.get(0);
+ operation = operations[0];
assertEquals("doIt1", operation.getName());
faults = operation.getFaults();
@@ -48,7 +55,7 @@ public void testFaultSynch() throws Exception {
assertEquals("invalid number of registered faults",
2, faults.size());
- operation = (OperationDesc)operations.get(1);
+ operation = operations[1];
assertEquals("doIt2", operation.getName());
faults = operation.getFaults();
diff --git a/axis-rt-core/src/test/java/test/utils/TestMessages.java b/axis-rt-core/src/test/java/test/utils/TestMessages.java
index 8ffcd473a3..dc32db794b 100644
--- a/axis-rt-core/src/test/java/test/utils/TestMessages.java
+++ b/axis-rt-core/src/test/java/test/utils/TestMessages.java
@@ -125,9 +125,8 @@ public void testTestExtendedMessages() {
* matches the excpected number of parameters (in the source code).
*/
public void testForMissingMessages() {
- String baseDir = System.getProperty("basedir");
char sep = File.separatorChar;
- String srcDirStr = baseDir + sep + "src" + sep + "main" + sep + "java";
+ String srcDirStr = "src" + sep + "main" + sep + "java";
File srcDir = new File(srcDirStr);
if (srcDir.exists()) {
diff --git a/axis-rt-core/src/test/java/test/utils/TestSrcContent.java b/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
index a9e7315521..89c29b4fd1 100644
--- a/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
+++ b/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
@@ -44,8 +44,7 @@ public class TestSrcContent extends TestCase {
* tree (xml-axis/java/src), calling checkFile for each file.
*/
public void testSourceFiles() {
- String baseDir = System.getProperty("basedir");
- File srcDir = new File(baseDir, "src/main/java");
+ File srcDir = new File("src/main/java");
if (srcDir.exists()) {
walkTree(srcDir);
diff --git a/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java b/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java
index fe38606bc4..4f0e9bb36a 100644
--- a/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java
+++ b/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java
@@ -303,7 +303,7 @@ public void testDOMXXE() throws Exception
String msg = "" +
"" +
+ "" +
"]>" +
"
+
+
+ Ford Dumping Windows For QNX In New Vehicles
+ http://slashdot.org/story/14/02/25/0256235/ford-dumping-windows-for-qnx-in-new-vehicles
+
+ Unknown Lamer
+ back-to-the-classics
+ 3017
+ 0
+ technology
+ os_64.png
+
+
+
+ The Higgs Boson Re-Explained By the Mick Jagger of Physics
+ http://slashdot.org/story/14/02/25/0318219/the-higgs-boson-re-explained-by-the-mick-jagger-of-physics
+
+ Unknown Lamer
+ just-before-he-turned-into-a-cup-of-oj
+ 100
+ 12
+ science
+ science_64.png
+
+
+
+ Complete Microsoft EMET Bypass Developed
+ http://slashdot.org/story/14/02/25/0139202/complete-microsoft-emet-bypass-developed
+
+ Unknown Lamer
+ just-a-teeny-tiny-bug
+ 77
+ 34
+ technology
+ windows_64.png
+
+
+
+ US War Machine Downsizing?
+ http://slashdot.org/story/14/02/25/0045203/us-war-machine-downsizing
+
+ Unknown Lamer
+ how-will-we-defeat-zombie-stalin-now?
+ 363
+ 192
+ technology
+ military_64.png
+
+
+
+ New Release of DICE, the CPU-Less Arcade Game Emulator, Adds Four Games
+ http://slashdot.org/story/14/02/25/001257/new-release-of-dice-the-cpu-less-arcade-game-emulator-adds-four-games
+
+ Unknown Lamer
+ knew-you-got-that-16-core-machine-for-a-reason
+ 509
+ 19
+ games
+ emulation_64.png
+
+
+
+ Publishers Withdraw More Than 120 Fake Papers
+ http://slashdot.org/story/14/02/25/006257/publishers-withdraw-more-than-120-fake-papers
+
+ Unknown Lamer
+ trolling-journals-for-no-particular-reason
+ 357583
+ 41
+ news
+ themedia_64.png
+
+
+
+ SpaceX Testing Landing Legs On Next Falcon9 Rocket
+ http://slashdot.org/story/14/02/24/2311234/spacex-testing-landing-legs-on-next-falcon9-rocket
+
+ Unknown Lamer
+ crazy-enough-to-work
+ 147
+ 36
+ science
+ space_64.png
+
+
+
+ Oklahoma Schools Required To Teach Students Personal Finance
+ http://slashdot.org/story/14/02/24/2139226/oklahoma-schools-required-to-teach-students-personal-finance
+
+ samzenpus
+ value-of-a-dollar
+ 253
+ 196
+ news
+ money_64.png
+
+
+
+ Why Nissan Is Talking To Tesla Model S Owners
+ http://slashdot.org/story/14/02/24/2131219/why-nissan-is-talking-to-tesla-model-s-owners
+
+ samzenpus
+ how-do-you-like-us-now?
+ 1971
+ 183
+ technology
+ transportation_64.png
+
+
+
+ DARPA Looks To End the Scourge of Counterfeit Computer Gear
+ http://slashdot.org/story/14/02/24/1948202/darpa-looks-to-end-the-scourge-of-counterfeit-computer-gear
+
+ samzenpus
+ knocking-out-knock-offs
+ 828
+ 67
+ hardware
+ crime_64.png
+
+
+
+ Does Relying On an IDE Make You a Bad Programmer?
+ http://slashdot.org/story/14/02/24/1845209/does-relying-on-an-ide-make-you-a-bad-programmer
+
+ samzenpus
+ speak-up
+ 22
+ 439
+ developers
+ programming_64.png
+
+
+
+ The Ever So Unlikely Tale of How ARM Came To Rule the World
+ http://slashdot.org/story/14/02/24/1840217/the-ever-so-unlikely-tale-of-how-arm-came-to-rule-the-world
+
+ samzenpus
+ top-of-the-class
+ 84
+ 81
+ mobile
+ business_64.png
+
+
+
+ Harold Ramis Dies At 69
+ http://slashdot.org/story/14/02/24/203208/harold-ramis-dies-at-69
+
+ samzenpus
+ print-is-dead
+ 359
+ 116
+ entertainment
+ movies_64.png
+
+
+
+ Apocalypse NAO: College Studies the Theological Ramifications of Robotics
+ http://slashdot.org/story/14/02/24/192203/apocalypse-nao-college-studies-the-theological-ramifications-of-robotics
+
+ samzenpus
+ why-did-you-program-me-to-sin?
+ 2248
+ 135
+ idle
+ robot_64.png
+
+
+
+ Book Review: Sudo Mastery: User Access Control For Real People
+ http://slashdot.org/story/14/02/24/1415216/book-review-sudo-mastery-user-access-control-for-real-people
+
+ samzenpus
+ read-all-about-it
+ 172
+ 76
+ bookreview
+ books_64.png
+
+
+
diff --git a/axis-rt-databinding-castor/pom.xml b/axis-rt-databinding-castor/pom.xml
index b5e5cf1aec..5f2e8c2cea 100644
--- a/axis-rt-databinding-castor/pom.xml
+++ b/axis-rt-databinding-castor/pom.xml
@@ -26,7 +26,7 @@
../pom.xml
axis-rt-databinding-castor
- Castor databinding support
+ Castor Databinding
Contains serializers and deserializers for Castor.
@@ -49,20 +49,4 @@
0.9.4.2
-
-
-
- maven-project-info-reports-plugin
- 2.4
-
-
-
- index
- dependencies
-
-
-
-
-
-
diff --git a/axis-rt-databinding-castor/src/site/site.xml b/axis-rt-databinding-castor/src/site/site.xml
index fea33660da..18866594ab 100644
--- a/axis-rt-databinding-castor/src/site/site.xml
+++ b/axis-rt-databinding-castor/src/site/site.xml
@@ -17,11 +17,8 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+
-
+
diff --git a/axis-rt-databinding-xmlbeans/pom.xml b/axis-rt-databinding-xmlbeans/pom.xml
index ea045f4f18..5e25623879 100644
--- a/axis-rt-databinding-xmlbeans/pom.xml
+++ b/axis-rt-databinding-xmlbeans/pom.xml
@@ -27,6 +27,13 @@
axis-rt-databinding-xmlbeans
XmlBeans Databinding
+ ${baseUrl}/xmlbeans
+
+
+ axis
+ ${baseSiteUrl}/xmlbeans
+
+
${project.groupId}
diff --git a/axis-rt-databinding-xmlbeans/src/site/site.xml b/axis-rt-databinding-xmlbeans/src/site/site.xml
new file mode 100644
index 0000000000..18866594ab
--- /dev/null
+++ b/axis-rt-databinding-xmlbeans/src/site/site.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/axis-rt-jws/pom.xml b/axis-rt-jws/pom.xml
index b34ffeee28..1a8c266193 100644
--- a/axis-rt-jws/pom.xml
+++ b/axis-rt-jws/pom.xml
@@ -27,6 +27,17 @@
axis-rt-jws
JWS Support
+ ${baseUrl}/jws
+
+
+ axis
+ ${baseSiteUrl}/jws
+
+
+
+
+ 1.6
+
${project.groupId}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/AbstractCompiler.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/AbstractCompiler.java
deleted file mode 100644
index e159619204..0000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/AbstractCompiler.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.axis.components.compiler;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This class implements the functionality common to all Java compilers.
- * @author Davanum Srinivas
- * @author Stefano Mazzocchi
- * @since 2.0
- */
-public abstract class AbstractCompiler implements Compiler {
-
- /**
- * The source program filenames
- */
- protected ArrayList fileList = new ArrayList();
-
- /**
- * The name of the directory containing the source program file
- */
- protected String srcDir;
-
- /**
- * The name of the directory to contain the resulting object program file
- */
- protected String destDir;
-
- /**
- * The classpath to be used for compilation
- */
- protected String classpath;
-
- /**
- * The encoding of the source program or null to use the
- * platform's default encoding
- */
- protected String encoding = null;
-
- /**
- * The input stream to output compilation errors
- */
- protected InputStream errors;
-
- /**
- * Add the name of the file containing the source program to the file list
- *
- * @param file The name of the file containing the source program
- */
- public void addFile(String file) {
- this.fileList.add(file);
- }
-
- /**
- * Set the name of the directory containing the source program file
- *
- * @param srcDir The name of the directory containing the source program file
- */
- public void setSource(String srcDir) {
- this.srcDir = srcDir;
- }
-
- /**
- * Set the name of the directory to contain the resulting object program file
- *
- * @param destDir The name of the directory to contain the resulting object
- * program file
- */
- public void setDestination(String destDir) {
- this.destDir = destDir;
- }
-
- /**
- * Set the classpath to be used for this compilation
- *
- * @param classpath The classpath to be used for this compilation
- */
- public void setClasspath(String classpath) {
- this.classpath = classpath;
- }
-
- /**
- * Set the encoding of the input source file or null to use the
- * platform's default encoding
- *
- * @param encoding The encoding of the input source file or null
- * to use the platform's default encoding
- */
- public void setEncoding(String encoding) {
- this.encoding = encoding;
- }
-
- /**
- * Return the list of errors generated by this compilation
- *
- * @return The list of errors generated by this compilation
- * @exception IOException If an error occurs during message collection
- */
- public List getErrors() throws IOException {
- return parseStream(new BufferedReader(new InputStreamReader(errors)));
- }
-
- /**
- * Parse the compiler error stream to produce a list of
- * CompilerErrors
- *
- * @param errors The error stream
- * @return The list of compiler error messages
- * @exception IOException If an error occurs during message collection
- */
- protected abstract List parseStream(BufferedReader errors)
- throws IOException;
-
- /**
- * Fill the arguments taken by the Java compiler
- *
- * @param arguments The list of compilation arguments
- * @return The prepared list of compilation arguments
- */
- protected List fillArguments(List arguments) {
- // destination directory
- arguments.add("-d");
- arguments.add(destDir);
-
- // classpath
- arguments.add("-classpath");
- arguments.add(classpath);
-
- // sourcepath
- if(srcDir != null) {
- arguments.add("-sourcepath");
- arguments.add(srcDir);
- }
-
- // add optimization (for what is worth)
- arguments.add("-O");
-
- // add debug option
- arguments.add("-g");
-
- // add encoding if set
- if (encoding != null) {
- arguments.add("-encoding");
- arguments.add(encoding);
- }
-
- return arguments;
- }
-
- /**
- * Copy arguments to a string array
- *
- * @param arguments The compiler arguments
- * @return A string array containing compilation arguments
- */
- protected String[] toStringArray(List arguments) {
- int i;
- String[] args = new String[arguments.size() + fileList.size()];
-
- for (i = 0; i < arguments.size(); i++) {
- args[i] = (String) arguments.get(i);
- }
-
- for (int j=0; j < fileList.size(); i++,j++) {
- args[i] = (String)fileList.get(j);
- }
- return args;
- }
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Compiler.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Compiler.java
deleted file mode 100644
index 92f34f5a7c..0000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Compiler.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.axis.components.compiler;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * This interface defines a compiler's functionality for all
- * (Java-based) compiled languages
- * @author Davanum Srinivas
- * @author Stefano Mazzocchi
- * @since 2.0
- */
-public interface Compiler {
- /**
- * Set the name of the file containing the source program
- *
- * @param file The name of the file containing the source program
- */
- void addFile(String file);
-
- /**
- * Set the name of the directory containing the source program file
- *
- * @param srcDir The name of the directory containing the source program file
- */
- void setSource(String srcDir);
-
- /**
- * Set the name of the directory to contain the resulting object program file
- *
- * @param destDir The name of the directory to contain the resulting object
- * program file
- */
- void setDestination(String destDir);
-
- /**
- * Set the classpath to be used for this compilation
- *
- * @param classpath The classpath to be used for this compilation
- */
- void setClasspath(String classpath);
-
- /**
- * Set the encoding of the input source file or null to use the
- * platform's default encoding
- *
- * @param encoding The encoding of the input source file or null
- * to use the platform's default encoding
- */
- void setEncoding(String encoding);
-
- /**
- * Compile a source file yielding a loadable program file.
- *
- * @param filename The object program base file name
- * @param baseDirectory The directory containing the object program file
- * @param encoding The encoding expected in the source file or
- * null if it is the platform's default encoding
- * @exception LanguageException If an error occurs during compilation
- */
- boolean compile() throws IOException;
-
- /**
- * Return the list of errors generated by this compilation
- *
- * @return The list of errors generated by this compilation
- * @exception IOException If an error occurs during message collection
- */
- List getErrors() throws IOException;
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerError.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerError.java
deleted file mode 100644
index bb006fd85f..0000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerError.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.axis.components.compiler;
-
-/**
- * This class encapsulates an error message produced by a programming language
- * processor (whether interpreted or compiled)
- * @author Davanum Srinivas
- * @author Stefano Mazzocchi
- * @since 2.0
- */
-
-public class CompilerError {
- /**
- * Is this a severe error or a warning?
- */
- private boolean error;
- /**
- * The start line number of the offending program text
- */
- private int startline;
- /**
- * The start column number of the offending program text
- */
- private int startcolumn;
- /**
- * The end line number of the offending program text
- */
- private int endline;
- /**
- * The end column number of the offending program text
- */
- private int endcolumn;
- /**
- * The name of the file containing the offending program text
- */
- private String file;
- /**
- * The actual error text produced by the language processor
- */
- private String message;
-
- /**
- * The error message constructor.
- *
- * @param file The name of the file containing the offending program text
- * @param error The actual error text produced by the language processor
- * @param startline The start line number of the offending program text
- * @param startcolumn The start column number of the offending program text
- * @param endline The end line number of the offending program text
- * @param endcolumn The end column number of the offending program text
- * @param message The actual error text produced by the language processor
- */
- public CompilerError(
- String file,
- boolean error,
- int startline,
- int startcolumn,
- int endline,
- int endcolumn,
- String message
- )
- {
- this.file = file;
- this.error = error;
- this.startline = startline;
- this.startcolumn = startcolumn;
- this.endline = endline;
- this.endcolumn = endcolumn;
- this.message = message;
- }
-
- /**
- * The error message constructor.
- *
- * @param message The actual error text produced by the language processor
- */
- public CompilerError(String message) {
- this.message = message;
- }
-
- /**
- * Return the filename associated with this compiler error.
- *
- * @return The filename associated with this compiler error
- */
- public String getFile() {
- return file;
- }
-
- /**
- * Assert whether this is a severe error or a warning
- *
- * @return Whether the error is severe
- */
- public boolean isError() {
- return error;
- }
-
- /**
- * Return the starting line number of the program text originating this error
- *
- * @return The starting line number of the program text originating this error
- */
- public int getStartLine() {
- return startline;
- }
-
- /**
- * Return the starting column number of the program text originating this
- * error
- *
- * @return The starting column number of the program text originating this
- * error
- */
- public int getStartColumn() {
- return startcolumn;
- }
-
- /**
- * Return the ending line number of the program text originating this error
- *
- * @return The ending line number of the program text originating this error
- */
- public int getEndLine() {
- return endline;
- }
-
- /**
- * Return the ending column number of the program text originating this
- * error
- *
- * @return The ending column number of the program text originating this
- * error
- */
- public int getEndColumn() {
- return endcolumn;
- }
-
- /**
- * Return the message produced by the language processor
- *
- * @return The message produced by the language processor
- */
- public String getMessage() {
- return message;
- }
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerFactory.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerFactory.java
deleted file mode 100644
index e2db8d8fb2..0000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.axis.components.compiler;
-
-import org.apache.axis.AxisProperties;
-import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.utils.Messages;
-import org.apache.commons.logging.Log;
-
-
-/**
- * This class implements a factory to instantiate a Compiler.
- * @author Davanum Srinivas
- * @author Stefano Mazzocchi
- * @since 2.0
- */
-public class CompilerFactory {
- protected static Log log =
- LogFactory.getLog(CompilerFactory.class.getName());
-
- static {
- AxisProperties.setClassOverrideProperty(Compiler.class, "axis.Compiler");
-
- AxisProperties.setClassDefault(Compiler.class,
- "org.apache.axis.components.compiler.Javac");
- }
-
- public static Compiler getCompiler() {
- Compiler compiler = (Compiler)AxisProperties.newInstance(Compiler.class);
-
- /**
- * This shouldn't be needed, but seems to be a common feel-good:
- */
- if (compiler == null) {
- log.debug(Messages.getMessage("defaultCompiler"));
- compiler = new Javac();
- }
-
- log.debug("axis.Compiler:" + compiler.getClass().getName());
-
- return compiler;
- }
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Javac.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Javac.java
deleted file mode 100644
index db20ee0115..0000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Javac.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.axis.components.compiler;
-
-import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.utils.ClassUtils;
-import org.apache.axis.utils.Messages;
-import org.apache.commons.logging.Log;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.net.URLClassLoader;
-
-/**
- * This class wraps the Sun's Javac Compiler.
- *
- * @author Davanum Srinivas
- * @author Stefano Mazzocchi
- * @since 2.0
- */
-
-public class Javac extends AbstractCompiler
-{
- protected static Log log =
- LogFactory.getLog(Javac.class.getName());
-
- public static final String CLASSIC_CLASS = "sun.tools.javac.Main";
- public static final String MODERN_CLASS = "com.sun.tools.javac.main.Main";
-
- private boolean modern = false;
-
- public Javac() {
- ClassLoader cl = getClassLoader();
- try {
- ClassUtils.forName(MODERN_CLASS, true, cl);
- modern = true;
- } catch (ClassNotFoundException e) {
- log.debug(Messages.getMessage("noModernCompiler"));
- try {
- ClassUtils.forName(CLASSIC_CLASS, true, cl);
- modern = false;
- } catch (Exception ex) {
- log.error(Messages.getMessage("noCompiler00"), ex);
- throw new RuntimeException(Messages.getMessage("noCompiler00"));
- }
- }
- log.debug(Messages.getMessage("compilerClass",
- (modern ? MODERN_CLASS : CLASSIC_CLASS)));
- }
-
- private ClassLoader getClassLoader() {
- // Use reflection to be able to build on all JDKs
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
-
- URL toolsURL = null;
- String tools = System.getProperty("java.home");
- if (tools != null) {
- File f = new File(tools + "/../lib/tools.jar");
- if (f.exists()) {
- try {
- toolsURL = f.toURL();
- cl = new URLClassLoader(new URL[]{toolsURL}, cl);
- } catch (MalformedURLException e) {
- }
- }
- }
-
- return cl;
- }
-
- /**
- * Compile a source file yielding a loadable class file.
- *
- * @exception IOException If an error occurs during compilation
- */
- public boolean compile() throws IOException {
- ByteArrayOutputStream err = new ByteArrayOutputStream();
- boolean result = false;
-
- try {
- // Create an instance of the compiler, redirecting output to err
- Class c = ClassUtils.forName(modern ? MODERN_CLASS : CLASSIC_CLASS,
- true,
- getClassLoader());
-
- Constructor cons;
- Object compiler;
- if (modern) {
- PrintWriter pw = new PrintWriter(new OutputStreamWriter(err));
- cons =
- c.getConstructor(new Class[] { String.class,
- PrintWriter.class});
-
- compiler = cons.newInstance(new Object[] { "javac", pw });
- }
- else {
- cons =
- c.getConstructor(new Class[] { OutputStream.class,
- String.class });
- compiler = cons.newInstance(new Object[] { err, "javac" });
-
- }
-
- // Call the compile() method
- Method compile = c.getMethod("compile",
- new Class [] { String[].class });
-
- if (modern) {
- int compilationResult =
- ((Integer)compile.invoke(compiler, new Object[]
- {
- toStringArray(fillArguments
- (new ArrayList()))})).intValue();
-
- result = (compilationResult == 0);
- log.debug("Compilation Returned: "
- + Integer.toString(compilationResult));
- }
- else {
- Boolean ok =
- (Boolean)compile.invoke(compiler, new Object[]
- {toStringArray(fillArguments(new ArrayList()))});
-
- result = ok.booleanValue();
- }
- } catch (Exception cnfe){
- log.error(Messages.getMessage("noCompiler00"), cnfe);
- throw new RuntimeException(Messages.getMessage("noCompiler00"));
- }
-
- this.errors = new ByteArrayInputStream(err.toByteArray());
- return result;
- }
-
- /**
- * Parse the compiler error stream to produce a list of
- * CompilerErrors
- *
- * @param input The error stream
- * @return The list of compiler error messages
- * @exception IOException If an error occurs during message collection
- */
- protected List parseStream(BufferedReader input) throws IOException {
- if (modern) {
- return parseModernStream(input);
- } else {
- return parseClassicStream(input);
- }
- }
-
- /**
- * Parse the compiler error stream to produce a list of
- * CompilerErrors
- *
- * @param input The error stream
- * @return The list of compiler error messages
- * @exception IOException If an error occurs during message collection
- */
- protected List parseModernStream(BufferedReader input) throws IOException {
- List errors = new ArrayList();
- String line = null;
- StringBuffer buffer = null;
-
- while (true) {
- // cleanup the buffer
- buffer = new StringBuffer(); // this is quicker than clearing it
-
- // most errors terminate with the '^' char
- do {
- if ((line = input.readLine()) == null)
- {
- if (buffer.length() > 0) {
- // There's an error which doesn't end with a '^'
- errors.add(new CompilerError("\n" + buffer.toString()));
- }
- return errors;
- }
- log.debug(line);
- buffer.append(line);
- buffer.append('\n');
- } while (!line.endsWith("^"));
-
- // add the error bean
- errors.add(parseModernError(buffer.toString()));
- }
- }
-
- /**
- * Parse an individual compiler error message with modern style.
- *
- * @param error The error text
- * @return A messaged CompilerError
- */
- private CompilerError parseModernError(String error) {
- StringTokenizer tokens = new StringTokenizer(error, ":");
- try {
- String file = tokens.nextToken();
- if (file.length() == 1) file = new StringBuffer(file).append(":").append(tokens.nextToken()).toString();
- int line = Integer.parseInt(tokens.nextToken());
-
- String message = tokens.nextToken("\n").substring(1);
- String context = tokens.nextToken("\n");
- String pointer = tokens.nextToken("\n");
- int startcolumn = pointer.indexOf("^");
- int endcolumn = context.indexOf(" ", startcolumn);
- if (endcolumn == -1) endcolumn = context.length();
- return new CompilerError(file, false, line, startcolumn, line, endcolumn, message);
- } catch(NoSuchElementException nse) {
- return new CompilerError(Messages.getMessage("noMoreTokens", error));
- } catch(Exception nse) {
- return new CompilerError(Messages.getMessage("cantParse", error));
- }
- }
-
- /**
- * Parse the compiler error stream to produce a list of
- * CompilerErrors
- *
- * @param input The error stream
- * @return The list of compiler error messages
- * @exception IOException If an error occurs during message collection
- */
- protected List parseClassicStream(BufferedReader input) throws IOException {
- List errors = null;
- String line = null;
- StringBuffer buffer = null;
-
- while (true) {
- // cleanup the buffer
- buffer = new StringBuffer(); // this is faster than clearing it
-
- // each error has 3 lines
- for (int i = 0; i < 3 ; i++) {
- if ((line = input.readLine()) == null) return errors;
- log.debug(line);
- buffer.append(line);
- buffer.append('\n');
- }
-
- // if error is found create the vector
- if (errors == null) errors = new ArrayList();
-
- // add the error bean
- errors.add(parseClassicError(buffer.toString()));
- }
- }
-
- /**
- * Parse an individual compiler error message with classic style.
- *
- * @param error The error text
- * @return A messaged CompilerError
- */
- private CompilerError parseClassicError(String error) {
- StringTokenizer tokens = new StringTokenizer(error, ":");
- try {
- String file = tokens.nextToken();
- if (file.length() == 1) {
- file = new StringBuffer(file).append(":").
- append(tokens.nextToken()).toString();
- }
- int line = Integer.parseInt(tokens.nextToken());
-
- String last = tokens.nextToken();
- // In case the message contains ':', it should be reassembled
- while (tokens.hasMoreElements()) {
- last += tokens.nextToken();
- }
- tokens = new StringTokenizer(last.trim(), "\n");
- String message = tokens.nextToken();
- String context = tokens.nextToken();
- String pointer = tokens.nextToken();
- int startcolumn = pointer.indexOf("^");
- int endcolumn = context.indexOf(" ", startcolumn);
- if (endcolumn == -1) endcolumn = context.length();
-
- return new CompilerError(srcDir + File.separator + file, true,
- line, startcolumn, line, endcolumn, message);
- } catch(NoSuchElementException nse) {
- return new CompilerError(Messages.getMessage("noMoreTokens",
- error));
- } catch(Exception nse) {
- return new CompilerError(Messages.getMessage("cantParse", error));
- }
- }
-
- public String toString() {
- return Messages.getMessage("sunJavac");
- }
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Jikes.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Jikes.java
deleted file mode 100644
index d4937019be..0000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Jikes.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.axis.components.compiler;
-
-import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.utils.Messages;
-import org.apache.commons.logging.Log;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-/**
- * This class wraps IBM's Jikes Java compiler
- * NOTE: inspired by the Apache Jasper implementation.
- * @author Davanum Srinivas
- * @author Stefano Mazzocchi
- * @since 2.0
- */
-
-public class Jikes extends AbstractCompiler
-{
- protected static Log log =
- LogFactory.getLog(Jikes.class.getName());
-
- static final int OUTPUT_BUFFER_SIZE = 1024;
- static final int BUFFER_SIZE = 512;
-
- private class StreamPumper extends Thread {
-
- private BufferedInputStream stream;
- private boolean endOfStream = false;
- private boolean stopSignal = false;
- private int SLEEP_TIME = 5;
- private OutputStream out;
-
- public StreamPumper(BufferedInputStream is, OutputStream out) {
- this.stream = is;
- this.out = out;
- }
-
- public void pumpStream() throws IOException {
- byte[] buf = new byte[BUFFER_SIZE];
- if (!endOfStream) {
- int bytesRead = stream.read(buf, 0, BUFFER_SIZE);
-
- if (bytesRead > 0) {
- out.write(buf, 0, bytesRead);
- } else if (bytesRead == -1) {
- endOfStream = true;
- }
- }
- }
-
- public void run() {
- try {
- while (!endOfStream) {
- pumpStream();
- sleep(SLEEP_TIME);
- }
- } catch (Exception e) {
- // getLogger().warn("Jikes.run()", e);
- }
- }
- }
-
- /**
- * Copy arguments to a string array
- *
- * @param arguments The compiler arguments
- * @return A string array containing compilation arguments
- */
- protected String[] toStringArray(List arguments) {
- int i;
-
- for (i = 0; i < arguments.size(); i++) {
- String arg = (String) arguments.get(i);
- if (arg.equals("-sourcepath")) {
- // Remove -sourcepath option. Jikes does not understand that.
- arguments.remove(i);
- arguments.remove(i);
- break;
- }
- }
-
- String[] args = new String[arguments.size() + fileList.size()];
- for (i = 0; i < arguments.size(); i++) {
- args[i] = (String) arguments.get(i);
- }
-
- for (int j=0; j < fileList.size(); i++,j++) {
- args[i] = (String)fileList.get(j);
- }
-
- return args;
- }
-
- /**
- * Execute the compiler
- */
- public boolean compile() throws IOException {
-
- List args = new ArrayList();
- // command line name
- args.add("jikes");
- // indicate Emacs output mode must be used
- args.add("+E");
- // avoid warnings
- // Option nowarn with one hyphen only
- args.add("-nowarn");
-
- int exitValue;
- ByteArrayOutputStream tmpErr = new ByteArrayOutputStream(OUTPUT_BUFFER_SIZE);
-
- try {
- Process p = Runtime.getRuntime().exec(toStringArray(fillArguments(args)));
-
- BufferedInputStream compilerErr = new BufferedInputStream(p.getErrorStream());
-
- StreamPumper errPumper = new StreamPumper(compilerErr, tmpErr);
-
- errPumper.start();
-
- p.waitFor();
- exitValue = p.exitValue();
-
- // Wait until the complete error stream has been read
- errPumper.join();
- compilerErr.close();
-
- p.destroy();
-
- tmpErr.close();
- this.errors = new ByteArrayInputStream(tmpErr.toByteArray());
-
- } catch (InterruptedException somethingHappened) {
- log.debug("Jikes.compile():SomethingHappened", somethingHappened);
- return false;
- }
-
- // Jikes returns 0 even when there are some types of errors.
- // Check if any error output as well
- // Return should be OK when both exitValue and
- // tmpErr.size() are 0 ?!
- return ((exitValue == 0) && (tmpErr.size() == 0));
- }
-
- /**
- * Parse the compiler error stream to produce a list of
- * CompilerErrors
- *
- * @param input The error stream
- * @return The list of compiler error messages
- * @exception IOException If an error occurs during message collection
- */
- protected List parseStream(BufferedReader input) throws IOException {
- List errors = null;
- String line = null;
- StringBuffer buffer = null;
-
- while (true) {
- // cleanup the buffer
- buffer = new StringBuffer(); // this is faster than clearing it
-
- // first line is not space-starting
- if (line == null) line = input.readLine();
- if (line == null) return errors;
- log.debug(line);
- buffer.append(line);
-
- // all other space-starting lines are one error
- while (true) {
- line = input.readLine();
- // EOF
- if (line == null)
- break;
- // Continuation of previous error starts with ' '
- if (line.length() > 0 && line.charAt(0) != ' ')
- break;
- log.debug(line);
- buffer.append('\n');
- buffer.append(line);
- }
-
- // if error is found create the vector
- if (errors == null) errors = new ArrayList();
-
- // add the error bean
- errors.add(parseError(buffer.toString()));
- }
- }
-
- /**
- * Parse an individual compiler error message
- *
- * @param error The error text
- * @return A mssaged CompilerError
- */
- private CompilerError parseError(String error) {
- StringTokenizer tokens = new StringTokenizer(error, ":");
- String file = tokens.nextToken();
- if (file.length() == 1) file = new StringBuffer(file).append(":").append(tokens.nextToken()).toString();
- StringBuffer message = new StringBuffer();
- String type = "";
- int startline = 0;
- int startcolumn = 0;
- int endline = 0;
- int endcolumn = 0;
-
- try {
- startline = Integer.parseInt(tokens.nextToken());
- startcolumn = Integer.parseInt(tokens.nextToken());
- endline = Integer.parseInt(tokens.nextToken());
- endcolumn = Integer.parseInt(tokens.nextToken());
- } catch (Exception e) {
- // FIXME: VG: This is not needed anymore?
- message.append(Messages.getMessage("compilerFail00"));
- type="error";
- log.error(Messages.getMessage("compilerFail00"), e);
- }
-
- if ("".equals(message)) {
- type = tokens.nextToken().trim().toLowerCase();
- message.append(tokens.nextToken("\n").substring(1).trim());
-
- while (tokens.hasMoreTokens())
- message.append("\n").append(tokens.nextToken());
- }
-
- return new CompilerError(file, type.equals("error"), startline, startcolumn, endline, endcolumn, message.toString());
- }
-
- public String toString() {
- return Messages.getMessage("ibmJikes");
- }
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/handlers/JWSHandler.java b/axis-rt-jws/src/main/java/org/apache/axis/handlers/JWSHandler.java
index cede9feca9..6626e05203 100644
--- a/axis-rt-jws/src/main/java/org/apache/axis/handlers/JWSHandler.java
+++ b/axis-rt-jws/src/main/java/org/apache/axis/handlers/JWSHandler.java
@@ -19,9 +19,6 @@
import org.apache.axis.AxisFault;
import org.apache.axis.Constants;
import org.apache.axis.MessageContext;
-import org.apache.axis.components.compiler.Compiler;
-import org.apache.axis.components.compiler.CompilerError;
-import org.apache.axis.components.compiler.CompilerFactory;
import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.constants.Scope;
import org.apache.axis.handlers.soap.SOAPService;
@@ -38,11 +35,21 @@
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.List;
import java.util.Map;
+import javax.tools.Diagnostic;
+import javax.tools.Diagnostic.Kind;
+import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+
/** A JWSHandler sets the target service and JWS filename
* in the context depending on the JWS configuration and the target URL.
*
@@ -192,13 +199,17 @@ protected void setupService(MessageContext msgContext) throws Exception {
log.debug("javac " + jFile );
// Process proc = rt.exec( "javac " + jFile );
// proc.waitFor();
- Compiler compiler = CompilerFactory.getCompiler();
+ JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+ StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null);
+
+ fileManager.setLocation(StandardLocation.CLASS_PATH, ClasspathUtils.getDefaultClasspath(msgContext));
+ fileManager.setLocation(StandardLocation.CLASS_OUTPUT, Collections.singletonList(new File(outdir)));
- compiler.setClasspath(ClasspathUtils.getDefaultClasspath(msgContext));
- compiler.setDestination(outdir);
- compiler.addFile(jFile);
+ DiagnosticCollector diagnosticCollector = new DiagnosticCollector();
+ CompilationTask task = compiler.getTask(null, fileManager, diagnosticCollector, null, null,
+ fileManager.getJavaFileObjectsFromFiles(Collections.singletonList(new File(jFile))));
- boolean result = compiler.compile();
+ boolean result = task.call();
/* Delete the temporary *.java file and check return code */
/**********************************************************/
@@ -216,19 +227,17 @@ protected void setupService(MessageContext msgContext) throws Exception {
Element root = doc.createElementNS("", "Errors");
StringBuffer message = new StringBuffer("Error compiling ");
message.append(jFile);
- message.append(":\n");
-
- List errors = compiler.getErrors();
- int count = errors.size();
- for (int i = 0; i < count; i++) {
- CompilerError error = (CompilerError) errors.get(i);
- if (i > 0) message.append("\n");
- message.append("Line ");
- message.append(error.getStartLine());
- message.append(", column ");
- message.append(error.getStartColumn());
- message.append(": ");
- message.append(error.getMessage());
+ message.append(":");
+
+ for (Diagnostic diagnostic : diagnosticCollector.getDiagnostics()) {
+ if (diagnostic.getKind() == Kind.ERROR) {
+ message.append("\nLine ");
+ message.append(diagnostic.getLineNumber());
+ message.append(", column ");
+ message.append(diagnostic.getStartPosition());
+ message.append(": ");
+ message.append(diagnostic.getMessage(null));
+ }
}
root.appendChild( doc.createTextNode( message.toString() ) );
throw new AxisFault( "Server.compileError",
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/utils/ClasspathUtils.java b/axis-rt-jws/src/main/java/org/apache/axis/utils/ClasspathUtils.java
index 1858b9a6d7..3502628161 100644
--- a/axis-rt-jws/src/main/java/org/apache/axis/utils/ClasspathUtils.java
+++ b/axis-rt-jws/src/main/java/org/apache/axis/utils/ClasspathUtils.java
@@ -27,6 +27,9 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import java.util.StringTokenizer;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
@@ -50,23 +53,19 @@ public class ClasspathUtils {
* @param dirPaths The string containing the directory path or list of
* directory paths.
* @return The file paths of the jar files in the directories. This is an
- * empty string if no files were found, and is terminated by an
- * additional pathSeparator in all other cases.
+ * empty list if no files were found.
*/
- public static String expandDirs(String dirPaths) {
+ public static List expandDirs(String dirPaths) {
StringTokenizer st = new StringTokenizer(dirPaths, File.pathSeparator);
- StringBuffer buffer = new StringBuffer();
+ List files = new ArrayList();
while (st.hasMoreTokens()) {
String d = st.nextToken();
File dir = new File(d);
if (dir.isDirectory()) {
- File[] files = dir.listFiles(new JavaArchiveFilter());
- for (int i = 0; i < files.length; i++) {
- buffer.append(files[i]).append(File.pathSeparator);
- }
+ files.addAll(Arrays.asList(dir.listFiles(new JavaArchiveFilter())));
}
}
- return buffer.toString();
+ return files;
}
/**
@@ -90,8 +89,8 @@ public static boolean isJar(InputStream is) {
* @param msgContext
* @return default classpath
*/
- public static String getDefaultClasspath(MessageContext msgContext) {
- StringBuffer classpath = new StringBuffer();
+ public static List getDefaultClasspath(MessageContext msgContext) {
+ List classpath = new ArrayList();
ClassLoader cl = Thread.currentThread().getContextClassLoader();
fillClassPath(cl, classpath);
@@ -100,8 +99,7 @@ public static String getDefaultClasspath(MessageContext msgContext) {
String webBase = (String) msgContext.getProperty(HTTPConstants.MC_HTTP_SERVLETLOCATION);
if (webBase != null) {
- classpath.append(webBase + File.separatorChar + "classes" +
- File.pathSeparatorChar);
+ classpath.add(new File(webBase, "classes"));
try {
String libBase = webBase + File.separatorChar + "lib";
File libDir = new File(libBase);
@@ -109,10 +107,7 @@ public static String getDefaultClasspath(MessageContext msgContext) {
for (int i = 0; i < jarFiles.length; i++) {
String jarFile = jarFiles[i];
if (jarFile.endsWith(".jar")) {
- classpath.append(libBase +
- File.separatorChar +
- jarFile +
- File.pathSeparatorChar);
+ classpath.add(new File(libBase, jarFile));
}
}
} catch (Exception e) {
@@ -138,7 +133,8 @@ public static String getDefaultClasspath(MessageContext msgContext) {
// boot classpath isn't found in above search
getClassPathFromProperty(classpath, "sun.boot.class.path");
- return classpath.toString();
+
+ return classpath;
}
/**
@@ -146,18 +142,13 @@ public static String getDefaultClasspath(MessageContext msgContext) {
* @param classpath
* @param property
*/
- private static void getClassPathFromDirectoryProperty(StringBuffer classpath, String property) {
+ private static void getClassPathFromDirectoryProperty(List classpath, String property) {
String dirs = AxisProperties.getProperty(property);
- String path = null;
try {
- path = ClasspathUtils.expandDirs(dirs);
+ classpath.addAll(ClasspathUtils.expandDirs(dirs));
} catch (Exception e) {
// Oh well. No big deal.
}
- if (path != null) {
- classpath.append(path);
- classpath.append(File.pathSeparatorChar);
- }
}
/**
@@ -165,11 +156,12 @@ private static void getClassPathFromDirectoryProperty(StringBuffer classpath, St
* @param classpath
* @param property
*/
- private static void getClassPathFromProperty(StringBuffer classpath, String property) {
+ private static void getClassPathFromProperty(List classpath, String property) {
String path = AxisProperties.getProperty(property);
if (path != null) {
- classpath.append(path);
- classpath.append(File.pathSeparatorChar);
+ for (String item : path.split(File.pathSeparator)) {
+ classpath.add(new File(item));
+ }
}
}
@@ -178,7 +170,7 @@ private static void getClassPathFromProperty(StringBuffer classpath, String prop
* @param cl
* @param classpath
*/
- private static void fillClassPath(ClassLoader cl, StringBuffer classpath) {
+ private static void fillClassPath(ClassLoader cl, List classpath) {
while (cl != null) {
if (cl instanceof URLClassLoader) {
URL[] urls = ((URLClassLoader) cl).getURLs();
@@ -187,8 +179,7 @@ private static void fillClassPath(ClassLoader cl, StringBuffer classpath) {
//If it is a drive letter, adjust accordingly.
if (path.length() >= 3 && path.charAt(0) == '/' && path.charAt(2) == ':')
path = path.substring(1);
- classpath.append(URLDecoder.decode(path));
- classpath.append(File.pathSeparatorChar);
+ classpath.add(new File(URLDecoder.decode(path)));
// if its a jar extract Class-Path entries from manifest
File file = new File(urls[i].getFile());
@@ -208,8 +199,7 @@ private static void fillClassPath(ClassLoader cl, StringBuffer classpath) {
StringTokenizer st = new StringTokenizer(s, " ");
while (st.hasMoreTokens()) {
String t = st.nextToken();
- classpath.append(base + File.separatorChar + t);
- classpath.append(File.pathSeparatorChar);
+ classpath.add(new File(base, t));
}
}
}
diff --git a/axis-standalone-server/src/main/resources/org/apache/axis/server/standalone/jws-handler.wsdd b/axis-rt-jws/src/main/resources/META-INF/axis/default-server-config.wsdd
similarity index 100%
rename from axis-standalone-server/src/main/resources/org/apache/axis/server/standalone/jws-handler.wsdd
rename to axis-rt-jws/src/main/resources/META-INF/axis/default-server-config.wsdd
diff --git a/axis-rt-management/pom.xml b/axis-rt-management/pom.xml
index f8a7e4c681..319b87650b 100644
--- a/axis-rt-management/pom.xml
+++ b/axis-rt-management/pom.xml
@@ -27,6 +27,13 @@
axis-rt-management
JMX Support
+ ${baseUrl}/jmx
+
+
+ axis
+ ${baseSiteUrl}/jmx
+
+
${project.groupId}
diff --git a/axis-rt-management/src/main/java/org/apache/axis/management/Registrar.java b/axis-rt-management/src/main/java/org/apache/axis/management/Registrar.java
index 1fa23bea9c..395b017081 100644
--- a/axis-rt-management/src/main/java/org/apache/axis/management/Registrar.java
+++ b/axis-rt-management/src/main/java/org/apache/axis/management/Registrar.java
@@ -22,8 +22,8 @@
/**
* class to act as a dynamic loading registrar to commons-modeler, so
* as to autoregister stuff
- *
- * @link http://www.webweavertech.com/costin/archives/000168.html#000168
+ *
+ * http://www.webweavertech.com/costin/archives/000168.html#000168
*/
public class Registrar {
/**
diff --git a/axis-rt-management/src/main/java/org/apache/axis/management/servlet/AxisServerMBeanExporter.java b/axis-rt-management/src/main/java/org/apache/axis/management/servlet/AxisServerMBeanExporter.java
index 15373e6ff2..fc5e169a8e 100644
--- a/axis-rt-management/src/main/java/org/apache/axis/management/servlet/AxisServerMBeanExporter.java
+++ b/axis-rt-management/src/main/java/org/apache/axis/management/servlet/AxisServerMBeanExporter.java
@@ -31,9 +31,9 @@
* web.xml:
*
*
- * <listener>
- * <listener-class>org.apache.axis.management.servlet.AxisServerMBeanExporter</listener-class>
- * </listener>
+ * <listener>
+ * <listener-class>org.apache.axis.management.servlet.AxisServerMBeanExporter</listener-class>
+ * </listener>
*
*
* @author Andreas Veithen
diff --git a/axis-rt-management/src/site/site.xml b/axis-rt-management/src/site/site.xml
new file mode 100644
index 0000000000..18866594ab
--- /dev/null
+++ b/axis-rt-management/src/site/site.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/axis-rt-provider-bsf/pom.xml b/axis-rt-provider-bsf/pom.xml
index 9a403497c6..590baebe6f 100644
--- a/axis-rt-provider-bsf/pom.xml
+++ b/axis-rt-provider-bsf/pom.xml
@@ -27,6 +27,13 @@
axis-rt-provider-bsf
BSF Provider
+ ${baseUrl}/bsf
+
+
+ axis
+ ${baseSiteUrl}/bsf
+
+
${project.groupId}
diff --git a/axis-rt-provider-bsf/src/site/site.xml b/axis-rt-provider-bsf/src/site/site.xml
new file mode 100644
index 0000000000..18866594ab
--- /dev/null
+++ b/axis-rt-provider-bsf/src/site/site.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/axis-rt-soapmonitor/pom.xml b/axis-rt-soapmonitor/pom.xml
index 8ece718ff4..cd4c1c4a23 100644
--- a/axis-rt-soapmonitor/pom.xml
+++ b/axis-rt-soapmonitor/pom.xml
@@ -26,7 +26,14 @@
../pom.xml
axis-rt-soapmonitor
- SOAP Monitor Handler and Service
+ SOAP Monitor Handler/Service
+ ${baseUrl}/soapmonitor/runtime
+
+
+ axis
+ ${baseSiteUrl}/soapmonitor/runtime
+
+
${project.groupId}
diff --git a/axis-rt-soapmonitor/src/main/java/org/apache/axis/monitor/SOAPMonitorService.java b/axis-rt-soapmonitor/src/main/java/org/apache/axis/monitor/SOAPMonitorService.java
index ecd7cd2994..29dd6cc67f 100644
--- a/axis-rt-soapmonitor/src/main/java/org/apache/axis/monitor/SOAPMonitorService.java
+++ b/axis-rt-soapmonitor/src/main/java/org/apache/axis/monitor/SOAPMonitorService.java
@@ -54,10 +54,6 @@
* display by the applet.
*
* @author Brian Price (pricebe@us.ibm.com)
- * xdoclet tags are not active yet; keep web.xml in sync
- * @web.servlet name="SOAPMonitorService" display-name="SOAPMonitorService" load-on-startup="100"
- * @web.servlet-mapping url-pattern="/SOAPMonitor"
- * @web.servlet-init-param name="SOAPMonitorPort" value="5001"
*/
public class SOAPMonitorService extends HttpServlet {
diff --git a/axis-rt-soapmonitor/src/site/site.xml b/axis-rt-soapmonitor/src/site/site.xml
new file mode 100644
index 0000000000..18866594ab
--- /dev/null
+++ b/axis-rt-soapmonitor/src/site/site.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/axis-rt-transport-http-hc3/pom.xml b/axis-rt-transport-http-hc3/pom.xml
index 8e3b6b5f78..293b5ceb85 100644
--- a/axis-rt-transport-http-hc3/pom.xml
+++ b/axis-rt-transport-http-hc3/pom.xml
@@ -55,20 +55,4 @@
-
-
-
- maven-project-info-reports-plugin
- 2.4
-
-
-
- index
- dependencies
-
-
-
-
-
-
diff --git a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/CommonsHTTPClientProperties.java b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/CommonsHTTPClientProperties.java
index f8aa5ab2e3..ff3f30094a 100644
--- a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/CommonsHTTPClientProperties.java
+++ b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/CommonsHTTPClientProperties.java
@@ -30,7 +30,7 @@ public interface CommonsHTTPClientProperties {
* your system imposes on the number of open file descriptors a
* single process may have.
*
- * @return an integer > 1
+ * @return an integer > 1
*/
public int getMaximumTotalConnections();
@@ -39,7 +39,7 @@ public interface CommonsHTTPClientProperties {
* for a given host. This setting is also constrained by
* the one returned from getMaximumTotalConnections.
*
- * @return an integer > 1
+ * @return an integer > 1
*/
public int getMaximumConnectionsPerHost();
@@ -48,7 +48,7 @@ public interface CommonsHTTPClientProperties {
* for an available connection from the pool. An exception is raised
* if the timeout is triggered.
*
- * @return an integer > 1 OR 0 for infinite timeout
+ * @return an integer > 1 OR 0 for infinite timeout
*/
public int getConnectionPoolTimeout();
@@ -56,7 +56,7 @@ public interface CommonsHTTPClientProperties {
* Used to set the default amount of time, in milliseconds, spent waiting
* for a connection. This can be overridden by the MessageContext
*
- * @return an integer >= 0
+ * @return an integer >= 0
*/
public int getDefaultConnectionTimeout();
@@ -64,7 +64,7 @@ public interface CommonsHTTPClientProperties {
* Used to set the default amount of time, in milliseconds, spent waiting
* for a reponse. This can be overridden by the MessageContext
*
- * @return an integer >= 0
+ * @return an integer >= 0
*/
public int getDefaultSoTimeout();
diff --git a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/DefaultCommonsHTTPClientProperties.java b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/DefaultCommonsHTTPClientProperties.java
index 76437fa2be..f68dc07455 100644
--- a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/DefaultCommonsHTTPClientProperties.java
+++ b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/DefaultCommonsHTTPClientProperties.java
@@ -95,7 +95,7 @@ public int getMaximumConnectionsPerHost() {
* Return the integer value associated with the property
* axis.http.client.connection.pool.timeout or a default of 0.
*
- * @return an integer >= 0
+ * @return an integer >= 0
*/
public int getConnectionPoolTimeout() {
int i = getIntegerProperty(CONNECTION_POOL_TIMEOUT_KEY, "0");
@@ -109,7 +109,7 @@ public int getConnectionPoolTimeout() {
* Return the integer value associated with the property
* axis.http.client.connection.default.connection.timeout or a default of 0.
*
- * @return an integer >= 0
+ * @return an integer >= 0
*/
public int getDefaultConnectionTimeout() {
int i = getIntegerProperty(CONNECTION_DEFAULT_CONNECTION_TIMEOUT_KEY, "0");
@@ -123,7 +123,7 @@ public int getDefaultConnectionTimeout() {
* Return the integer value associated with the property
* axis.http.client.connection.default.so.timeout or a default of 0.
*
- * @return an integer >= 0
+ * @return an integer >= 0
*/
public int getDefaultSoTimeout() {
int i = getIntegerProperty(CONNECTION_DEFAULT_SO_TIMEOUT_KEY, "0");
diff --git a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/transport/http/CommonsHTTPSender.java b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/transport/http/CommonsHTTPSender.java
index 0694e14248..63127d6ec9 100644
--- a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/transport/http/CommonsHTTPSender.java
+++ b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/transport/http/CommonsHTTPSender.java
@@ -312,7 +312,6 @@ public void invoke(MessageContext msgContext) throws AxisFault {
* a string or an array of strings (if there are more than one Set-Cookie)
*
* @param cookieName
- * @param setCookieName
* @param cookie
* @param msgContext
*/
diff --git a/axis-rt-transport-http-hc3/src/site/site.xml b/axis-rt-transport-http-hc3/src/site/site.xml
new file mode 100644
index 0000000000..18866594ab
--- /dev/null
+++ b/axis-rt-transport-http-hc3/src/site/site.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/axis-rt-transport-http-javanet/pom.xml b/axis-rt-transport-http-javanet/pom.xml
index d23c1c8e0d..c22538bbdd 100644
--- a/axis-rt-transport-http-javanet/pom.xml
+++ b/axis-rt-transport-http-javanet/pom.xml
@@ -26,7 +26,7 @@
../pom.xml
axis-rt-transport-http-javanet
- Axis :: java.net HTTP Transport
+ java.net HTTP Transport
An alternative HTTP transport that uses the java.net.HttpURLConnection API. This transport only works with Java 1.5.
@@ -51,12 +51,6 @@
junit
test
-
- ${project.groupId}
- axis-standalone-server
- ${project.version}
- test
-
${project.groupId}
interop-mock
@@ -75,7 +69,7 @@
${project.groupId}
- maven-wsdl2java-plugin
+ wsdl2java-maven-plugin
${project.version}
@@ -129,7 +123,7 @@
${project.groupId}
- maven-axis-server-plugin
+ axis-server-maven-plugin
${project.version}
@@ -158,17 +152,23 @@
- maven-dependency-plugin
+ com.github.veithen.alta
+ alta-maven-plugin
pre-integration-test
- copy-dependencies
+ generate-properties
- ${project.build.directory}
- war
- true
+ %artifactId%.location
+ %file%
+
+ test
+
+ *:*:war:*
+
+
@@ -177,7 +177,7 @@
org.mortbay.jetty
jetty-maven-plugin
- ${project.build.directory}/interop-mock.war
+ ${interop-mock.location}
foo
${jetty.stopPort}
@@ -229,20 +229,4 @@
-
-
-
- maven-project-info-reports-plugin
- 2.4
-
-
-
- index
- dependencies
-
-
-
-
-
-
diff --git a/axis-rt-transport-http-javanet/src/site/site.xml b/axis-rt-transport-http-javanet/src/site/site.xml
index 0d54edecf7..18866594ab 100644
--- a/axis-rt-transport-http-javanet/src/site/site.xml
+++ b/axis-rt-transport-http-javanet/src/site/site.xml
@@ -17,11 +17,8 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+
-
+
diff --git a/axis-rt-transport-jms/pom.xml b/axis-rt-transport-jms/pom.xml
index 0242087564..1a4ed5bce9 100644
--- a/axis-rt-transport-jms/pom.xml
+++ b/axis-rt-transport-jms/pom.xml
@@ -26,7 +26,7 @@
../pom.xml
axis-rt-transport-jms
- Axis :: JMS transport
+ JMS Transport
Contains the Axis JMS transport.
@@ -49,33 +49,4 @@
1.1.1
-
-
-
- maven-compiler-plugin
-
-
-
- org/apache/axis/components/jms/SonicMQVendorAdapter.java
-
-
-
-
-
-
-
-
- maven-project-info-reports-plugin
- 2.4
-
-
-
- index
- dependencies
-
-
-
-
-
-
diff --git a/axis-rt-transport-jms/src/main/java/org/apache/axis/components/jms/SonicMQVendorAdapter.java b/axis-rt-transport-jms/src/main/java/org/apache/axis/components/jms/SonicMQVendorAdapter.java
deleted file mode 100644
index 4240bae88a..0000000000
--- a/axis-rt-transport-jms/src/main/java/org/apache/axis/components/jms/SonicMQVendorAdapter.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright 2001, 2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.axis.components.jms;
-
-import org.apache.axis.MessageContext;
-import org.apache.axis.client.Call;
-import org.apache.axis.transport.jms.JMSConnector;
-import org.apache.axis.transport.jms.JMSConnectorFactory;
-import org.apache.axis.transport.jms.JMSURLHelper;
-
-import progress.message.client.ENetworkFailure;
-import progress.message.client.EUserAlreadyConnected;
-import progress.message.jclient.ErrorCodes;
-
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnectionFactory;
-import java.util.HashMap;
-import java.util.Iterator;
-
-/**
- * Defines SonicMQ specific constants for connnection factory creation.
- * Overrides methods in BeanVendorAdapter to fill in MQ classnames
- *
- * @author Jaime Meritt (jmeritt@sonicsoftware.com)
- * @author Ray Chun (rchun@sonicsoftware.com)
- */
-public class SonicMQVendorAdapter extends BeanVendorAdapter
-{
- private final static String QCF_CLASS =
- "progress.message.jclient.QueueConnectionFactory";
-
- private final static String TCF_CLASS =
- "progress.message.jclient.TopicConnectionFactory";
-
- /**
- * SonicConnectionFactory parameter valid for either domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory.
- * This is a required property.
- * The value must be a java.lang.String
- * See the SonicMQ documentation for information on this property
- */
- public final static String BROKER_URL = "brokerURL";
-
- /**
- * SonicConnectionFactory parameter valid for either domains. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * This is a required property for secure brokers.
- * The value must be a java.lang.String
- * See the SonicMQ documentation for information on this property
- */
- public final static String DEFAULT_USERNAME = "defaultUser";
-
- /**
- * SonicConnectionFactory parameter valid for either domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * This is a required property for secure brokers.
- * The value must be a java.lang.String
- * See the SonicMQ documentation for information on this property
- */
- public final static String DEFAULT_PASSWORD = "defaultPassword";
- /**
- * SonicConnectionFactory parameter valid for either domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.Long
- * See the SonicMQ documentation for information on this property
- */
- public final static String PING_INTERVAL = "pingIntervalLong";
- /**
- * SonicConnectionFactory parameter valid for either domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.Integer
- * See the SonicMQ documentation for information on this property
- */
- public final static String RECONNECT_INTERVAL = "reconnectIntervalInteger";
- /**
- * SonicConnectionFactory parameter valid for either domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.Integer
- * See the SonicMQ documentation for information on this property
- */
- public final static String RECONNECT_TIMEOUT = "reconnectTimeoutInteger";
- /**
- * SonicConnectionFactory parameter valid for either domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.String
- * See the SonicMQ documentation for information on this property
- */
- public final static String CONNECT_ID = "connectID";
- /**
- * SonicConnectionFactory parameter valid for either domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.String
- * See the SonicMQ documentation for information on this property
- */
- public final static String CONNECTION_URLS = "connectionURLs";
- /**
- * SonicConnectionFactory parameter valid for either domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.Boolean
- * See the SonicMQ documentation for information on this property
- */
- public final static String LOAD_BALANCING = "loadBalancingBoolean";
- /**
- * SonicConnectionFactory parameter valid for either domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.Long
- * See the SonicMQ documentation for information on this property
- */
- public final static String MONITOR_INTERVAL = "monitorInterval";
- /**
- * SonicConnectionFactory parameter valid for either domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.Boolean
- * See the SonicMQ documentation for information on this property
- */
- public final static String PERSISTENT_DELIVERY = "persistentDeliveryBoolean";
- /**
- * SonicConnectionFactory parameter valid for either domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.Boolean
- * See the SonicMQ documentation for information on this property
- */
- public final static String SEQUENTIAL = "sequentialBoolean";
-
- /**
- * SonicConnectionFactory parameter valid for the PTP domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.Integer
- * See the SonicMQ documentation for information on this property
- */
- public final static String PREFETCH_COUNT = "prefetchCountInteger";
- /**
- * SonicConnectionFactory parameter valid for the PTP domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.Integer
- * See the SonicMQ documentation for information on this property
- */
- public final static String PREFETCH_THRESHOLD = "prefetchThresholdInteger";
- /**
- * SonicConnectionFactory parameter valid for the PubSub domain. This should
- * be used as a key in the environment map passed into calls to
- * createConnector in JMSConnectorFactory
- * The value must be a java.lang.Boolean
- * See the SonicMQ documentation for information on this property
- */
- public final static String SELECTOR_AT_BROKER = "selectorAtBroker";
-
- public QueueConnectionFactory getQueueConnectionFactory(HashMap cfConfig)
- throws Exception
- {
- cfConfig = (HashMap)cfConfig.clone();
- cfConfig.put(CONNECTION_FACTORY_CLASS, QCF_CLASS);
- return super.getQueueConnectionFactory(cfConfig);
- }
-
- public TopicConnectionFactory getTopicConnectionFactory(HashMap cfConfig)
- throws Exception
- {
- cfConfig = (HashMap)cfConfig.clone();
- cfConfig.put(CONNECTION_FACTORY_CLASS, TCF_CLASS);
- return super.getTopicConnectionFactory(cfConfig);
- }
-
- /**
- * Extract Sonic-specific properties from the JMS URL
- *
- * @param jmsurl The JMS URL representing the target endpoint address
- * @param cfProps The set of connection factory configuration properties
- */
- public void addVendorConnectionFactoryProperties(JMSURLHelper jmsurl, HashMap cfProps)
- {
- if (jmsurl.getPropertyValue(BROKER_URL) != null)
- cfProps.put(BROKER_URL, jmsurl.getPropertyValue(BROKER_URL));
-
- if (jmsurl.getPropertyValue(DEFAULT_USERNAME) != null)
- cfProps.put(DEFAULT_USERNAME, jmsurl.getPropertyValue(DEFAULT_USERNAME));
-
- if (jmsurl.getPropertyValue(DEFAULT_PASSWORD) != null)
- cfProps.put(DEFAULT_PASSWORD, jmsurl.getPropertyValue(DEFAULT_PASSWORD));
-
- if (jmsurl.getPropertyValue(PING_INTERVAL) != null)
- cfProps.put(PING_INTERVAL, jmsurl.getPropertyValue(PING_INTERVAL));
-
- if (jmsurl.getPropertyValue(RECONNECT_INTERVAL) != null)
- cfProps.put(RECONNECT_INTERVAL, jmsurl.getPropertyValue(RECONNECT_INTERVAL));
-
- if (jmsurl.getPropertyValue(RECONNECT_TIMEOUT) != null)
- cfProps.put(RECONNECT_TIMEOUT, jmsurl.getPropertyValue(RECONNECT_TIMEOUT));
-
- if (jmsurl.getPropertyValue(CONNECT_ID) != null)
- cfProps.put(CONNECT_ID, jmsurl.getPropertyValue(CONNECT_ID));
-
- if (jmsurl.getPropertyValue(CONNECTION_URLS) != null)
- cfProps.put(CONNECTION_URLS, jmsurl.getPropertyValue(CONNECTION_URLS));
-
- if (jmsurl.getPropertyValue(LOAD_BALANCING) != null)
- cfProps.put(LOAD_BALANCING, jmsurl.getPropertyValue(LOAD_BALANCING));
-
- if (jmsurl.getPropertyValue(MONITOR_INTERVAL) != null)
- cfProps.put(MONITOR_INTERVAL, jmsurl.getPropertyValue(MONITOR_INTERVAL));
-
- if (jmsurl.getPropertyValue(PERSISTENT_DELIVERY) != null)
- cfProps.put(PERSISTENT_DELIVERY, jmsurl.getPropertyValue(PERSISTENT_DELIVERY));
-
- if (jmsurl.getPropertyValue(SEQUENTIAL) != null)
- cfProps.put(SEQUENTIAL, jmsurl.getPropertyValue(SEQUENTIAL));
-
- if (jmsurl.getPropertyValue(PREFETCH_COUNT) != null)
- cfProps.put(PREFETCH_COUNT, jmsurl.getPropertyValue(PREFETCH_COUNT));
-
- if (jmsurl.getPropertyValue(PREFETCH_THRESHOLD) != null)
- cfProps.put(PREFETCH_THRESHOLD, jmsurl.getPropertyValue(PREFETCH_THRESHOLD));
-
- if (jmsurl.getPropertyValue(SELECTOR_AT_BROKER) != null)
- cfProps.put(SELECTOR_AT_BROKER, jmsurl.getPropertyValue(SELECTOR_AT_BROKER));
- }
-
- /**
- * Check that the attributes of the candidate connection factory match the
- * requested connection factory properties.
- *
- * @param cf the candidate connection factory
- * @param jmsurl the JMS URL associated with the candidate connection factory
- * @param cfProps the properties associated with the current request
- * @return true or false
- */
- public boolean isMatchingConnectionFactory(javax.jms.ConnectionFactory cf,
- JMSURLHelper jmsurl,
- HashMap cfProps)
- {
- String brokerURL = null;
- String connectionURLs = null;
- boolean loadBalancing = false;
- boolean sequential = false;
-
- if (cf instanceof progress.message.jclient.QueueConnectionFactory)
- {
- progress.message.jclient.QueueConnectionFactory qcf =
- (progress.message.jclient.QueueConnectionFactory)cf;
-
- // get existing queue connection factory properties
- brokerURL = qcf.getBrokerURL();
- connectionURLs = qcf.getConnectionURLs();
- loadBalancing = qcf.getLoadBalancing();
- sequential = qcf.getSequential();
- }
- else if (cf instanceof progress.message.jclient.TopicConnectionFactory)
- {
- progress.message.jclient.TopicConnectionFactory tcf =
- (progress.message.jclient.TopicConnectionFactory)cf;
-
- // get existing topic connection factory properties
- brokerURL = tcf.getBrokerURL();
- connectionURLs = tcf.getConnectionURLs();
- loadBalancing = tcf.getLoadBalancing();
- sequential = tcf.getSequential();
- }
-
- // compare broker url
- String propertyBrokerURL = (String)cfProps.get(BROKER_URL);
- if (!brokerURL.equals(propertyBrokerURL))
- return false;
-
- // compare connection url list
- String propertyConnectionURLs = (String)cfProps.get(CONNECTION_URLS);
- if ((connectionURLs != null) && (propertyConnectionURLs != null))
- {
- if (!connectionURLs.equalsIgnoreCase(propertyConnectionURLs))
- return false;
-
- // check sequential if connection urls have been set
- String tmpSequential = (String)cfProps.get(SEQUENTIAL);
- boolean propertySequential = true;
- if (tmpSequential != null)
- propertySequential = Boolean.getBoolean(tmpSequential);
- if (sequential != propertySequential)
- return false;
- }
- else if ((connectionURLs != null) || (propertyConnectionURLs != null))
- return false;
-
- // compare load balancing flag
- String tmpLoadBalancing = (String)cfProps.get(LOAD_BALANCING);
- boolean propertyLoadBalancing = false;
- if (tmpLoadBalancing != null)
- propertyLoadBalancing = Boolean.getBoolean(tmpLoadBalancing);
- if (loadBalancing != propertyLoadBalancing)
- return false;
-
- return true;
- }
-
- public boolean isRecoverable(Throwable thrown, int action)
- {
- //the super class cannot be trusted for on exception because it always
- //returns false
- if(action != ON_EXCEPTION_ACTION && !super.isRecoverable(thrown, action))
- return false;
-
- if(!(thrown instanceof JMSException))
- return true;
-
- JMSException jmse = (JMSException)thrown;
- switch(action)
- {
- case CONNECT_ACTION:
- if(isNetworkFailure(jmse))
- return false;
- break;
- case SUBSCRIBE_ACTION:
-
- if(isQueueMissing(jmse) || isAnotherSubscriberConnected(jmse))
- return false;
- break;
-
- case ON_EXCEPTION_ACTION:
- if(isConnectionDropped(jmse))
- return false;
- break;
-
- }
-
- return true;
- }
-
- public boolean isConnectionDropped(JMSException jmse)
- {
- return ErrorCodes.testException(jmse, ErrorCodes.ERR_CONNECTION_DROPPED);
- }
-
- private boolean isQueueMissing(JMSException jmse)
- {
- String message = jmse.getMessage();
- if(message != null && message.startsWith("Queue not found"))
- {
- return true;
- }
- return false;
- }
-
- private boolean isAnotherSubscriberConnected(JMSException jmse)
- {
- Exception linkedException = jmse.getLinkedException();
- if(linkedException != null &&
- linkedException instanceof EUserAlreadyConnected)
- {
- return true;
- }
- return false;
- }
-
- private boolean isNetworkFailure(JMSException jmse)
- {
- Exception linkedException = jmse.getLinkedException();
- if(linkedException != null &&
- linkedException instanceof ENetworkFailure)
- {
- return true;
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/Handler.java b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/Handler.java
index 8f4bdadaff..9a4f2880d8 100644
--- a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/Handler.java
+++ b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/Handler.java
@@ -33,7 +33,7 @@ public class Handler
}
/**
- * Reassembles the URL string, in the form "jms:/?prop1=value1&prop2=value2&..."
+ * Reassembles the URL string, in the form "jms:/<dest>?prop1=value1&prop2=value2&..."
*/
protected String toExternalForm(URL url) {
diff --git a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSEndpoint.java b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSEndpoint.java
index 9448542135..109c831952 100644
--- a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSEndpoint.java
+++ b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSEndpoint.java
@@ -47,7 +47,7 @@ abstract Destination getDestination(Session session)
* @param message
* @param timeout
* @return
- * @throws JMSException
+ * @throws Exception
*/
public byte[] call(byte[] message, long timeout)throws Exception
{
@@ -61,7 +61,7 @@ public byte[] call(byte[] message, long timeout)throws Exception
* @param timeout
* @param properties
* @return
- * @throws JMSException
+ * @throws Exception
*/
public byte[] call(byte[] message, long timeout, HashMap properties)
throws Exception
@@ -75,7 +75,7 @@ public byte[] call(byte[] message, long timeout, HashMap properties)
* Send a message w/o waiting for a response.
*
* @param message
- * @throws JMSException
+ * @throws Exception
*/
public void send(byte[] message)throws Exception
{
@@ -87,7 +87,7 @@ public void send(byte[] message)throws Exception
*
* @param message
* @param properties
- * @throws JMSException
+ * @throws Exception
*/
public void send(byte[] message, HashMap properties)
throws Exception
@@ -101,7 +101,7 @@ public void send(byte[] message, HashMap properties)
* Register a MessageListener.
*
* @param listener
- * @throws JMSException
+ * @throws Exception
*/
public void registerListener(MessageListener listener)
throws Exception
@@ -114,7 +114,7 @@ public void registerListener(MessageListener listener)
*
* @param listener
* @param properties
- * @throws JMSException
+ * @throws Exception
*/
public void registerListener(MessageListener listener, HashMap properties)
throws Exception
diff --git a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSSender.java b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSSender.java
index 24621fd2bf..b05149440f 100644
--- a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSSender.java
+++ b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSSender.java
@@ -44,7 +44,7 @@ public JMSSender()
* invoke() creates an endpoint, sends the request SOAP message, and then
* either reads the response SOAP message or simply returns.
*
- * @todo hash on something much better than the connection factory
+ * TODO: hash on something much better than the connection factory
* something like domain:url:username:password would be adequate
* @param msgContext
* @throws AxisFault
diff --git a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSURLHelper.java b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSURLHelper.java
index d157e2bff4..8467247a38 100644
--- a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSURLHelper.java
+++ b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSURLHelper.java
@@ -25,7 +25,7 @@
/**
* JMSURLHelper provides access to properties in the URL.
- * The URL must be of the form: "jms:/?[=&]*"
+ * The URL must be of the form: "jms:/<destination>?[<property>=<key>&]*"
*
* @author Ray Chun (rchun@sonicsoftware.com)
*/
diff --git a/axis-rt-transport-jms/src/site/site.xml b/axis-rt-transport-jms/src/site/site.xml
index ea9de8bd86..18866594ab 100644
--- a/axis-rt-transport-jms/src/site/site.xml
+++ b/axis-rt-transport-jms/src/site/site.xml
@@ -17,11 +17,8 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+
-
+
diff --git a/axis-rt-transport-mail/pom.xml b/axis-rt-transport-mail/pom.xml
index ebd66d2305..14307f2ae7 100644
--- a/axis-rt-transport-mail/pom.xml
+++ b/axis-rt-transport-mail/pom.xml
@@ -27,6 +27,13 @@
axis-rt-transport-mail
Mail Transport
+ ${baseUrl}/transports/mail
+
+
+ axis
+ ${baseSiteUrl}/transports/mail
+
+
${project.groupId}
diff --git a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/Handler.java b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/Handler.java
index 75d84144ea..663396c79f 100644
--- a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/Handler.java
+++ b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/Handler.java
@@ -24,7 +24,7 @@
* A stub URLStreamHandler, so the system will recognize our
* custom URLs as valid.
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas <dims@yahoo.com>
*/
public class Handler extends URLStreamHandler {
protected URLConnection openConnection(URL u) {
diff --git a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailServer.java b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailServer.java
index 64c528fd35..f68c19de37 100644
--- a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailServer.java
+++ b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailServer.java
@@ -38,7 +38,7 @@
* use. Its intended uses are for demos, debugging, and performance
* profiling.
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas <dims@yahoo.com>
* @author Rob Jellinghaus (robj@unrealities.com)
*/
diff --git a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailTransport.java b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailTransport.java
index 9b04c74535..2f551a7705 100644
--- a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailTransport.java
+++ b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailTransport.java
@@ -24,7 +24,7 @@
/**
* A Transport which will cause an invocation via "mail"
*
- * @author Davanum Srinivas
+ * @author Davanum Srinivas <dims@yahoo.com>
*/
public class MailTransport extends Transport {
public MailTransport() {
diff --git a/axis-rt-transport-mail/src/site/site.xml b/axis-rt-transport-mail/src/site/site.xml
new file mode 100644
index 0000000000..18866594ab
--- /dev/null
+++ b/axis-rt-transport-mail/src/site/site.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/axis-saaj/pom.xml b/axis-saaj/pom.xml
index 26cdafbaa3..b0f11fdf41 100644
--- a/axis-saaj/pom.xml
+++ b/axis-saaj/pom.xml
@@ -26,7 +26,15 @@
../pom.xml
axis-saaj
- Axis :: SAAJ
+ SAAJ API
+ Contains the SAAJ 1.2 API
+ ${baseUrl}/saaj
+
+
+ axis
+ ${baseSiteUrl}/saaj
+
+
javax.activation
@@ -52,13 +60,6 @@
MimeHeader objects, which
* represent the MIME headers present in a MIME part of a
- * message.
+ * message.
*
* This class is used primarily when an application wants to
* retrieve specific attachments based on certain MIME headers and
diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPBody.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPBody.java
index 75d735967d..6abdb82bf8 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/SOAPBody.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPBody.java
@@ -81,7 +81,7 @@ public abstract SOAPBodyElement addBodyElement(Name name)
* @param faultString a String giving an explanation of the
* fault
* @param locale a Locale object indicating the native language
- * of the faultString
* @return the new SOAPFault object
* @throws SOAPException if there is a SOAP error
*/
diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPConnectionFactory.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPConnectionFactory.java
index 2b595745f2..02b83c26c4 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/SOAPConnectionFactory.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPConnectionFactory.java
@@ -34,7 +34,7 @@ public SOAPConnectionFactory() {}
* @return a new instance of a default
* SOAPConnectionFactory object
* @throws SOAPException if there was an error creating
- * the SOAPConnectionFactory
+ * the SOAPConnectionFactory
* @throws UnsupportedOperationException if newInstance is not supported.
*/
public static SOAPConnectionFactory newInstance()
diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPElementFactory.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPElementFactory.java
index 744c0be830..6e640216cb 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/SOAPElementFactory.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPElementFactory.java
@@ -100,7 +100,7 @@ public SOAPElement create(String localName, String prefix, String uri)
* @return a new instance of a
* SOAPElementFactory
* @throws SOAPException if there was an error creating
- * the default SOAPElementFactory
+ * the default SOAPElementFactory
*/
public static SOAPElementFactory newInstance() throws SOAPException {
diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPEnvelope.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPEnvelope.java
index 8da3f29039..af9d06d1f0 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/SOAPEnvelope.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPEnvelope.java
@@ -26,7 +26,7 @@
* required, and the SOAPHeader object, though
* optional, is used in the majority of cases. If the
* SOAPHeader object is not needed, it can be deleted,
- * which is shown later.
A client can access the SOAPHeader and
* SOAPBody objects by calling the methods
@@ -35,7 +35,7 @@
* these two methods after starting with the
* SOAPMessage object message to get the
* SOAPPart object sp, which is then used to get the
- * SOAPEnvelope object se.
SOAPEnvelope object se.
* * SOAPPart sp = message.getSOAPPart(); * SOAPEnvelope se = sp.getEnvelope(); @@ -50,7 +50,7 @@ * detaches the XML element (node) on which it is called. For * example, the following line of code deletes the* SOAPBodyobject that is retrieved by the method- * getBody. + * getBody. ** se.getBody().detachNode(); *@@ -82,7 +82,7 @@ * namespace prefix, and the third createsName* objects with just a local name. The following line of code, in * which se is aSOAPEnvelopeobject, creates - * a newNameobject with all three. + * a newNameobject with all three. ** Name name = se.createName("GetLastTradePrice", "WOMBAT", * "http://www.wombat.org/trader"); diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPException.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPException.java index b928686841..f789d7bfb0 100644 --- a/axis-saaj/src/main/java/javax/xml/soap/SOAPException.java +++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPException.java @@ -21,7 +21,7 @@ ** * It is preferable to use this method over setFaultCode(String). * diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPPart.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPPart.java index 72dd878ec4..49a8a8a34b 100644 --- a/axis-saaj/src/main/java/javax/xml/soap/SOAPPart.java +++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPPart.java @@ -240,7 +240,7 @@ public void setContentLocation(String contentLocation) { /** * Sets the content of theStringthat gives the reason for the exception, an * embeddedThrowableobject, or both. This class * provides methods for retrieving reason messages and for - * retrieving the embeddedThrowableobject. + * retrieving the embeddedThrowableobject. * *Typical reasons for throwing a
SOAPException* object are problems such as difficulty setting a header, not diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPFault.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPFault.java index 2b680e863c..49d4091735 100644 --- a/axis-saaj/src/main/java/javax/xml/soap/SOAPFault.java +++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPFault.java @@ -154,6 +154,7 @@ public abstract void setFaultString(String faultString) SOAPConstants.URI_NS_SOAP_ENVELOPE); SOAPFault fault = ...; fault.setFaultCode(qname); +SOAPEnvelopeobject * with the data from the givenSourceobject. - * @param source javax.xml.transform.Source object with the data to + * @param sourcejavax.xml.transform.Sourceobject with the data to * be set * @throws SOAPException if there is a problem in * setting the source diff --git a/axis-saaj/src/site/site.xml b/axis-saaj/src/site/site.xml new file mode 100644 index 0000000000..18866594ab --- /dev/null +++ b/axis-saaj/src/site/site.xml @@ -0,0 +1,24 @@ + + ++ + + + diff --git a/axis-standalone-server/pom.xml b/axis-standalone-server/pom.xml index 92b48d7f58..63e0553e1c 100644 --- a/axis-standalone-server/pom.xml +++ b/axis-standalone-server/pom.xml @@ -26,7 +26,7 @@../pom.xml axis-standalone-server -Axis :: Stand-alone server +Stand-alone Server A Jetty based stand-alone Axis server that replaces the former SimpleAxisServer. @@ -37,6 +37,9 @@${baseSiteUrl}/standalone-server
+ * Note: this is an internal class that should not be used by application code.
*
* @author Andreas Veithen
*/
-public class QuitHandler extends BasicHandler {
+// Must be public so that the Axis core can load it
+public final class QuitHandler extends BasicHandler {
public static final String QUIT_LISTENER = QuitListener.class.getName();
public void invoke(MessageContext msgContext) throws AxisFault {
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitListener.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitListener.java
index 5600c0bd0b..4ec7ee7753 100644
--- a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitListener.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitListener.java
@@ -23,7 +23,7 @@
*
* @author Andreas Veithen
*/
-class QuitListener {
+final class QuitListener {
private boolean quit;
synchronized void requestQuit() {
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessStartAction.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/ServerException.java
similarity index 60%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessStartAction.java
rename to axis-standalone-server/src/main/java/org/apache/axis/server/standalone/ServerException.java
index 3dddd07905..f53dd3c299 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessStartAction.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/ServerException.java
@@ -16,21 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axis.tools.maven.server;
+package org.apache.axis.server.standalone;
-import org.codehaus.plexus.logging.Logger;
+public class ServerException extends Exception {
+ private static final long serialVersionUID = 2996112474203025829L;
-/**
- * Action to be executed after a given process has been started. This is typically used to configure
- * the server process, e.g. to deploy services.
- *
- * @author Andreas Veithen
- */
-public interface ProcessStartAction {
- ProcessStartAction NOP = new ProcessStartAction() {
- public void execute(Logger logger, Process process) throws Exception {
- }
- };
-
- void execute(Logger logger, Process process) throws Exception;
+ public ServerException(Throwable cause) {
+ super(cause);
+ }
}
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
index ebe9881610..d403e05e36 100644
--- a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
@@ -19,16 +19,10 @@
package org.apache.axis.server.standalone;
import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.SessionManager;
import org.mortbay.jetty.servlet.Context;
@@ -45,83 +39,71 @@
*
* @author Andreas Veithen
*/
-public class StandaloneAxisServer {
- public static void main(String[] args) throws Exception {
- Options options = new Options();
-
- {
- Option option = new Option("p", true, "the HTTP port");
- option.setArgName("port");
- option.setRequired(true);
- options.addOption(option);
- }
-
- {
- Option option = new Option("w", true, "the work directory");
- option.setArgName("dir");
- option.setRequired(true);
- options.addOption(option);
- }
-
- {
- Option option = new Option("j", true, "a list of directories to look up JWS files from");
- option.setArgName("dirs");
- options.addOption(option);
- }
-
- {
- Option option = new Option("m", true, "the maximum number of concurrently active sessions");
- option.setArgName("count");
- options.addOption(option);
- }
-
- if (args.length == 0) {
- HelpFormatter formatter = new HelpFormatter();
- formatter.printHelp(StandaloneAxisServer.class.getName(), options);
- return;
- }
-
- CommandLineParser parser = new GnuParser();
- CommandLine cmdLine;
- try {
- cmdLine = parser.parse(options, args);
- } catch (ParseException ex) {
- System.err.println(ex.getMessage());
- System.exit(1);
- return; // Make compiler happy
- }
-
- int port = Integer.parseInt(cmdLine.getOptionValue("p"));
-
- int maxSessions;
- if (cmdLine.hasOption("m")) {
- maxSessions = Integer.parseInt(cmdLine.getOptionValue("m"));
- } else {
- maxSessions = -1;
- }
-
+public final class StandaloneAxisServer {
+ private int port;
+ private File workDir;
+ private int maxSessions = -1;
+ private File[] jwsDirs;
+
+ private Server server;
+ private QuitListener quitListener;
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public File getWorkDir() {
+ return workDir;
+ }
+
+ public void setWorkDir(File workDir) {
+ this.workDir = workDir;
+ }
+
+ public int getMaxSessions() {
+ return maxSessions;
+ }
+
+ public void setMaxSessions(int maxSessions) {
+ this.maxSessions = maxSessions;
+ }
+
+ public File[] getJwsDirs() {
+ return jwsDirs == null ? null : (File[])jwsDirs.clone();
+ }
+
+ public void setJwsDirs(File[] jwsDirs) {
+ this.jwsDirs = jwsDirs == null ? null : (File[])jwsDirs.clone();
+ }
+
+ public void init() throws ServerException {
StandaloneAxisServlet servlet = new StandaloneAxisServlet();
List resources = new ArrayList();
// Add the work dir as a resource so that Axis can create its server-config.wsdd file there
- File workDir = new File(cmdLine.getOptionValue("w"));
new File(workDir, "WEB-INF").mkdir();
- resources.add(Resource.newResource(workDir.getAbsolutePath()));
+ try {
+ resources.add(Resource.newResource(workDir.getAbsolutePath()));
+ } catch (IOException ex) {
+ throw new ServerException(ex);
+ }
- boolean enableJWS;
- if (cmdLine.hasOption("j")) {
- String[] jwsDirs = cmdLine.getOptionValue("j").split(File.pathSeparator);
+ if (jwsDirs != null) {
for (int i=0; i
+ * The Version service returns a body with whatever namespace URI was used in the request. If
+ * the namespace URI is not properly encoded in the response, then this creates a potential
+ * XSS vulnerability.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testGetVersion() throws Exception {
+ HttpURLConnection conn = (HttpURLConnection)new URL(Utils.getWebappUrl() + "/services/Version").openConnection();
+ conn.setDoInput(true);
+ conn.setDoOutput(true);
+ conn.setRequestProperty("SOAPAction", "");
+ conn.setRequestProperty("Content-Type", "text/xml;charset=UTF-8");
+ InputStream payload = XssTest.class.getResourceAsStream("getVersion-xss.xml");
+ OutputStream out = conn.getOutputStream();
+ IOUtils.copy(payload, out);
+ payload.close();
+ out.close();
+ assertThat(conn.getResponseCode()).isEqualTo(200);
+ InputStream in = conn.getInputStream();
+ assertThat(IOUtils.toString(in, "UTF-8")).doesNotContain("
+ * The class uses the following protocol to allow the parent process to control the lifecycle of the
+ * daemon:
+ *
+ Starting with version 1.4.1, Axis provides a set of Maven plugins that can be used
+ as an alternative to the existing Ant tasks.
+ The plugins also introduce a couple of features not found in the Ant tasks and that
+ are essential to properly support the Maven build lifecycle.
+
+ The following table provides an overview of these plugins and their relationships
+ with the existing Ant tasks:
+
+ *
+ * All remaining arguments are passed to the {@link Daemon} implementation.
+ *
+ *
+ *
+ * @author Andreas Veithen
+ */
+public class Launcher {
+ public static void main(String[] args) {
+ try {
+ String daemonClass = args[0];
+ int controlPort = Integer.parseInt(args[1]);
+ String[] daemonArgs = new String[args.length-2];
+ System.arraycopy(args, 2, daemonArgs, 0, args.length-2);
+ ServerSocket controlServerSocket = new ServerSocket();
+ controlServerSocket.bind(new InetSocketAddress(InetAddress.getByName("localhost"), controlPort));
+ Socket controlSocket = controlServerSocket.accept();
+ // We only accept a single connection; therefore we can close the ServerSocket here
+ controlServerSocket.close();
+ ControlConnectionReader controlIn = new ControlConnectionReader(new InputStreamReader(controlSocket.getInputStream(), "ASCII"));
+ new Thread(controlIn).start();
+ Writer controlOut = new OutputStreamWriter(controlSocket.getOutputStream(), "ASCII");
+ Daemon daemon = (Daemon)Class.forName(daemonClass).newInstance();
+ daemon.init(new DaemonContextImpl(daemonArgs));
+ daemon.start();
+ controlOut.write("READY\r\n");
+ controlOut.flush();
+ String request = controlIn.awaitMessage();
+ if (request.equals("STOP")) {
+ daemon.stop();
+ daemon.destroy();
+ controlIn.expectClose();
+ controlOut.write("STOPPED\r\n");
+ controlOut.flush();
+ System.exit(0);
+ } else {
+ throw new LauncherException("Unexpected request: " + request);
+ }
+ } catch (Throwable ex) {
+ ex.printStackTrace();
+ System.exit(1);
+ }
+ }
+}
diff --git a/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/LauncherException.java b/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/LauncherException.java
new file mode 100644
index 0000000000..5d177c2738
--- /dev/null
+++ b/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/LauncherException.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis.tools.daemon;
+
+final class LauncherException extends Exception {
+ private static final long serialVersionUID = 9049901854635661634L;
+
+ public LauncherException(String msg) {
+ super(msg);
+ }
+}
diff --git a/distribution/pom.xml b/distribution/pom.xml
index e7dbb22c85..d62f31923f 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -34,7 +34,7 @@
+
+
+
+ true to skip running tests, but still compile them. This is the same
@@ -45,8 +45,8 @@ public abstract class AbstractServerMojo extends AbstractMojo {
*/
private boolean skipTests;
- public ProcessManager getProcessManager() {
- return processManager;
+ public final DaemonManager getDaemonManager() {
+ return daemonManager;
}
public final void execute() throws MojoExecutionException, MojoFailureException {
diff --git a/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java
new file mode 100644
index 0000000000..9e821ba00a
--- /dev/null
+++ b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java
@@ -0,0 +1,329 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis.tools.maven.server;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.DebugResolutionListener;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+import org.apache.maven.toolchain.Toolchain;
+import org.apache.maven.toolchain.ToolchainManager;
+import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.util.StringUtils;
+
+public abstract class AbstractStartDaemonMojo extends AbstractDaemonControlMojo implements LogEnabled {
+ /**
+ * The maven project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ /**
+ * The current build session instance. This is used for toolchain manager API calls.
+ *
+ * @parameter default-value="${session}"
+ * @required
+ * @readonly
+ */
+ private MavenSession session;
+
+ /**
+ * @component
+ */
+ private MavenProjectBuilder projectBuilder;
+
+ /**
+ * Local maven repository.
+ *
+ * @parameter expression="${localRepository}"
+ * @required
+ * @readonly
+ */
+ private ArtifactRepository localRepository;
+
+ /**
+ * Remote repositories.
+ *
+ * @parameter expression="${project.remoteArtifactRepositories}"
+ * @required
+ * @readonly
+ */
+ private List remoteArtifactRepositories;
+
+ /**
+ * @component
+ */
+ private ArtifactFactory artifactFactory;
+
+ /**
+ * @component
+ */
+ private ArtifactResolver artifactResolver;
+
+ /**
+ * @component
+ */
+ private ArtifactCollector artifactCollector;
+
+ /**
+ * @component
+ */
+ private ArtifactMetadataSource artifactMetadataSource;
+
+ /**
+ * @component
+ */
+ private ToolchainManager toolchainManager;
+
+ /**
+ * The arguments to pass to the JVM when debug mode is enabled.
+ *
+ * @parameter default-value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8899,server=y,suspend=y"
+ */
+ private String debugArgs;
+
+ /**
+ * Indicates whether the Java process should be started in debug mode. This flag should only be
+ * set from the command line.
+ *
+ * @parameter expression="${axis.server.debug}" default-value="false"
+ */
+ private boolean debug;
+
+ /**
+ * The arguments to pass to the JVM when JMX is enabled.
+ *
+ * @parameter default-value="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+ */
+ private String jmxArgs;
+
+ /**
+ * Indicates whether the Java process should be started with remote JMX enabled. This flag
+ * should only be set from the command line.
+ *
+ * @parameter expression="${axis.server.jmx}" default-value="false"
+ */
+ private boolean jmx;
+
+ /**
+ * Arbitrary JVM options to set on the command line. Note that this parameter uses the same
+ * expression as the Surefire and Failsafe plugins. By setting the argLine
+ * property, it is therefore possible to easily pass a common set of JVM options to all
+ * processes involved in the tests. Since the JaCoCo Maven plugin also sets this property, code
+ * coverage generated on the server-side will be automatically included in the analysis.
+ *
+ * @parameter expression="${argLine}"
+ */
+ private String argLine;
+
+ /**
+ * @parameter default-value="${plugin.version}"
+ * @required
+ * @readonly
+ */
+ private String axisVersion;
+
+ private final Set/*true, then the execution of the goal will block after the
+ * server has been started. This is useful if one wants to manually test some services deployed
+ * on the server or if one wants to run the integration tests from an IDE. The flag should only
+ * be set using the command line, but not in the POM.
+ *
+ * @parameter expression="${axis.server.foreground}" default-value="false"
+ */
+ // Note: this feature is implemented using a flag (instead of a distinct goal) to make sure that
+ // the server is configured in exactly the same way as in a normal integration test execution.
+ private boolean foreground;
+
+ /**
+ * Specifies an alternate port number that will override {@link #port} if {@link #foreground} is
+ * set to true. This parameter should be used if the port number configured with
+ * the {@link #port} parameter is allocated dynamically. This makes it easier to run integration
+ * tests from an IDE. For more information, see the usage
+ * documentation.
+ *
+ * @parameter
+ */
+ private int foregroundPort = -1;
+
+ protected final void doStartDaemon() throws MojoExecutionException, MojoFailureException {
+ Log log = getLog();
+
+ doStartDaemon(foreground && foregroundPort != -1 ? foregroundPort : port);
+
+ if (foreground) {
+ log.info("Server started in foreground mode. Press CRTL-C to stop.");
+ Object lock = new Object();
+ synchronized (lock) {
+ try {
+ lock.wait();
+ } catch (InterruptedException ex) {
+ // Set interrupt flag and continue
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+ }
+
+ protected abstract void doStartDaemon(int port) throws MojoExecutionException, MojoFailureException;
+}
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java
similarity index 82%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java
index cfa7db04e0..caa6dd2733 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java
+++ b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java
@@ -20,7 +20,7 @@
import java.io.File;
-public interface ProcessManager {
- void startProcess(String description, String[] cmdline, File workDir, ProcessStartAction startAction, ProcessStopAction stopAction) throws Exception;
+public interface DaemonManager {
+ void startDaemon(String description, String[] cmdline, File workDir, int controlPort) throws Exception;
void stopAll() throws Exception;
}
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java
similarity index 68%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java
index 14046b0ab9..57c8a15156 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java
+++ b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java
@@ -27,8 +27,8 @@
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
-public class DefaultProcessManager implements ProcessManager, LogEnabled {
- private final List managedProcesses = new ArrayList();
+public class DefaultDaemonManager implements DaemonManager, LogEnabled {
+ private final List daemons = new ArrayList();
private Logger logger;
@@ -36,44 +36,48 @@ public void enableLogging(Logger logger) {
this.logger = logger;
}
- public void startProcess(String description, String[] cmdline, File workDir, ProcessStartAction startAction, ProcessStopAction stopAction) throws Exception {
+ public void startDaemon(String description, String[] cmdline, File workDir, int controlPort) throws Exception {
if (logger.isDebugEnabled()) {
logger.debug("Starting process with command line: " + Arrays.asList(cmdline));
}
Process process = Runtime.getRuntime().exec(cmdline, null, workDir);
- managedProcesses.add(new ManagedProcess(process, description, stopAction));
+ RemoteDaemon daemon = new RemoteDaemon(process, description, controlPort);
+ daemons.add(daemon);
new Thread(new StreamPump(process.getInputStream(), System.out)).start();
new Thread(new StreamPump(process.getErrorStream(), System.err)).start();
- startAction.execute(logger, process);
+ daemon.startDaemon(logger);
}
public void stopAll() throws Exception {
Exception savedException = null;
- for (Iterator it = managedProcesses.iterator(); it.hasNext(); ) {
- ManagedProcess managedProcess = (ManagedProcess)it.next();
- int result;
- logger.debug("Executing stop action");
+ for (Iterator it = daemons.iterator(); it.hasNext(); ) {
+ RemoteDaemon daemon = (RemoteDaemon)it.next();
+ if (logger.isDebugEnabled()) {
+ logger.debug("Stopping " + daemon.getDescription());
+ }
+ boolean success;
try {
- result = managedProcess.getStopAction().execute(logger);
+ daemon.stopDaemon(logger);
+ success = true;
} catch (Exception ex) {
if (savedException == null) {
savedException = ex;
}
- result = -1;
+ success = false;
}
if (logger.isDebugEnabled()) {
- logger.debug("result = " + result);
+ logger.debug("success = " + success);
}
- if (result == ProcessStopAction.STOPPING) {
- managedProcess.getProcess().waitFor();
+ if (success) {
+ daemon.getProcess().waitFor();
} else {
- managedProcess.getProcess().destroy();
+ daemon.getProcess().destroy();
}
- logger.info(managedProcess.getDescription() + " stopped");
+ logger.info(daemon.getDescription() + " stopped");
}
// TODO: need to clear the collection because the same ServerManager instance may be used by multiple projects in a reactor build;
// note that this means that the plugin is not thread safe (i.e. doesn't support parallel builds in Maven 3)
- managedProcesses.clear();
+ daemons.clear();
if (savedException != null) {
throw savedException;
}
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/FileSet.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/FileSet.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/FileSet.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/FileSet.java
diff --git a/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java
new file mode 100644
index 0000000000..1c8af6fc5a
--- /dev/null
+++ b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis.tools.maven.server;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.InetAddress;
+import java.net.Socket;
+
+import org.codehaus.plexus.logging.Logger;
+
+public class RemoteDaemon {
+ private final Process process;
+ private final String description;
+ private final int controlPort;
+ private BufferedReader controlIn;
+ private Writer controlOut;
+
+ public RemoteDaemon(Process process, String description, int controlPort) {
+ this.process = process;
+ this.description = description;
+ this.controlPort = controlPort;
+ }
+
+ public Process getProcess() {
+ return process;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void startDaemon(Logger logger) throws Exception {
+ logger.debug("Attempting to establish control connection on port " + controlPort);
+ Socket controlSocket;
+ while (true) {
+ try {
+ controlSocket = new Socket(InetAddress.getByName("localhost"), controlPort);
+ break;
+ } catch (IOException ex) {
+ try {
+ int exitValue = process.exitValue();
+ throw new IllegalStateException("Process terminated prematurely with exit code " + exitValue);
+ } catch (IllegalThreadStateException ex2) {
+ // Process is still running; continue
+ }
+ Thread.sleep(100);
+ }
+ }
+ logger.debug("Control connection established");
+ controlIn = new BufferedReader(new InputStreamReader(controlSocket.getInputStream(), "ASCII"));
+ controlOut = new OutputStreamWriter(controlSocket.getOutputStream(), "ASCII");
+ logger.debug("Waiting for daemon to become ready");
+ expectStatus("READY");
+ logger.debug("Daemon is ready");
+ }
+
+ public void stopDaemon(Logger logger) throws Exception {
+ controlOut.write("STOP\r\n");
+ controlOut.flush();
+ expectStatus("STOPPED");
+ }
+
+ private void expectStatus(String expectedStatus) throws IOException {
+ String status = controlIn.readLine();
+ if (status == null) {
+ throw new IllegalStateException("Control connection unexpectedly closed");
+ } else if (!status.equals(expectedStatus)) {
+ throw new IllegalStateException("Unexpected status: " + status);
+ }
+ }
+}
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
similarity index 78%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
index 3777a9e0f3..40e612b311 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
+++ b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
@@ -24,20 +24,20 @@
import org.apache.maven.plugin.MojoFailureException;
/**
- * Start an arbitrary Java process.
+ * Start a daemon.
*
- * @goal start-process
+ * @goal start-daemon
* @phase pre-integration-test
* @requiresDependencyResolution test
*/
-public class StartProcessMojo extends AbstractStartProcessMojo {
+public class StartDaemonMojo extends AbstractStartDaemonMojo {
/**
- * The main class.
+ * The daemon class.
*
* @parameter
* @required
*/
- private String mainClass;
+ private String daemonClass;
/**
* The arguments to be passed to the main class.
@@ -54,8 +54,8 @@ public class StartProcessMojo extends AbstractStartProcessMojo {
*/
private File workDir;
- protected void doExecute() throws MojoExecutionException, MojoFailureException {
+ protected void doStartDaemon() throws MojoExecutionException, MojoFailureException {
workDir.mkdirs();
- startJavaProcess(mainClass, mainClass, args != null ? args : new String[0], workDir, ProcessStartAction.NOP, ProcessStopAction.NOP);
+ startDaemon(daemonClass, daemonClass, args, workDir);
}
}
diff --git a/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
new file mode 100644
index 0000000000..35f8f1ab91
--- /dev/null
+++ b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
@@ -0,0 +1,201 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis.tools.maven.server;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.axis.model.wsdd.Deployment;
+import org.apache.axis.model.wsdd.WSDDUtil;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
+import org.xml.sax.InputSource;
+
+/**
+ * Start a org.apache.axis.server.standalone.StandaloneAxisServer instance in a separate
+ * JVM.
+ *
+ * @goal start-server
+ * @phase pre-integration-test
+ * @requiresDependencyResolution test
+ */
+public class StartServerMojo extends AbstractStartWebServerMojo {
+ /**
+ * @parameter default-value="${project.build.directory}/axis-server"
+ * @required
+ * @readonly
+ */
+ private File workDirBase;
+
+ /**
+ * The maximum number of concurrently active sessions.
+ *
+ * @parameter default-value="100"
+ */
+ private int maxSessions;
+
+ /**
+ * A set of WSDD files for services to deploy.
+ *
+ * @parameter
+ */
+ private FileSet[] wsdds;
+
+ /**
+ * A set of directories to look up JWS files from.
+ *
+ * @parameter
+ */
+ private File[] jwsDirs;
+
+ /**
+ * A set of config files to copy to the WEB-INF dir. An example of a config file
+ * would be users.lst used by SimpleSecurityProvider.
+ *
+ * @parameter
+ */
+ private FileSet[] configs;
+
+ protected void doStartDaemon(int port) throws MojoExecutionException, MojoFailureException {
+ // Need to setup additional dependencies before building the default configuration!
+ addAxisDependency("axis-standalone-server");
+ if (jwsDirs != null && jwsDirs.length > 0) {
+ addAxisDependency("axis-rt-jws");
+ }
+
+ // Prepare a work directory where we can place the server-config.wsdd file
+ File workDir = new File(workDirBase, String.valueOf(port));
+ if (workDir.exists()) {
+ try {
+ FileUtils.deleteDirectory(workDir);
+ } catch (IOException ex) {
+ throw new MojoFailureException("Failed to clean the work directory", ex);
+ }
+ }
+ File webInfDir = new File(workDir, "WEB-INF");
+ webInfDir.mkdirs();
+
+ // Start with the default configuration (which depends on the JARs in the classpath)
+ Deployment deployment;
+ try {
+ deployment = WSDDUtil.buildDefaultConfiguration(buildClassLoader(), "server");
+ } catch (IOException ex) {
+ throw new MojoExecutionException("Failed to build default server configuration", ex);
+ }
+
+ // Select WSDD files
+ if (wsdds != null) {
+ for (int i=0; i
+
+
+
+
+
+
+ Maven plugin
+ Description
+ Corresponding Ant tasks
+
+
+ wsdl2java-maven-plugin
+ Generates Java artifacts from a WSDL file
+ axis-wsdl2java
+
+
+ java2wsdl-maven-plugin
+ Generates a WSDL description from a Java class
+ axis-java2wsdl
+
+
+ wsdd-maven-plugin
+
+ N/A
+
+
+
+ axis-server-maven-plugin
+ Starts/stops a stand-alone Axis server
+ client. If this parameter is not specified, then no
@@ -269,7 +276,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
// emitter.setQuiet(quiet);
emitter.setTypeMappingVersion(typeMappingVersion);
emitter.setNowrap(noWrapped);
-// emitter.setAllowInvalidURL(allowInvalidURL);
+ emitter.setAllowInvalidURL(allowInvalidURL);
emitter.setWrapArrays(wrapArrays);
// if (namespaceMappingFile != null) {
// emitter.setNStoPkg(namespaceMappingFile.toString());
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/CustomizableBaseTypeMapping.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/CustomizableBaseTypeMapping.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/CustomizableBaseTypeMapping.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/CustomizableBaseTypeMapping.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
similarity index 96%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
index b95cb565c1..d910208bef 100644
--- a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
+++ b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
@@ -39,7 +39,7 @@ public class GenerateSourcesMojo extends AbstractWsdl2JavaMojo {
/**
* Flag indicating whether the stub and locator should be written to
* {@link #sourceOutputDirectory} (false) or to {@link #testSourceOutputDirectory}
- * (false). Set this parameter to true if the main artifact of your
+ * (true). Set this parameter to true if the main artifact of your
* project should not contain client-side code, but you need it in your test cases. Note that
* this parameter is only meaningful if generate is set to both.
*
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaTestCaseWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaTestCaseWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaTestCaseWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaTestCaseWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaXmlTypeMapping.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaXmlTypeMapping.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaXmlTypeMapping.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaXmlTypeMapping.java
diff --git a/maven/maven-wsdl2java-plugin/src/site/apt/index.apt b/maven/wsdl2java-maven-plugin/src/site/apt/index.apt
similarity index 98%
rename from maven/maven-wsdl2java-plugin/src/site/apt/index.apt
rename to maven/wsdl2java-maven-plugin/src/site/apt/index.apt
index 40ebe1e284..fe0e81fe0a 100644
--- a/maven/maven-wsdl2java-plugin/src/site/apt/index.apt
+++ b/maven/wsdl2java-maven-plugin/src/site/apt/index.apt
@@ -19,7 +19,7 @@
Introduction
------------
-maven-wsdl2java-plugin
+wsdl2java-maven-plugin
The wsdl2java plugin is used to generate client and/or server side Java artifacts from a WSDL file.
diff --git a/maven/maven-wsdl2java-plugin/src/site/apt/java-xml-type-mappings.apt.vm b/maven/wsdl2java-maven-plugin/src/site/apt/java-xml-type-mappings.apt.vm
similarity index 97%
rename from maven/maven-wsdl2java-plugin/src/site/apt/java-xml-type-mappings.apt.vm
rename to maven/wsdl2java-maven-plugin/src/site/apt/java-xml-type-mappings.apt.vm
index 7e9c7f2af5..33db2ddea1 100644
--- a/maven/maven-wsdl2java-plugin/src/site/apt/java-xml-type-mappings.apt.vm
+++ b/maven/wsdl2java-maven-plugin/src/site/apt/java-xml-type-mappings.apt.vm
@@ -22,7 +22,7 @@
Changing the Java class associated with an XML type
- maven-wsdl2java-plugin uses the default mappings between XML types and Java classes determined by the
+ wsdl2java-maven-plugin uses the default mappings between XML types and Java classes determined by the
configured <<