You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2008/04/30 08:06:58 UTC
svn commit: r652280 [4/4] - in /webservices/axis2/trunk/java/modules:
adb/src/org/apache/axis2/databinding/utils/ distribution/ documentation/
fastinfoset/ integration/ integration/test-resources/ComplexDataTypes/
integration/test-resources/ComplexData...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java Tue Apr 29 23:06:57 2008
@@ -20,7 +20,6 @@
package org.apache.axis2.description.java2wsdl;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.deployment.util.BeanExcludeInfo;
import org.apache.axis2.deployment.util.Utils;
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisOperation;
@@ -30,25 +29,20 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaComplexContent;
-import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaSequence;
import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.codehaus.jam.JAnnotation;
-import org.codehaus.jam.JClass;
-import org.codehaus.jam.JField;
-import org.codehaus.jam.JMethod;
-import org.codehaus.jam.JParameter;
-import org.codehaus.jam.JProperty;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
import javax.xml.namespace.QName;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
public class DocLitBareSchemaGenerator extends DefaultSchemaGenerator {
@@ -64,10 +58,10 @@
schematargetNamespacePrefix, service);
}
- protected JMethod[] processMethods(JMethod[] declaredMethods) throws Exception {
+ protected Method[] processMethods(Method[] declaredMethods) throws Exception {
ArrayList list = new ArrayList();
//short the elements in the array
- Arrays.sort(declaredMethods);
+ Arrays.sort(declaredMethods , new MathodComparator());
// since we do not support overload
HashMap uniqueMethods = new HashMap();
@@ -75,27 +69,27 @@
XmlSchemaSequence sequence;
for (int i = 0; i < declaredMethods.length; i++) {
- JMethod jMethod = declaredMethods[i];
- JAnnotation methodAnnon = jMethod.getAnnotation(AnnotationConstants.WEB_METHOD);
+ Method jMethod = declaredMethods[i];
+ WebMethod methodAnnon = jMethod.getAnnotation(WebMethod.class);
if (methodAnnon != null) {
- if (methodAnnon.getValue(AnnotationConstants.EXCLUDE).asBoolean()) {
+ if (methodAnnon.exclude()) {
continue;
}
}
- String methodName = getSimpleName(jMethod);
+ String methodName = jMethod.getName();
// no need to think abt this method , since that is system
// config method
- if (excludeMethods.contains(getSimpleName(jMethod))) {
+ if (excludeMethods.contains(methodName)) {
continue;
}
- if (uniqueMethods.get(getSimpleName(jMethod)) != null) {
+ if (uniqueMethods.get(methodName) != null) {
log.warn("We don't support method overloading. Ignoring [" +
- jMethod.getQualifiedName() + "]");
+ methodName + "]");
continue;
}
- if (!jMethod.isPublic()) {
+ if (!Modifier.isPublic(jMethod.getModifiers())) {
// no need to generate Schema for non public methods
continue;
}
@@ -118,65 +112,58 @@
// Maintain a list of methods we actually work with
list.add(jMethod);
processException(jMethod,axisOperation);
- uniqueMethods.put(getSimpleName(jMethod), jMethod);
+ uniqueMethods.put(methodName, jMethod);
//create the schema type for the method wrapper
- uniqueMethods.put(getSimpleName(jMethod), jMethod);
- JParameter[] paras = jMethod.getParameters();
+ uniqueMethods.put(methodName, jMethod);
+ Class [] paras = jMethod.getParameterTypes();
String parameterNames[] = methodTable.getParameterNames(methodName);
AxisMessage inMessage = axisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (inMessage != null) {
inMessage.setName(methodName + "RequestMessage");
}
+ Annotation[][] parameterAnnotation = jMethod.getParameterAnnotations();
if (paras.length > 1) {
sequence = new XmlSchemaSequence();
- methodSchemaType = createSchemaTypeForMethodPart(getSimpleName(jMethod));
+ methodSchemaType = createSchemaTypeForMethodPart(methodName);
methodSchemaType.setParticle(sequence);
inMessage.setElementQName(typeTable.getQNamefortheType(methodName));
service.addMessageElementQNameToOperationMapping(methodSchemaType.getQName(),
axisOperation);
inMessage.setPartName(methodName);
for (int j = 0; j < paras.length; j++) {
- JParameter methodParameter = paras[j];
- if (generateRequestSchema(methodParameter, parameterNames, j, jMethod, sequence)) {
+ Class methodParameter = paras[j];
+ String parameterName = getParameterName(parameterAnnotation, j, parameterNames);
+ if (generateRequestSchema(methodParameter , parameterName,jMethod, sequence)) {
break;
}
}
} else if (paras.length == 1) {
- if (paras[0].getType().isArrayType()) {
+ if (paras[0].isArray()) {
sequence = new XmlSchemaSequence();
methodSchemaType = createSchemaTypeForMethodPart(methodName);
methodSchemaType.setParticle(sequence);
- JParameter methodParameter = paras[0];
+ Class methodParameter = paras[0];
inMessage.setElementQName(typeTable.getQNamefortheType(methodName));
service.addMessageElementQNameToOperationMapping(methodSchemaType.getQName(),
axisOperation);
inMessage.setPartName(methodName);
- if (generateRequestSchema(methodParameter, parameterNames, 0, jMethod, sequence)) {
+ String parameterName = getParameterName(parameterAnnotation, 0, parameterNames);
+ if (generateRequestSchema(methodParameter , parameterName,jMethod, sequence)) {
break;
}
} else {
- String parameterName = null;
- JParameter methodParameter = paras[0];
- JAnnotation paramterAnnon =
- methodParameter.getAnnotation(AnnotationConstants.WEB_PARAM);
- if (paramterAnnon != null) {
- parameterName =
- paramterAnnon.getValue(AnnotationConstants.NAME).asString();
- }
- if (parameterName == null || "".equals(parameterName)) {
- parameterName = (parameterNames != null && parameterNames[0] != null) ?
- parameterNames[0] : getSimpleName(methodParameter);
- }
- JMethod processMethod = (JMethod) processedParameters.get(parameterName);
+ String parameterName = getParameterName(parameterAnnotation, 0, parameterNames);
+ Class methodParameter = paras[0];
+ Method processMethod = (Method) processedParameters.get(parameterName);
if (processMethod != null) {
throw new AxisFault("Inavalid Java class," +
- " there are two methods [" + processMethod.getSimpleName() + " and " +
- jMethod.getSimpleName() + " ]which have the same parameter names");
+ " there are two methods [" + processMethod.getName() + " and " +
+ jMethod.getName() + " ]which have the same parameter names");
} else {
processedParameters.put(parameterName, jMethod);
- generateSchemaForType(null, paras[0].getType(), parameterName);
+ generateSchemaForType(null, methodParameter, parameterName);
inMessage.setElementQName(typeTable.getQNamefortheType(parameterName));
inMessage.setPartName(parameterName);
inMessage.setWrapped(false);
@@ -187,21 +174,20 @@
}
// for its return type
- JClass returnType = jMethod.getReturnType();
+ Class returnType = jMethod.getReturnType();
- if (!returnType.isVoidType()) {
+ if (!"void".equals(jMethod.getReturnType().getName())) {
AxisMessage outMessage = axisOperation.getMessage(
WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
- if (returnType.isArrayType()) {
+ if (returnType.isArray()) {
methodSchemaType =
- createSchemaTypeForMethodPart(getSimpleName(jMethod) + RESULT);
+ createSchemaTypeForMethodPart(jMethod.getName() + RESULT);
sequence = new XmlSchemaSequence();
methodSchemaType.setParticle(sequence);
- JAnnotation returnAnnon =
- jMethod.getAnnotation(AnnotationConstants.WEB_RESULT);
+ WebResult returnAnnon = jMethod.getAnnotation(WebResult.class);
String returnName = "return";
if (returnAnnon != null) {
- returnName = returnAnnon.getValue(AnnotationConstants.NAME).asString();
+ returnName = returnAnnon.name();
if (returnName != null && !"".equals(returnName)) {
returnName = "return";
}
@@ -226,44 +212,32 @@
service.addOperation(axisOperation);
}
}
- return (JMethod[]) list.toArray(new JMethod[list.size()]);
+ return (Method[]) list.toArray(new Method[list.size()]);
}
- private boolean generateRequestSchema(JParameter methodParameter,
- String[] parameterNames,
- int j,
- JMethod jMethod,
+
+ private boolean generateRequestSchema(Class methodParameter,
+ String parameterName,
+ Method jMethod,
XmlSchemaSequence sequence) throws Exception {
- String parameterName = null;
- JAnnotation paramterAnnon =
- methodParameter.getAnnotation(AnnotationConstants.WEB_PARAM);
- if (paramterAnnon != null) {
- parameterName =
- paramterAnnon.getValue(AnnotationConstants.NAME).asString();
- }
- if (parameterName == null || "".equals(parameterName)) {
- parameterName = (parameterNames != null && parameterNames[j] != null) ?
- parameterNames[j] : getSimpleName(methodParameter);
- }
- JClass paraType = methodParameter.getType();
- if (nonRpcMethods.contains(getSimpleName(jMethod))) {
- generateSchemaForType(sequence, null, getSimpleName(jMethod));
+ if (nonRpcMethods.contains(jMethod.getName())) {
+ generateSchemaForType(sequence, null, jMethod.getName());
return true;
} else {
- generateSchemaForType(sequence, paraType, parameterName);
+ generateSchemaForType(sequence, methodParameter, parameterName);
}
return false;
}
- private QName generateSchemaForType(XmlSchemaSequence sequence, JClass type, String partName)
+ private QName generateSchemaForType(XmlSchemaSequence sequence, Class type, String partName)
throws Exception {
boolean isArrayType = false;
if (type != null) {
- isArrayType = type.isArrayType();
+ isArrayType = type.isArray();
}
if (isArrayType) {
- type = type.getArrayComponentType();
+ type = type.getComponentType();
}
if (AxisFault.class.getName().equals(type)) {
return null;
@@ -272,7 +246,7 @@
if (type == null) {
classTypeName = "java.lang.Object";
} else {
- classTypeName = getQualifiedName(type);
+ classTypeName = type.getName();
}
if (isArrayType && "byte".equals(classTypeName)) {
classTypeName = "base64Binary";
@@ -288,15 +262,14 @@
schemaTypeName,
partName,
isArrayType);
- String schemaNamespace = resolveSchemaNamespace(getQualifiedName(
- type.getContainingPackage()));
+ String schemaNamespace = resolveSchemaNamespace(getQualifiedName(type.getPackage()));
addImport(getXmlSchema(schemaNamespace), schemaTypeName);
if(sequence==null){
- generateSchemaForSingleElement(schemaTypeName, partName, isArrayType, type);
+ generateSchemaForSingleElement(schemaTypeName, partName, isArrayType);
}
} else {
if (sequence == null) {
- generateSchemaForSingleElement(schemaTypeName, partName, isArrayType, type);
+ generateSchemaForSingleElement(schemaTypeName, partName, isArrayType);
} else {
addContentToMethodSchemaType(sequence,
schemaTypeName,
@@ -310,8 +283,7 @@
protected void generateSchemaForSingleElement(QName schemaTypeName,
String paraName,
- boolean isArray,
- JClass javaType) throws Exception {
+ boolean isArray) throws Exception {
XmlSchemaElement elt1 = new XmlSchemaElement();
elt1.setName(paraName);
elt1.setSchemaTypeName(schemaTypeName);
@@ -330,180 +302,6 @@
*
* @param javaType
*/
- private QName generateSchema(JClass javaType) throws Exception {
- String name = getQualifiedName(javaType);
- QName schemaTypeName = typeTable.getComplexSchemaType(name);
- if (schemaTypeName == null) {
- String simpleName = getSimpleName(javaType);
-
- String packageName = getQualifiedName(javaType.getContainingPackage());
- String targetNameSpace = resolveSchemaNamespace(packageName);
-
- XmlSchema xmlSchema = getXmlSchema(targetNameSpace);
- String targetNamespacePrefix = (String) targetNamespacePrefixMap.get(targetNameSpace);
- if (targetNamespacePrefix == null) {
- targetNamespacePrefix = generatePrefix();
- targetNamespacePrefixMap.put(targetNameSpace, targetNamespacePrefix);
- }
-
- XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
- XmlSchemaSequence sequence = new XmlSchemaSequence();
- XmlSchemaComplexContentExtension complexExtension =
- new XmlSchemaComplexContentExtension();
-
- XmlSchemaElement eltOuter = new XmlSchemaElement();
- schemaTypeName = new QName(targetNameSpace, simpleName, targetNamespacePrefix);
- eltOuter.setName(simpleName);
- eltOuter.setQName(schemaTypeName);
-
- JClass sup = javaType.getSuperclass();
-
- if ((sup != null) && !("java.lang.Object".compareTo(sup.getQualifiedName()) == 0) &&
- !("org.apache.axis2".compareTo(sup.getContainingPackage().getQualifiedName()) == 0)
- &&!("java.util".compareTo(sup.getContainingPackage().getQualifiedName()) == 0)) {
- String superClassName = sup.getQualifiedName();
- String superclassname = getSimpleName(sup);
- String tgtNamespace;
- String tgtNamespacepfx;
- QName qName = typeTable.getSimpleSchemaTypeName(superClassName);
- if (qName != null) {
- tgtNamespace = qName.getNamespaceURI();
- tgtNamespacepfx = qName.getPrefix();
- } else {
- tgtNamespace =
- resolveSchemaNamespace(sup.getContainingPackage().getQualifiedName());
- tgtNamespacepfx = (String) targetNamespacePrefixMap.get(tgtNamespace);
- QName superClassQname = generateSchema(sup);
- if(superClassQname!=null){
- tgtNamespacepfx = superClassQname.getPrefix();
- tgtNamespace = superClassQname.getNamespaceURI();
- }
- }
-
- if (tgtNamespacepfx == null) {
- tgtNamespacepfx = generatePrefix();
- targetNamespacePrefixMap.put(tgtNamespace, tgtNamespacepfx);
- }
-
- QName basetype = new QName(tgtNamespace, superclassname, tgtNamespacepfx);
-
-
- complexExtension.setBaseTypeName(basetype);
- complexExtension.setParticle(sequence);
-
- XmlSchemaComplexContent contentModel = new XmlSchemaComplexContent();
-
- contentModel.setContent(complexExtension);
-
- complexType.setContentModel(contentModel);
-
- } else {
- complexType.setParticle(sequence);
- }
-
- complexType.setName(simpleName);
-
-// xmlSchema.getItems().add(eltOuter);
- xmlSchema.getElements().add(schemaTypeName, eltOuter);
- eltOuter.setSchemaTypeName(complexType.getQName());
-
- xmlSchema.getItems().add(complexType);
- xmlSchema.getSchemaTypes().add(schemaTypeName, complexType);
-
- // adding this type to the table
- typeTable.addComplexSchema(name, eltOuter.getQName());
- // adding this type's package to the table, to support inheritance.
- typeTable.addComplexSchema(javaType.getContainingPackage().getQualifiedName(),
- eltOuter.getQName());
-
-
- Set propertiesSet = new HashSet();
- Set propertiesNames = new HashSet();
-
- BeanExcludeInfo beanExcludeInfo = null;
- if (service.getExcludeInfo() !=null) {
- beanExcludeInfo = service.getExcludeInfo().getBeanExcludeInfoForClass(
- javaType.getQualifiedName());
- }
- JProperty[] tempProperties = javaType.getDeclaredProperties();
- for (int i = 0; i < tempProperties.length; i++) {
- JProperty tempProperty = tempProperties[i];
- String propertyName = getCorrectName(tempProperty.getSimpleName());
- if ((beanExcludeInfo == null) || !beanExcludeInfo.isExcludedProperty(propertyName)){
- propertiesSet.add(tempProperty);
- }
- }
-
- JProperty[] properties = (JProperty[]) propertiesSet.toArray(new JProperty[0]);
- Arrays.sort(properties);
- for (int i = 0; i < properties.length; i++) {
- JProperty property = properties[i];
- boolean isArryType = property.getType().isArrayType();
-
- String propname = getCorrectName(property.getSimpleName());
-
- propertiesNames.add(propname);
-
- this.generateSchemaforFieldsandProperties(xmlSchema, sequence, property.getType(),
- propname, isArryType);
-
- }
-
- JField[] tempFields = javaType.getDeclaredFields();
- HashMap FieldMap = new HashMap();
-
-
- for (int i = 0; i < tempFields.length; i++) {
- // create a element for the field only if it is public
- // and there is no property with the same name
- if (tempFields[i].isPublic()) {
-
- if (tempFields[i].isStatic()) {
-// We do not need to expose static fields
- continue;
- }
- String propertyName = getCorrectName(tempFields[i].getSimpleName());
- if ((beanExcludeInfo == null) || !beanExcludeInfo.isExcludedProperty(propertyName)) {
- // skip field with same name as a property
- if (!propertiesNames.contains(tempFields[i].getSimpleName())) {
-
- FieldMap.put(tempFields[i].getSimpleName(), tempFields[i]);
- }
- }
- }
-
- }
-
- // remove fields from super classes patch for defect Annogen-21
- // getDeclaredFields is incorrectly returning fields of super classes as well
- // getDeclaredProperties used earlier works correctly
- JClass supr = javaType.getSuperclass();
- while (supr != null && supr.getQualifiedName().compareTo("java.lang.Object") != 0) {
- JField[] suprFields = supr.getFields();
- for (int i = 0; i < suprFields.length; i++) {
- FieldMap.remove(suprFields[i].getSimpleName());
- }
- supr = supr.getSuperclass();
- }
- // end patch for Annogen -21
-
- JField[] froperties = (JField[]) FieldMap.values().toArray(new JField[0]);
- Arrays.sort(froperties);
-
- for (int i = 0; i < froperties.length; i++) {
- JField field = froperties[i];
- boolean isArryType = field.getType().isArrayType();
-
- this.generateSchemaforFieldsandProperties(xmlSchema, sequence, field.getType(),
- field.getSimpleName(), isArryType);
- }
-
-
- }
- return schemaTypeName;
- }
-
-
private XmlSchemaComplexType createSchemaTypeForMethodPart(String localPartName) {
XmlSchema xmlSchema = getXmlSchema(schemaTargetNameSpace);
QName elementName =
Added: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/FieldComparator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/FieldComparator.java?rev=652280&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/FieldComparator.java (added)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/FieldComparator.java Tue Apr 29 23:06:57 2008
@@ -0,0 +1,40 @@
+/*
+ * 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.axis2.description.java2wsdl;
+
+import java.util.Comparator;
+import java.util.Arrays;
+import java.lang.reflect.Field;
+
+public class FieldComparator implements Comparator {
+ public int compare(Object o1, Object o2) {
+ Field field1 = (Field) o1;
+ Field field2 = (Field) o2;
+ String[] values = new String[2];
+ values[0] = field1.getName();
+ values[1] = field2.getName();
+ Arrays.sort(values);
+ if (values[0].equals(field1.getName())) {
+ return 0;
+ } else {
+ return 1;
+ }
+ }
+}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java Tue Apr 29 23:06:57 2008
@@ -20,8 +20,8 @@
package org.apache.axis2.description.java2wsdl;
import org.apache.axis2.description.AxisService;
-import org.codehaus.jam.JMethod;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
@@ -33,7 +33,7 @@
TypeTable getTypeTable();
- JMethod[] getMethods();
+ Method[] getMethods();
void setExcludeMethods(ArrayList excludeMethods);
Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/module1/META-INF/module.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/module1/META-INF/module.xml?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/module1/META-INF/module.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/module1/META-INF/module.xml Tue Apr 29 23:06:57 2008
@@ -28,8 +28,13 @@
<handler name="h6" class="org.apache.axis2.registry.Handler3">
<order phase="NewPhase"/>
</handler>
+ <handler name="h10" class="org.apache.axis2.registry.Handler3">
+ <order phaseLast="true" phase="NewPhase"/>
+ </handler>
+ <handler name="h11" class="org.apache.axis2.registry.Handler3">
+ <order after="h6" phase="NewPhase"/>
+ </handler>
</InFlow>
-
<OutFlow>
<handler name="h3" class="org.apache.axis2.registry.Handler3">
<order phase="OperationOutPhase"/>
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java Tue Apr 29 23:06:57 2008
@@ -56,7 +56,7 @@
Phase phase = (Phase) inFlow.get(i);
if (phase.getName().equals("NewPhase")) {
assertEquals("Wrong index for NewPhase!", 3, i);
- assertEquals("Wrong # of handlers in NewPhase", 1, phase.getHandlerCount());
+ assertEquals("Wrong # of handlers in NewPhase", 3, phase.getHandlerCount());
Handler h6 = (Handler)phase.getHandlers().get(0);
assertTrue("Wrong type for handler", h6 instanceof Handler3);
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/registry/Handler3.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/registry/Handler3.java?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/registry/Handler3.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/registry/Handler3.java Tue Apr 29 23:06:57 2008
@@ -29,15 +29,11 @@
public class Handler3 extends AbstractHandler implements Handler {
private static final Log log = LogFactory.getLog(Handler3 .class);
private String message;
- private String name;
public Handler3() {
this.message = "inside Module 1";
}
- public String getName() {
- return name;
- }
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
log.info("I am " + message + " Handler Running :)");
@@ -48,9 +44,7 @@
log.info("I am " + message + " Handler Running :)");
}
- public void setName(String name) {
- this.name = name;
- }
+
}
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Tue Apr 29 23:06:57 2008
@@ -89,7 +89,6 @@
<ping.mar.version>SNAPSHOT</ping.mar.version>
<scripting.mar.version>SNAPSHOT</scripting.mar.version>
- <annogen.version>0.1.0</annogen.version>
<ant.version>1.7.0</ant.version>
<antlr.version>2.7.7</antlr.version>
<axiom.version>SNAPSHOT</axiom.version>
@@ -727,11 +726,6 @@
<version>${jaxen.version}</version>
</dependency>
<dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen.version}</version>
- </dependency>
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${commons.httpclient.version}</version>
Modified: webservices/axis2/trunk/java/modules/samples/book/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/book/pom.xml?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/book/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/book/pom.xml Tue Apr 29 23:06:57 2008
@@ -109,12 +109,7 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
<version>1.0.1</version>
</dependency>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>0.1.0</version>
- </dependency>
- </dependencies>
+ </dependencies>
<build>
<plugins>
Modified: webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml Tue Apr 29 23:06:57 2008
@@ -114,12 +114,7 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
<version>1.0.1</version>
</dependency>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>0.1.0</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.6</version>
Modified: webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml Tue Apr 29 23:06:57 2008
@@ -125,11 +125,6 @@
<version>1.0.1</version>
</dependency>
<dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>0.1.0</version>
- </dependency>
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.6</version>
Modified: webservices/axis2/trunk/java/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/pom.xml?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/pom.xml Tue Apr 29 23:06:57 2008
@@ -94,10 +94,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml Tue Apr 29 23:06:57 2008
@@ -55,7 +55,7 @@
<!--Filter tockens for the copy command to filter the versions of external dependencies -->
<filter token="version_number" value="${version_number}" />
<filter token="activation.version" value="${activation.version}" />
- <filter token="annogen.version" value="${annogen.version}" />
+
<filter token="ant.version" value="${ant.version}" />
<filter token="axiom.version" value="${axiom.version}" />
<filter token="commons.logging.version" value="${commons.logging.version}" />
@@ -75,7 +75,7 @@
<!--Codegen wizard libraries -->
<fileset id="codegen.libs" dir="${axis2.lib.dir}">
<include name="activation-${activation.version}.jar" />
- <include name="annogen-${annogen.version}.jar" />
+
<include name="ant-${ant.version}.jar" />
<include name="axiom-api-${axiom.version}.jar" />
<include name="axiom-dom-${axiom.version}.jar" />
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml Tue Apr 29 23:06:57 2008
@@ -46,14 +46,7 @@
<include>org.apache.ws.commons.axiom:axiom-impl:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputFileNameMapping>${artifactId}-${annogen.version}.${extension}</outputFileNameMapping>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>annogen:annogen:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
+ <dependencySet>
<outputFileNameMapping>${artifactId}-${commons.logging.version}.${extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<includes>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Tue Apr 29 23:06:57 2008
@@ -146,12 +146,7 @@
<artifactId>geronimo-javamail_1.4_spec</artifactId>
<version>${geronimo.spec.javamail.version}</version>
</dependency>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen.version}</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml Tue Apr 29 23:06:57 2008
@@ -1,63 +1,62 @@
-<!--
- ~ 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.
- -->
-
-<assembly>
- <includeBaseDirectory>false</includeBaseDirectory>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>./target/classes</directory>
- <outputDirectory>classes</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>./target/classes/META-INF</directory>
- <outputDirectory>META-INF</outputDirectory>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>annogen:annogen:jar</include>
- <include>org.apache.ws.commons.axiom:axiom-api:jar</include>
- <include>org.apache.ws.commons.axiom:axiom-dom:jar</include>
- <include>org.apache.ws.commons.axiom:axiom-impl:jar</include>
- <include>org.codehaus.woodstox:wstx-asl:jar</include>
- <include>org.apache.neethi:neethi:jar</include>
- <include>stax:stax-api:jar</include>
- <include>org.apache.xmlbeans:xmlbeans:jar</include>
- <include>org.apache.ws.commons.schema:XmlSchema:jar</include>
- <include>log4j:log4j:jar</include>
- <include>org.apache.woden:woden:jar</include>
- <include>commons-logging:commons-logging:jar</include>
- <include>org.apache.ant:ant:jar</include>
- <include>org.apache.axis2:axis2-codegen:jar</include>
- <include>org.apache.axis2:axis2-kernel:jar</include>
- <include>org.apache.axis2:axis2-adb:jar</include>
- <include>org.apache.axis2:axis2-adb-codegen:jar</include>
- <include>org.apache.axis2:axis2-java2wsdl:jar</include>
- <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar</include>
- <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar</include>
- <include>wsdl4j:wsdl4j:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
+<!--
+ ~ 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.
+ -->
+
+<assembly>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>./target/classes</directory>
+ <outputDirectory>classes</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>./target/classes/META-INF</directory>
+ <outputDirectory>META-INF</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.ws.commons.axiom:axiom-api:jar</include>
+ <include>org.apache.ws.commons.axiom:axiom-dom:jar</include>
+ <include>org.apache.ws.commons.axiom:axiom-impl:jar</include>
+ <include>org.codehaus.woodstox:wstx-asl:jar</include>
+ <include>org.apache.neethi:neethi:jar</include>
+ <include>stax:stax-api:jar</include>
+ <include>org.apache.xmlbeans:xmlbeans:jar</include>
+ <include>org.apache.ws.commons.schema:XmlSchema:jar</include>
+ <include>log4j:log4j:jar</include>
+ <include>org.apache.woden:woden:jar</include>
+ <include>commons-logging:commons-logging:jar</include>
+ <include>org.apache.ant:ant:jar</include>
+ <include>org.apache.axis2:axis2-codegen:jar</include>
+ <include>org.apache.axis2:axis2-kernel:jar</include>
+ <include>org.apache.axis2:axis2-adb:jar</include>
+ <include>org.apache.axis2:axis2-adb-codegen:jar</include>
+ <include>org.apache.axis2:axis2-java2wsdl:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar</include>
+ <include>wsdl4j:wsdl4j:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml?rev=652280&r1=652279&r2=652280&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml Tue Apr 29 23:06:57 2008
@@ -34,9 +34,7 @@
<library name="lib/geronimo-activation_1.1_spec-@geronimo.spec.activation.version@.jar">
<export name="*"/>
</library>
- <library name="lib/annogen-@annogen.version@.jar">
- <export name="*"/>
- </library>
+
<library name="lib/ant-@ant.version@.jar">
<export name="*"/>
</library>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org