axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prad...@apache.org
Subject svn commit: r600141 [10/10] - in /webservices/axis2/branches/java/jaxws21/modules: adb-codegen/ adb-codegen/src/org/apache/axis2/schema/ adb-codegen/src/org/apache/axis2/schema/template/ adb-codegen/src/org/apache/axis2/schema/util/ adb-codegen/src/org...
Date Sat, 01 Dec 2007 14:43:54 GMT
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java Sat Dec  1 06:43:28 2007
@@ -24,6 +24,7 @@
 import org.apache.axis2.client.ServiceClient;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.AxisService;
+import org.apache.axis2.java.security.AccessController;
 import org.apache.axis2.jaxws.ClientConfigurationFactory;
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.description.DescriptionFactory;
@@ -60,9 +61,11 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.annotation.Annotation;
 import java.net.ConnectException;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -250,7 +253,6 @@
                             .makeWebServiceException(Messages.getMessage("addPortErr2"));
                 }
                 if (getWSDLWrapper() != null && isPortDeclared) {
-                    // TODO: RAS & NLS
                     throw ExceptionFactory.makeWebServiceException(
                             Messages.getMessage("addPortDup", portQName.toString()));
                 } else if (endpointDescription == null) {
@@ -280,15 +282,11 @@
                 if (!isPortDeclared ||
                         (endpointDescription != null && endpointDescription.isDynamicPort())) {
                     // This guards against the case where an addPort was done previously and now a getPort is done on it.
-                    // TODO: RAS & NLS
                     throw ExceptionFactory.makeWebServiceException(
-                        "ServiceDescription.updateEndpointDescription: Can not do a getPort on a port added via addPort().  PortQN: " +
-                        (portQName != null ? portQName.toString() : "not specified"));
+                    		Messages.getMessage("updateEPDescrErr1",(portQName != null ? portQName.toString() : "not specified")));
                 } else if (sei == null) {
-                    // TODO: RAS & NLS
                     throw ExceptionFactory.makeWebServiceException(
-                        "ServiceDescription.updateEndpointDescription: Can not do a getPort with a null SEI.  PortQN: " +
-                        (portQName != null ? portQName.toString() : "not specified"));
+                    		Messages.getMessage("updateEPDescrErr2",(portQName != null ? portQName.toString() : "not specified")));
                 } else if (endpointDescription == null) {
                     // Use the SEI Class and its annotations to finish creating the Description hierachy: Endpoint, EndpointInterface, Operations, Parameters, etc.
                     // TODO: Need to create the Axis Description objects after we have all the config info (i.e. from this SEI)
@@ -307,11 +305,9 @@
                     // Note that an EndpointDescritption created from an addPort (i.e. a dynamic port) can not do this.
                     endpointDescription.updateWithSEI(sei);
                 } else if (getEndpointSEI(portQName) != sei) {
-                    // TODO: RAS & NLS
                     throw ExceptionFactory.makeWebServiceException(
-                            "ServiceDescription.updateEndpointDescription: Can't do a getPort() specifiying a different SEI than the previous getPort().  PortQN: "
-                                    + portQName + "; current SEI: " + sei + "; previous SEI: " +
-                                    getEndpointSEI(portQName));
+                    		Messages.getMessage("updateEPDescrErr3",portQName.toString(),
+                    				sei.getName(),getEndpointSEI(portQName).getName()));
                 } else {
                     // All error check above passed, the EndpointDescription already exists and needs no updating
                 }
@@ -330,8 +326,7 @@
                     // The Dispatch should not have an SEI associated with it on the update call.
                     // REVIEW: Is this a valid check?
                     throw ExceptionFactory.makeWebServiceException(
-                            "ServiceDescription.updateEndpointDescription: Can not specify an SEI when creating a Dispatch. PortQN: " +
-                                    portQName);
+                    		Messages.getMessage("createDispatchFail3",portQName.toString()));
                 } else if (getWSDLWrapper() != null && isPortDeclared) {
                     // EndpointDescription doesn't exist and this is a declared Port, so create one
                     // Use the SEI Class and its annotations to finish creating the Description hierachy.  Note that EndpointInterface, Operations, Parameters, etc.
@@ -675,11 +670,8 @@
             validateIntegrity();
         }
         catch (Exception ex) {
-            if (log.isDebugEnabled()) {
-                log.debug("Validation phase 1 failure: " + ex.toString(), ex);
-                log.debug("Failing composite: " + composite.toString());
-            }
-            throw ExceptionFactory.makeWebServiceException("Validation Exception " + ex, ex);
+            throw ExceptionFactory.makeWebServiceException(
+            		Messages.getMessage("dbclIntegrityErr",ex.toString(),composite.toString()), ex);
         }
     }
 
@@ -715,10 +707,8 @@
                 providerInterfaceValid = true;
                 //This is a provider based endpoint, make sure the annotation exists
                 if (composite.getWebServiceProviderAnnot() == null) {
-                    // TODO: RAS/NLS
                     throw ExceptionFactory.makeWebServiceException(
-                            "Validation error: This is a Provider based endpoint that does not contain a WebServiceProvider annotation.  Provider class: " +
-                                    composite.getClassName());
+                    		Messages.getMessage("validateIntegrityErr1",composite.getClassName()));
                 }
             }
         }
@@ -727,32 +717,24 @@
         //per JAXWS - Sec. 7.7
         if (composite.getWebServiceAnnot() != null &&
                 composite.getWebServiceProviderAnnot() != null) {
-            // TODO: RAS/NLS
             throw ExceptionFactory.makeWebServiceException(
-                    "Validation error: WebService annotation and WebServiceProvider annotation cannot coexist.  Implementation class: " +
-                            composite.getClassName());
+            		Messages.getMessage("validateIntegrityErr2",composite.getClassName()));
         }
 
         if (composite.getWebServiceProviderAnnot() != null) {
             if (!providerInterfaceValid) {
-                // TODO: RAS/NLS
                 throw ExceptionFactory.makeWebServiceException(
-                        "Validation error: This is a Provider that does not specify a valid Provider interface.   Implementation class: " +
-                                composite.getClassName());
+                		Messages.getMessage("validateIntegrityErr3",composite.getClassName()));
             }
             // There must be a public default constructor per JAXWS - Sec 5.1
             if (!validateDefaultConstructor()) {
-                // TODO: RAS/NLS
                 throw ExceptionFactory.makeWebServiceException(
-                        "Validation error: Provider must have a public default constructor.  Implementation class: " +
-                                composite.getClassName());
+                		Messages.getMessage("validateIntegrityErr4",composite.getClassName()));
             }
             // There must be an invoke method per JAXWS - Sec 5.1.1
             if (!validateInvokeMethod()) {
-                // TODO: RAS/NLS
                 throw ExceptionFactory.makeWebServiceException(
-                        "Validation error: Provider must have a public invoke method.  Implementation class: " +
-                                composite.getClassName());
+                		Messages.getMessage("validateIntegrityErr5",composite.getClassName()));
             }
 
             //If ServiceMode annotation specifies 'payload', then make sure that it is not typed with
@@ -762,10 +744,8 @@
         } else if (composite.getWebServiceAnnot() != null) {
 
             if (composite.getServiceModeAnnot() != null) {
-                // TODO: RAS/NLS
                 throw ExceptionFactory.makeWebServiceException(
-                        "Validation error: ServiceMode annotation can only be specified for WebServiceProvider.   Implementation class: " +
-                                composite.getClassName());
+                		Messages.getMessage("validateIntegrityErr6",composite.getClassName()));
             }
 
             //TODO: hmmm, will we ever actually validate an interface directly...don't think so
@@ -776,11 +756,9 @@
                 // TODO: Validate on the class that a finalize() method does not exist
                 if (!DescriptionUtils.isEmpty(composite.getWebServiceAnnot().wsdlLocation())) {
                     if (composite.getWsdlDefinition() == null && composite.getWsdlURL() == null) {
-                        // TODO: RAS/NLS
                         throw ExceptionFactory.makeWebServiceException(
-                                "Validation error: cannot find WSDL Definition specified by this WebService annotation. Implementation class: "
-                                        + composite.getClassName() + "; WSDL location: " +
-                                        composite.getWebServiceAnnot().wsdlLocation());
+                        		Messages.getMessage("validateIntegrityErr7",composite.getClassName(),
+                        				composite.getWebServiceAnnot().wsdlLocation()));
                     }
                 }
 
@@ -792,11 +770,9 @@
 
                     //Verify that we can find the SEI in the composite list
                     if (seic == null) {
-                        // TODO: RAS/NLS
                         throw ExceptionFactory.makeWebServiceException(
-                                "Validation error: cannot find SEI specified by the WebService.endpointInterface.  Implementaiton class: "
-                                        + composite.getClassName() + "; EndpointInterface: " +
-                                        composite.getWebServiceAnnot().endpointInterface());
+                        		Messages.getMessage("validateIntegrityErr8",composite.getClassName(),
+                        				composite.getWebServiceAnnot().endpointInterface()));
                     }
 
                     // Verify that the only class annotations are WebService and HandlerChain
@@ -808,20 +784,16 @@
                             || composite.getWebServiceContextAnnot() != null
                             || !composite.getAllWebServiceRefAnnots().isEmpty()
                             ) {
-                        // TODO: RAS/NLS
                         throw ExceptionFactory.makeWebServiceException(
-                                "Validation error: invalid annotations specified when WebService annotation specifies an endpoint interface.  Implemntation class:  "
-                                        + composite.getClassName());
+                        		Messages.getMessage("validateIntegrityErr9",composite.getClassName()));
                     }
 
                     //Verify that WebService annotation does not contain a name attribute
                     //(per JSR181 Sec. 3.1)
                     if (!DescriptionUtils.isEmpty(composite.getWebServiceAnnot().name())) {
-                        // TODO: RAS/NLS
                         throw ExceptionFactory.makeWebServiceException(
-                                "Validation error: WebService.name must not be specified when the bean specifies an endpoint interface.  Implentation class: "
-                                        + composite.getClassName() + "; WebService.name: " +
-                                        composite.getWebServiceAnnot().name());
+                        		Messages.getMessage("validateIntegrityErr10",composite.getClassName(),
+                        				composite.getWebServiceAnnot().name()));
                     }
 
                     validateSEI(seic);
@@ -830,10 +802,8 @@
 
                     //Verify that this impl. class does not contain any @WebMethod annotations
                     if (webMethodAnnotationsExist()) {
-                        // TODO: RAS/NLS
                         throw ExceptionFactory.makeWebServiceException(
-                                "Validation error: WebMethod annotations cannot exist on implentation when WebService.endpointInterface is set.  Implementation class: " +
-                                        composite.getClassName());
+                        		Messages.getMessage("validateIntegrityErr11",composite.getClassName()));
                     }
 
 
@@ -846,10 +816,8 @@
                     //
                 }
             } else { //this is an interface...we should not be processing interfaces here
-                // TODO: RAS/NLS
                 throw ExceptionFactory.makeWebServiceException(
-                        "Validation error: Improper usage: cannot invoke this method with an interface.  Implementation class: "
-                                + composite.getClassName());
+                		Messages.getMessage("validateIntegrityErr12",composite.getClassName()));
             }
 
             // Verify that the SOAPBinding annotations are supported.
@@ -857,8 +825,8 @@
             //        (implicit SEI) or a WebServiceProvider
             if (composite.getSoapBindingAnnot() != null) {
                 if (composite.getSoapBindingAnnot().use() == javax.jws.soap.SOAPBinding.Use.ENCODED) {
-                    throw ExceptionFactory.makeWebServiceException("Validation error: Unsupported SOAPBinding annotation value. The ENCODED setting is not supported for SOAPBinding.Use. Implementation class: " 
-                                +composite.getClassName());  
+                    throw ExceptionFactory.makeWebServiceException(
+                    		Messages.getMessage("validateIntegrityErr13",composite.getClassName()));  
                 }
             }
             
@@ -901,11 +869,9 @@
                 String interfaceString = iter.next();
                 if (interfaceString.equals(MDQConstants.PROVIDER_SOAP)
                         || interfaceString.equals(MDQConstants.PROVIDER_DATASOURCE)) {
-
-                    throw ExceptionFactory
-                            .makeWebServiceException(
-                                    "Validation error: SOAPMessage and DataSource objects cannot be used when ServiceMode specifies PAYLOAD. Implementation class: "
-                                            + composite.getClassName());
+                	
+                    throw ExceptionFactory.makeWebServiceException(
+                    		Messages.getMessage("validatePIsErr1",composite.getClassName()));
                 }
             }
 
@@ -939,11 +905,9 @@
                             .equals(SOAPBinding.SOAP12HTTP_BINDING)
                             && !bindingType
                             .equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING))
-
-                        throw ExceptionFactory
-                                .makeWebServiceException(
-                                        "Validation error: SOAPMessage objects cannot be used with HTTP binding type. Implementation class: "
-                                                + composite.getClassName());
+                    	
+                        throw ExceptionFactory.makeWebServiceException(
+                        		Messages.getMessage("validatePIsErr2",composite.getClassName()));
 
                 } else if (interfaceString
                         .equals(MDQConstants.PROVIDER_DATASOURCE)) {
@@ -952,11 +916,9 @@
                     if (DescriptionUtils.isEmpty(bindingType)
                             || !bindingType
                             .equals(javax.xml.ws.http.HTTPBinding.HTTP_BINDING))
-
-                        throw ExceptionFactory
-                                .makeWebServiceException(
-                                        "Validation error: DataSource objects must be used with HTTP binding type. Implementation class: "
-                                                + composite.getClassName());
+                    	
+                        throw ExceptionFactory.makeWebServiceException(
+                        		Messages.getMessage("validatePIsErr3",composite.getClassName()));
                 }
             }
         }
@@ -1056,10 +1018,8 @@
                 // We didn't find the implementation for this SEI method, so throw a validation
                 // exception.
                 throw ExceptionFactory.makeWebServiceException(
-                    "Validation error: Implementation subclass does not implement method on specified interface.  Implementation class: "
-                    + composite.getClassName() + "; missing method name: " +
-                    seiMDC.getMethodName() + "; endpointInterface: " +
-                    seic.getClassName());
+                		Messages.getMessage("validateImplErr",composite.getClassName(),
+                				seiMDC.getMethodName(),seic.getClassName()));
             }
         }
     }
@@ -1075,27 +1035,20 @@
             // There are no parameters on the SEI or the impl; all is well
         } else if ((seiPDCList == null || seiPDCList.isEmpty())
             && !(implPDCList == null || implPDCList.isEmpty())) {
-            String message = "Validation error: SEI indicates no parameters but implementation method specifies parameters: "
-                + implPDCList
-                + "; Implementation class: "
-                + composite.getClassName()
-                + "; Method name: " + seiMDC.getMethodName() + "; Endpoint Interface: " + className;
-            throw ExceptionFactory.makeWebServiceException(message);
+            throw ExceptionFactory.makeWebServiceException(
+            		Messages.getMessage("validateMethodParamErr1",implPDCList.toString(),
+            				composite.getClassName(),seiMDC.getMethodName(),className));
         } else if ((seiPDCList != null && !seiPDCList.isEmpty())
             && !(implPDCList != null && !implPDCList.isEmpty())) {
-            String message = "Validation error: SEI indicates parameters " + seiPDCList
-                + " but implementation method specifies no parameters; Implementation class: "
-                + composite.getClassName() + "; Method name: " + seiMDC.getMethodName()
-                + "; Endpoint Interface: " + className;
-            throw ExceptionFactory.makeWebServiceException(message);
+            throw ExceptionFactory.makeWebServiceException(
+            		Messages.getMessage("validateMethodParamErr2",seiPDCList.toString(),
+            				composite.getClassName(),seiMDC.getMethodName(),className));
         } else if (seiPDCList.size() != implPDCList.size()) {
-            String message = "Validation error: The number of parameters on the SEI method ("
-                + seiPDCList.size()
-                + ") does not match the number of parameters on the implementation ( "
-                + implPDCList.size() + "); Implementation class: " + composite.getClassName()
-                + "; Method name: " + seiMDC.getMethodName() + "; Endpoint Interface: " + className;
-            throw ExceptionFactory.makeWebServiceException(message);
-
+            throw ExceptionFactory.makeWebServiceException(
+            		Messages.getMessage("validateMethodParamErr3",
+            				new Integer(seiPDCList.size()).toString(),
+            				new Integer(implPDCList.size()).toString(),composite.getClassName(),
+            				seiMDC.getMethodName(),className));
         } else {
             // Make sure the order and type of parameters match
             // REVIEW: This checks for strict equality of the fully qualified
@@ -1136,24 +1089,17 @@
         if (seiReturnValue == null && implReturnValue == null) {
             // Neither specify a return value; all is well
         } else if (seiReturnValue == null && implReturnValue != null) {
-            String message = "Validation error: SEI indicates no return value but implementation method specifies return value: "
-                + implReturnValue
-                + "; Implementation class: "
-                + composite.getClassName()
-                + "; Method name: " + seiMDC.getMethodName() + "; Endpoint Interface: " + className;
-            throw ExceptionFactory.makeWebServiceException(message);
+            throw ExceptionFactory.makeWebServiceException(
+            		Messages.getMessage("validateMethodRVErr1",implReturnValue,
+            				composite.getClassName(),seiMDC.getMethodName(),className));
         } else if (seiReturnValue != null && implReturnValue == null) {
-            String message = "Validation error: SEI indicates return value " + seiReturnValue
-                + " but implementation method specifies no return value; Implementation class: "
-                + composite.getClassName() + "; Method name: " + seiMDC.getMethodName()
-                + "; Endpoint Interface: " + className;
-            throw ExceptionFactory.makeWebServiceException(message);
+            throw ExceptionFactory.makeWebServiceException(
+            		Messages.getMessage("validateMethodRVErr2",seiReturnValue,
+            				composite.getClassName(),seiMDC.getMethodName(),className));
         } else if (!seiReturnValue.equals(implReturnValue)) {
-            String message = "Validation error: SEI return value " + seiReturnValue
-                + " does not match implementation method return value " + implReturnValue
-                + "; Implementation class: " + composite.getClassName() + "; Method name: "
-                + seiMDC.getMethodName() + "; Endpoint Interface: " + className;
-            throw ExceptionFactory.makeWebServiceException(message);
+            throw ExceptionFactory.makeWebServiceException(
+            		Messages.getMessage("validateMethodRVErr3",seiReturnValue,implReturnValue,
+            				composite.getClassName(),seiMDC.getMethodName(),className));
         }
 
     }
@@ -1172,10 +1118,9 @@
                 return;
             } else {
                 // SEI delcares no checked exceptions, but the implementation has checked exceptions, which is an error
-                throw ExceptionFactory.makeWebServiceException("Validation error: Implementation method signature has more checked exceptions than SEI method signature (0): Implementation class: "
-                    + composite.getClassName() 
-                    + "; method name: " + seiMDC.getMethodName() 
-                    + "; endpointInterface: " + className);
+                throw ExceptionFactory.makeWebServiceException(
+                		Messages.getMessage("validateMethodExceptionErr1",
+                				composite.getClassName(),seiMDC.getMethodName(),className));
             }
         } else if (implExceptions == null) {
             // Implementation throws fewer checked exceptions than SEI, which is OK.
@@ -1184,12 +1129,11 @@
         
         // Check the list length; An implementation can not declare more exceptions than the SEI
         if (seiExceptions.length < implExceptions.length) {
-            throw ExceptionFactory.makeWebServiceException("Validation error: Implementation method signature has more checked exceptions ("
-                + implExceptions.length + ") than SEI method signature ("
-                + seiExceptions.length + "): Implementation class: "
-                + composite.getClassName() 
-                + "; method name: " + seiMDC.getMethodName() 
-                + "; endpointInterface: " + className);
+            throw ExceptionFactory.makeWebServiceException(
+            		Messages.getMessage("validateMethodExceptionErr2",
+            				new Integer(implExceptions.length).toString(),
+            				new Integer(seiExceptions.length).toString(),
+            				composite.getClassName(),seiMDC.getMethodName(),className));
         }
         
         // Make sure that each checked exception declared by the 
@@ -1206,12 +1150,10 @@
                     }
                 }
                 
-                if (!foundIt) {
-                    throw ExceptionFactory.makeWebServiceException("Validation error: Implementation method signature throws exception " 
-                        + implException + "which is not declared on the SEI method signature: Implementation class: "
-                        + composite.getClassName() 
-                        + "; method name: " + seiMDC.getMethodName() 
-                        + "; endpointInterface: " + className);
+                if (!foundIt) {    	
+                    throw ExceptionFactory.makeWebServiceException(
+                    		Messages.getMessage("validateMethodExceptionErr3",implException,
+                    				composite.getClassName(),seiMDC.getMethodName(),className));
                 }
             }
         }
@@ -1290,26 +1232,19 @@
         //TODO: Validate SEI superclasses -- hmmm, may be doing this below
         //
         if (seic.getWebServiceAnnot() == null) {
-            // TODO: RAS & NLS
             throw ExceptionFactory.makeWebServiceException(
-                    "Validation error: SEI does not contain a WebService annotation.  Implementation class: "
-                            + composite.getClassName() + "; SEI: " + seic.getClassName());
+            		Messages.getMessage("validateSEIErr1",composite.getClassName(),seic.getClassName()));
         }
         if (!seic.getWebServiceAnnot().endpointInterface().equals("")) {
-            // TODO: RAS & NLS
             throw ExceptionFactory.makeWebServiceException(
-                    "Validation error: SEI must not set a value for @WebService.endpointInterface.  Implementation class: "
-                            + composite.getClassName() + "; SEI: " + seic.getClassName()
-                            + "; Invalid endpointInterface value: " +
-                            seic.getWebServiceAnnot().endpointInterface());
+            		Messages.getMessage("validateSEIErr2",composite.getClassName(),
+            				seic.getClassName(),seic.getWebServiceAnnot().endpointInterface()));
         }
         // Verify that the SOAPBinding annotations are supported.
-        if (seic.getSoapBindingAnnot() != null) {
-        if (seic.getSoapBindingAnnot().use() == javax.jws.soap.SOAPBinding.Use.ENCODED) {
-               throw ExceptionFactory.makeWebServiceException("Validation error: Unsupported SOAPBinding annotation value. The ENCODED setting is not supported for SOAPBinding.Use. Implementation class: " 
-                        +seic.getClassName());  
+        if (seic.getSoapBindingAnnot() != null &&
+        		seic.getSoapBindingAnnot().use() == javax.jws.soap.SOAPBinding.Use.ENCODED) {
+        	throw ExceptionFactory.makeWebServiceException(Messages.getMessage("validateSEIErr3",seic.getClassName()));  
         }
-       }
 
         checkSEIAgainstWSDL();
 
@@ -1444,7 +1379,6 @@
 
                 String handlerFileName = handlerChainAnnotation.file();
 
-                // TODO RAS & NLS
                 if (log.isDebugEnabled()) {
                     if (composite != null) {
                         log.debug("EndpointDescriptionImpl.getHandlerChain: fileName: "
@@ -1468,20 +1402,12 @@
                                                                  className,
                                                                  classLoader);
 
-                try {
-
-                    // All the classes we need should be part of this package
-                    JAXBContext jc =
-                            JAXBContext.newInstance("org.apache.axis2.jaxws.description.xml.handler",
-                                                    this.getClass().getClassLoader());
-
-                    Unmarshaller u = jc.createUnmarshaller();
-
-                    JAXBElement<?> o = (JAXBElement<?>) u.unmarshal(is);
-                    handlerChainsType = (HandlerChainsType) o.getValue();
-
-                } catch (Exception e) {
-                    throw ExceptionFactory.makeWebServiceException("EndpointDescriptionImpl: getHandlerChain: thrown when attempting to unmarshall JAXB content");
+                if(is == null) {
+                    log.warn("Unable to load handlers from file: " + handlerFileName);
+                }
+                else {
+                    handlerChainsType =
+                        DescriptionUtils.loadHandlerChains(is, this.getClass().getClassLoader());
                 }
             }
         }
@@ -1497,7 +1423,7 @@
         if (this.handlerChainAnnotation == null) {
                 if (serviceClass != null) {
                     handlerChainAnnotation =
-                            (HandlerChain) serviceClass.getAnnotation(HandlerChain.class);
+                            (HandlerChain) getAnnotation(serviceClass, HandlerChain.class);
             }
         }
 
@@ -1697,5 +1623,18 @@
         }
         return string.toString();
 
+    }
+    /**
+     * Get an annotation.  This is wrappered to avoid a Java2Security violation.
+     * @param cls Class that contains annotation 
+     * @param annotation Class of requrested Annotation
+     * @return annotation or null
+     */
+    private static Annotation getAnnotation(final Class cls, final Class annotation) {
+        return (Annotation) AccessController.doPrivileged(new PrivilegedAction() {
+            public Object run() {
+                return cls.getAnnotation(annotation);
+            }
+        });
     }
 }

Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties Sat Dec  1 06:43:28 2007
@@ -45,7 +45,7 @@
 builtOn=Built on #today#
 #############################################################################
 test01=This string is a test string 01.
-faultProcessingNotSupported=User fault processing is not supported. The exception is {0}
+faultProcessingNotSupported=User fault processing is not supported. The @WebFault faultbean is missing for {0}
 exceptionDuringExceptionFlow=An exception occurred during exception processing.  The exception is swallowed and is not propagated back to the caller.
 serviceClientCreateError=The ServiceClient cannot be created. 
 cannotSetExcutorToNull=An attempt was made to set the Executor to a null value. This is not allowed.
@@ -83,6 +83,7 @@
 ICCreateOpClientErr2=The system cannot create the OperationClient. The operation qname is null.
 proxyErr1=An attempt was made to invoke the {0} method, but this method is not available on the javax.xml.ws.BindingProvider or {1} class.
 proxyErr2=The @SOAPBinding annotation Style for the service endpoint interface (SEI) and the @SOAPBinding annotation Style for the method should be same.
+proxyErr3=Operation Description was not set.
 proxyPrivateMethod=Invalid method call.  The method {0} is not a valid method.
 proxyExcludedMethod=Invalid method call.  The method {0} has been excluded using the @WebMethod(exclude=true) annotation.
 proxyNullCallback=Invalid AsyncHandler object.  The AsynchHandler cannot be null for an asynchronous callback invocation.
@@ -161,7 +162,7 @@
 ClassUtilsErr3=An IOException error was thrown when trying to get all of the resources for {0}
 ClassUtilsErr4=An IOException error was thrown when trying to read the jar file.
 MethodMarshallerErr1=A JAX-WS service exception for the {0} fault bean cannot be created.
-MethodMarshallerUtilErr1=Empty Body Block Found in response Message for wsdl Operation defintion that expects an Output.
+MethodMarshallerUtilErr1=Empty Body Block Found in response Message for wsdl Operation defintion that expects an Output. Return type associated with SEI operation is not void, Body Block cannot be null.
 SourceReadErr=A problem was encountered while reading the Source object.  Please verify that your Source object is correct.  The class of the Source object is {0}
 JABGraphProblem=The system threw a StackOverflowError at the JAXB level.  This usually means that your JAXB object has a circular reference.  This is not supported by JAXB.
 SchemaReaderErr1=Invlid wsdl Definition provided.
@@ -170,7 +171,9 @@
 dispatchBadDOMSource=An invalid DOMSource was encountered during Dispatch.  Please use a DOMSource that contains a Node.
 convertProblem=An internal error occurred during JAX-WS marshalling. An object of type {0} cannot be converted into the destination type of {1}
 invalidPropValue=The value of property {0} was invalid.  {1} does not match expected type {2}.
-NullParamErr1=Argument {0} in operation {1} is null.  This is not allowed for messages {2}.
+NullParamErr1=Input argument(s) in operation method {0} is null.  This is not allowed for doc/lit messages.
+NullParamErr2=Input argument(s) in operation method {0} is null.  This is not allowed for rpc/lit messages.
+NullParamErr3=Return argument(s) in operation method {0} is null.  This is not allowed for rpc/lit messages.
 unknownHost=The host specified by the URL is unknown.
 connectionRefused=An attempt to connect to the URL was refused.
 urlStream=The WSDL file could not be located.
@@ -183,4 +186,98 @@
 onewayAsync=The async listener property was set.  A one way invocation cannot be performed using an async response channel.
 soapBindingUseEncoded=The SEI {0} contains method {1} with an unsupported SOAPBinding annotation value. SOAPBinding.Use field cannot be set to ENCODED.
 soapBindingStyle=The SEI {0} contains method {1} with annotation SOAPBinding.Style set to RPC.
+handlerSourceFail=Internal error. Multiple sources were supplied for the handler chain configuration information in the class {0}.
 failureLogger=A {0} throwable was caught.  The detail message is: {1}
+clientConfigCtxtErr=Error getting Client Configuration Context : {0}
+createServiceDescrErr=A ServiceDescription was not created for {0}
+createSrvcDescrDBCMapErr=The ServiceDescription failed to validate due to the following errors -- Validation Phase 2 failure: {0}, Failing composite: {1}, Failing Service Description: {2}
+regHandlerHeadersErr=Unable to add Parameter for header QNames to AxisService {0}. {1}
+endpointDescriptionErr1=EndpointDescription: PortQName was null and could not be determined by runtime for class {0}; ServiceDescription: {1}
+endpointDescriptionErr2=Caught {0} attempting to complete configuration on AxisService for ServiceDesription: {1}
+endpointDescriptionErr3=EndpointDescription.EndpointDescription: parents DBC is null
+endpointDescriptionErr4=EndpointDescription: Unable to add parameters to AxisService
+endpointDescriptionErr5=Can't add AxisService param: {0}
+endpointDescriptionErr6=Either WebService or WebServiceProvider annotation must be present on {0}
+endpointDescriptionErr7=Both WebService or WebServiceProvider annotations cannot be presenton {0}
+endpointDescriptionErr8=Can't create SEI class:
+updateWithSEIErr1=Can not update an SEI on a dynamic port.  PortQName: {0}
+updateWithSEIErr2=EndpointDescription.updateWithSEI was passed a null SEI.  PortQName: {0}
+setupAxisServiceErr1=Unable to create AxisService for {0}
+setupAxisServiceErr2=Exception when adding service parameters.
+bldAxisSrvcFromWSDLErr=The WSDL file could not be used due to an exception.  The WSDL will be ignored and annotations will be used.  Implementation class: {0}; WSDL Location: {1}
+serviceDescErr3=WSDL Port not found for port {0}
+generateWSDLErr=EndpointDescriptionImpl: WSDLException thrown when attempting to instantiate WSDL4JWrapper
+handlerChainsTypeErr=EndpointDescriptionImpl.getHandlerChain: fileName: {0}; className: {1}
+eiDescrImplErr=Unable to build AxisOperation for generic Provider; caught exception.
+seiMethodsErr=SEI methods must be public.
+seiProcessingErr=The seiClass is already set; reseting it is not supported.
+seiNotFoundErr=EndpointInterfaceDescriptionImpl: cannot find super class that was specified for this class.
+clientAxisOprErr=Caught exception trying to create AxisOperation.
+createAxisOprErr1=Could not setup Doc/Lit/Bare operation because input message is null.
+createAxisOprErr2=Could not setup Doc/Lit/Bare operation because part namespace is empty.
+createAxisOprErr3=Could not setup Doc/Lit/Bare operation because name is empty.
+seiMethodErr=Can not set an SEI method once it has been set.
+regMUHeadersErr=Unable to add Parameter for header QNames to AxisOperation {0}
+genParamTypesErr=OperationDescriptionImpl.getParameterActualGenericType not supported for DBC.
+updateEPDescrErr1=ServiceDescription.updateEndpointDescription: Can not do a getPort on a port added via addPort().  PortQN: {0}
+updateEPDescrErr2=ServiceDescription.updateEndpointDescription: Can not do a getPort with a null SEI.  PortQN: {0}
+updateEPDescrErr3=ServiceDescription.updateEndpointDescription: Can't do a getPort() specifiying a different SEI than the previous getPort().  PortQN: {0}; current SEI: {1}; previous SEI: {2}
+dbclIntegrityErr=Validation phase 1 failure: {0}; Failing composite: {1}
+validateIntegrityErr1=Validation error: This is a Provider based endpoint that does not contain a WebServiceProvider annotation.  Provider class: {0}
+validateIntegrityErr2=Validation error: WebService annotation and WebServiceProvider annotation cannot coexist.  Implementation class: {0}
+validateIntegrityErr3=Validation error: This is a Provider that does not specify a valid Provider interface.   Implementation class: {0}
+validateIntegrityErr4=Validation error: Provider must have a public default constructor.  Implementation class: {0}
+validateIntegrityErr5=Validation error: Provider must have a public invoke method.  Implementation class: {0}
+validateIntegrityErr6=Validation error: ServiceMode annotation can only be specified for WebServiceProvider.   Implementation class: {0}
+validateIntegrityErr7=Validation error: cannot find WSDL Definition specified by this WebService annotation. Implementation class: {0}; WSDL location: {1}
+validateIntegrityErr8=Validation error: cannot find SEI specified by the WebService.endpointInterface.  Implementaiton class: {0}; EndpointInterface: {1}
+validateIntegrityErr9=Validation error: invalid annotations specified when WebService annotation specifies an endpoint interface.  Implemntation class: {0}
+validateIntegrityErr10=Validation error: WebService.name must not be specified when the bean specifies an endpoint interface.  Implentation class: {0}; WebService.name: {1}
+validateIntegrityErr11=Validation error: WebMethod annotations cannot exist on implentation when WebService.endpointInterface is set.  Implementation class: {0}
+validateIntegrityErr12=Validation error: Improper usage: cannot invoke this method with an interface.  Implementation class: {0}
+validateIntegrityErr13=Validation error: Unsupported SOAPBinding annotation value. The ENCODED setting is not supported for SOAPBinding.Use. Implementation class: {0}
+validatePIsErr1=Validation error: SOAPMessage and DataSource objects cannot be used when ServiceMode specifies PAYLOAD. Implementation class: {0}
+validatePIsErr2=Validation error: SOAPMessage objects cannot be used with HTTP binding type. Implementation class: {0}
+validatePIsErr3=Validation error: DataSource objects must be used with HTTP binding type. Implementation class: {0}
+validateImplErr=Validation error: Implementation subclass does not implement method on specified interface.  Implementation class: {0}; missing method name: {1}; endpointInterface: {2}
+validateMethodParamErr1=Validation error: SEI indicates no parameters but implementation method specifies parameters: {0}; Implementation class: {1}; Method name: {2}; Endpoint Interface: {3}
+validateMethodParamErr2=Validation error: SEI indicates parameters {0} but implementation method specifies no parameters; Implementation class: {1}; Method name: {2}; Endpoint Interface: {3}
+validateMethodParamErr3=Validation error: The number of parameters on the SEI method ({0}) does not match the number of parameters on the implementation ({1}); Implementation class: {2}; Method name: {3}; Endpoint Interface: {4}
+validateMethodRVErr1=Validation error: SEI indicates no return value but implementation method specifies return value: {0}; Implementation class: {1}; Method name: {2}; Endpoint Interface: {3}
+validateMethodRVErr2=Validation error: SEI indicates return value {0} but implementation method specifies no return value; Implementation class: {1}; Method name: {2}; Endpoint Interface: {3}
+validateMethodRVErr3=Validation error: SEI return value {0} does not match implementation method return value {1}; Implementation class: {2}; Method name: {3}; Endpoint Interface: {4}
+validateMethodExceptionErr1=Validation error: Implementation method signature has more checked exceptions than SEI method signature (0): Implementation class: {0}; method name: {1}; endpointInterface: {2}
+validateMethodExceptionErr2=Validation error: Implementation method signature has more checked exceptions ({0}) than SEI method signature ({1}): Implementation class: {2}; method name: {3}; endpointInterface: {4}
+validateMethodExceptionErr3=Validation error: Implementation method signature throws exception {0} which is not declared on the SEI method signature: Implementation class: {1}; method name: {2}; endpointInterface: {3}
+validateSEIErr1=Validation error: SEI does not contain a WebService annotation.  Implementation class: {0}; SEI: {1}
+validateSEIErr2=Validation error: SEI must not set a value for @WebService.endpointInterface.  Implementation class: {0}; SEI: {1}; Invalid endpointInterface value: {2}
+validateSEIErr3=Validation error: Unsupported SOAPBinding annotation value. The ENCODED setting is not supported for SOAPBinding.Use. Implementation class: {0}
+handlerChainErr=EndpointDescriptionImpl: getHandlerChain: thrown when attempting to unmarshall JAXB content.
+createDispatchFail3=ServiceDescription.updateEndpointDescription: Can not specify an SEI when creating a Dispatch. PortQN: {0}
+roleValidatioErr=The role of 'none' is not allowed.
+threadClsLoaderErr=Attemping to use ClassLoader of type {0}, which is incompatible with current ClassLoader of type {1}
+getErr=The task was cancelled.
+getErr1=The client timed out while waiting for an asynchronous response.
+processRespErr=null response.
+addPropertiesErr=Unable to convert WSDL location URL to URI.  URL: {0}; Service: {1}
+invokeAsyncErr=A client outbound handler cause a message flow direction reversal.  This case is not yet implemented.
+cFaultMsgErr=We only support SOAP11 and SOAP12 for JAXWS handlers.
+getHeadersErr=Invalid QName, QName cannot be null.
+getHeadersErr1=Invalid JAXBContext. JAXBContext cannot be null.
+inputConvertionErr=Cannot convert from {0} to List<String>.
+inputConvertionErr1=Cannot convert from  {0} to String.
+pdElementErr=SWAREF and MTOM attachment parameters are not supported in this style/use.
+msgFromMsgErr=Error occurred while creating the representation of the incoming message.
+pTypeErr=Provider cannot have more than one Generic Types defined per JAX-WS Specification.
+bFactoryErr=Unexpected Error. Unable to find BlockFactory for type: {0}
+initErr=The implementor object cannot be null.
+injectOnClsErr=WebServiceContext Injection on a Class is not supported.
+oprDescrErr=No operation found.  WSDL Operation name: {0}
+oprDescrErr1=More than one operation found. Overloaded WSDL operations are not supported.  WSDL Operation name: {0}
+invokeErr=No dispatcher found.
+nullMsgCtxErr=The MessageContext is null.  This is an unexpected condition that occurred during application property migration.
+portErr=Unable to getPort for port QName {0}
+portErr1=Unable to load proxy classes.
+pDescrErr=Null Descriptor. PropertyDescriptor not found.
+pDescrErr2=No read Method found to read property Value from jaxbObject: {0} 
+restWithSOAPErr=Expected an XML over HTTP message, but the message appears to be a SOAP message.  The namespace is {0}

Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java Sat Dec  1 06:43:28 2007
@@ -155,8 +155,8 @@
                 }
             }
             catch(Throwable t) {
-                if(log.isWarnEnabled()) {
-                    log.warn("The MetadataFactoryRegistry could not process the configuration file: " + 
+                if(log.isDebugEnabled()) {
+                    log.debug("The MetadataFactoryRegistry could not process the configuration file: " + 
                              configurationFileLoc + " because of the following error: " + t.toString());
                 }
             }

Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java Sat Dec  1 06:43:28 2007
@@ -19,10 +19,13 @@
 
 package org.apache.axis2.jaxws.description.impl;
 
+import java.io.File;
+import java.io.InputStream;
 import java.lang.annotation.ElementType;
 import java.lang.reflect.Field;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -177,6 +180,43 @@
             assertEquals(SampleAnnotationProcessor.class.getName(), name);
         }
     }
+    
+    public void testHandlerChainSource() {
+    	JavaClassToDBCConverter converter = new JavaClassToDBCConverter(AnnotatedService.class);
+        HashMap<String, DescriptionBuilderComposite> dbcMap = converter.produceDBC();
+        DescriptionBuilderComposite dbc = dbcMap.get(AnnotatedService.class.getName());
+        assertNotNull(dbc);
+        InputStream is = getXMLFileStream();
+        assertNotNull(is);
+        dbc.setHandlerChainSource(is);
+        List<ServiceDescription> sdList = DescriptionFactoryImpl.createServiceDescriptionFromDBCMap(dbcMap);
+        assertNotNull(sdList);
+        assertTrue(sdList.size() > 0);
+        ServiceDescription sd = sdList.get(0);
+        assertNotNull(sd.getEndpointDescriptions_AsCollection());
+        Collection<EndpointDescription> edColl = sd.getEndpointDescriptions_AsCollection();
+        assertNotNull(edColl);
+        assertTrue(edColl.size() > 0);
+        EndpointDescription ed = edColl.iterator().next();
+        assertNotNull(ed);
+        assertNotNull(ed.getHandlerChain());
+    }
+    
+    private InputStream getXMLFileStream() {
+    	InputStream is = null;
+    	String configLoc = null;
+        try {
+            String sep = "/";
+            configLoc = sep + "test-resources" + sep + "test-handler.xml";
+            String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
+            is = new File(baseDir + configLoc).toURL().openStream();
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+        }
+    	return is;
+    }
+    
     
     private void resetClientConfigFactory() throws Exception {
         Field field = DescriptionFactoryImpl.class.getDeclaredField("clientConfigFactory");

Modified: webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml Sat Dec  1 06:43:28 2007
@@ -107,7 +107,7 @@
         <geronimo.spec.annotation.version>1.1</geronimo.spec.annotation.version>
         <groovy.all.version>1.0-jsr-06</groovy.all.version>
         <intellij.version>5.0</intellij.version>
-        <httpcore.version>4.0-alpha5</httpcore.version>
+        <httpcore.version>4.0-alpha6</httpcore.version>
         <jalopy.version>1.5rc3</jalopy.version>
         <jaxb.api.version>2.0</jaxb.api.version>
         <jaxbri.version>2.0.5</jaxbri.version>
@@ -137,7 +137,7 @@
         <woden.version>1.0-incubating-SNAPSHOT</woden.version>
         <wsdl4j.version>1.6.2</wsdl4j.version>
         <xalan.version>2.7.0</xalan.version>
-        <xbean.version>2.2.0</xbean.version>
+        <xmlbeans.version>2.3.0</xmlbeans.version>
         <xerces.version>2.8.1</xerces.version>
         <xml_apis.version>1.3.03</xml_apis.version>
         <xmlschema.version>SNAPSHOT</xmlschema.version>
@@ -757,9 +757,9 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>xmlbeans</groupId>
-                <artifactId>xbean</artifactId>
-                <version>${xbean.version}</version>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>${xmlbeans.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.ws.jaxme</groupId>

Modified: webservices/axis2/branches/java/jaxws21/modules/rmi/src/org/apache/axis2/rmi/metadata/xml/XmlSchema.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/rmi/src/org/apache/axis2/rmi/metadata/xml/XmlSchema.java?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/rmi/src/org/apache/axis2/rmi/metadata/xml/XmlSchema.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/rmi/src/org/apache/axis2/rmi/metadata/xml/XmlSchema.java Sat Dec  1 06:43:28 2007
@@ -81,6 +81,7 @@
     public XmlSchema(String targetNamespace) {
         this();
         this.targetNamespace = targetNamespace;
+        this.namespaces.add(this.targetNamespace);
     }
 
     /**
@@ -112,6 +113,7 @@
 
             //set the target namesapce and other namespaces
             schemaElement.setAttribute("targetNamespace", this.targetNamespace);
+            schemaElement.setAttribute("elementFormDefault", "qualified");
 
             // add other namesapces
             String namespace;
@@ -124,6 +126,17 @@
                     namespacesToPrefixMap.put(namespace,prefix);
                 }
             }
+
+            // add imports
+            XmlImport xmlImport;
+            Element importElement;
+            for (Iterator iter = this.imports.iterator();iter.hasNext();){
+                xmlImport = (XmlImport) iter.next();
+                importElement = document.createElementNS(Constants.URI_2001_SCHEMA_XSD, "xsd:import");
+                importElement.setAttribute("namespace", xmlImport.getNamespace());
+                schemaElement.appendChild(importElement);
+            }
+
 
             // create complex type elements
             XmlType xmlType;

Modified: webservices/axis2/branches/java/jaxws21/modules/scripting/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/scripting/pom.xml?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/scripting/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/scripting/pom.xml Sat Dec  1 06:43:28 2007
@@ -40,8 +40,8 @@
             <artifactId>js</artifactId>
         </dependency>
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
         </dependency>
         <dependency>
             <groupId>bsf</groupId>

Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/build.xml?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/build.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/build.xml Sat Dec  1 06:43:28 2007
@@ -61,7 +61,7 @@
      <filter token="neethi.version" value="${neethi.version}" />
      <filter token="stax.api.version" value="${stax.api.version}" />
      <filter token="stax.impl.version" value="${stax.impl.version}" />
-     <filter token="xbean.version" value="${xbean.version}" />
+     <filter token="xmlbeans.version" value="${xmlbeans.version}" />
      <filter token="XmlSchema.version" value="${XmlSchema.version}" />
      <filter token="log4j.version" value="${log4j.version}" />
      <filter token="wsdl4j.version" value="${wsdl4j.version}" />
@@ -86,7 +86,7 @@
 		<include name="stax-api-${stax.api.version}.jar" />
 		<include name="wsdl4j-${wsdl4j.version}.jar" />
 		<include name="wstx-${stax.impl.version}.jar" />
-		<include name="xbean-${xbean.version}.jar" />
+		<include name="xmlbeans-${xmlbeans.version}.jar" />
 		<include name="XmlSchema-${XmlSchema.version}.jar" />
 		<include name="woden-${woden.version}.jar" />
 		<include name="commons-httpclient-${commons.httpclient.version}.jar" />

Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml Sat Dec  1 06:43:28 2007
@@ -95,10 +95,10 @@
 	        </includes>
 	</dependencySet> 
 	<dependencySet>
-		<outputFileNameMapping>${artifactId}-${xbean.version}.${extension}</outputFileNameMapping>
+		<outputFileNameMapping>${artifactId}-${xmlbeans.version}.${extension}</outputFileNameMapping>
 	        <outputDirectory>lib</outputDirectory>
 	        <includes>
-	        	<include>xmlbeans:xbean:jar</include>
+	        	<include>org.apache.xmlbeans:xmlbeans:jar</include>
 	        </includes>
 	</dependencySet> 
 	<dependencySet>

Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Sat Dec  1 06:43:28 2007
@@ -200,9 +200,9 @@
 			<version>${wsdl4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>xmlbeans</groupId>
-			<artifactId>xbean</artifactId>
-			<version>${xbean.version}</version>
+			<groupId>org.apache.xmlbeans</groupId>
+			<artifactId>xmlbeans</artifactId>
+			<version>${xmlbeans.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ws.commons.schema</groupId>
@@ -345,7 +345,7 @@
 								     <filter token="neethi.version" value="${neethi.version}" />
 								     <filter token="stax.api.version" value="${stax.api.version}" />
 								     <filter token="stax.impl.version" value="${stax.impl.version}" />
-								     <filter token="xbean.version" value="${xbean.version}" />
+								     <filter token="xmlbeans.version" value="${xmlbeans.version}" />
 								     <filter token="xmlschema.version" value="${xmlschema.version}" />
 								     <filter token="log4j.version" value="${log4j.version}" />
 								     <filter token="wsdl4j.version" value="${wsdl4j.version}" />

Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml Sat Dec  1 06:43:28 2007
@@ -42,7 +42,7 @@
                 <include>org.codehaus.woodstox:wstx-asl:jar</include>
                 <include>org.apache.neethi:neethi:jar</include>
                 <include>stax:stax-api:jar</include>                
-                <include>xmlbeans:xbean: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>               

Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/pom.xml?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/pom.xml Sat Dec  1 06:43:28 2007
@@ -102,8 +102,8 @@
 			<artifactId>ant</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>xmlbeans</groupId>
-			<artifactId>xbean</artifactId>
+			<groupId>org.apache.xmlbeans</groupId>
+			<artifactId>xmlbeans</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ws.commons.schema</groupId>

Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java Sat Dec  1 06:43:28 2007
@@ -307,10 +307,10 @@
                     new InheritedArtifact("org.apache.axis2", "axis2-adb")
             };
 
-    private static final InheritedArtifact[] xbeanArtifacts =
+    private static final InheritedArtifact[] xmlbeansArtifacts =
             {
                     new InheritedArtifact("org.apache.axis2", "axis2-xmlbeans"),
-                    new InheritedArtifact("xmlbeans", "xbean")
+                    new InheritedArtifact("org.apache.xmlbeans", "xmlbeans")
             };
 
     /** Fills the option map. This map is passed onto the code generation API to generate the code. */
@@ -676,7 +676,7 @@
         if ("adb".equals(databindingName)) {
             list.addAll(Arrays.asList(adbArtifacts));
         } else if ("xmlbeans".equals(databindingName)) {
-            list.addAll(Arrays.asList(xbeanArtifacts));
+            list.addAll(Arrays.asList(xmlbeansArtifacts));
         }
 
         return (InheritedArtifact[])list.toArray(new InheritedArtifact[ list.size() ]);

Modified: webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties Sat Dec  1 06:43:28 2007
@@ -38,7 +38,7 @@
                lib/stax-api-@stax.api.version@.jar,\
                lib/wsdl4j-@wsdl4j.version@.jar,\
                lib/wstx-@stax.impl.version@.jar,\
-               lib/xbean-@xbean.version@.jar,\
+               lib/xmlbeans-@xmlbeans.version@.jar,\
                lib/XmlSchema-@xmlschema.version@.jar,\
                lib/woden-@woden.version@.jar,\
 	       lib/commons-httpclient-@commons.httpclient.version@.jar,\

Modified: webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/plugin.xml?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/plugin.xml Sat Dec  1 06:43:28 2007
@@ -68,7 +68,7 @@
       <library name="lib/wstx-asl-@stax.impl.version@.jar">
          <export name="*"/>
       </library>
-      <library name="lib/xbean-@xbean.version@.jar">
+      <library name="lib/xmlbeans-@xmlbeans.version@.jar">
          <export name="*"/>
       </library>
       <library name="lib/XmlSchema-@xmlschema.version@.jar">

Modified: webservices/axis2/branches/java/jaxws21/modules/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/xmlbeans/pom.xml?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/xmlbeans/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/xmlbeans/pom.xml Sat Dec  1 06:43:28 2007
@@ -35,8 +35,8 @@
 			<version>${version}</version>
 		</dependency>
 		<dependency>
-			<groupId>xmlbeans</groupId>
-			<artifactId>xbean</artifactId>
+			<groupId>org.apache.xmlbeans</groupId>
+			<artifactId>xmlbeans</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ant</groupId>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message