Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 20630 invoked from network); 29 Jun 2007 19:47:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Jun 2007 19:47:08 -0000 Received: (qmail 24077 invoked by uid 500); 29 Jun 2007 19:47:11 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 23958 invoked by uid 500); 29 Jun 2007 19:47:10 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 23947 invoked by uid 500); 29 Jun 2007 19:47:10 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 23944 invoked by uid 99); 29 Jun 2007 19:47:10 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jun 2007 12:47:10 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jun 2007 12:47:07 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C64051A981A; Fri, 29 Jun 2007 12:46:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r552010 - in /webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri: DocLitBareJaxbSchemaGenerator.java JaxbSchemaGenerator.java Date: Fri, 29 Jun 2007 19:46:46 -0000 To: axis2-cvs@ws.apache.org From: dims@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070629194646.C64051A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dims Date: Fri Jun 29 12:46:45 2007 New Revision: 552010 URL: http://svn.apache.org/viewvc?view=rev&rev=552010 Log: slightly better name Modified: webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/DocLitBareJaxbSchemaGenerator.java webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java Modified: webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/DocLitBareJaxbSchemaGenerator.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/DocLitBareJaxbSchemaGenerator.java?view=diff&rev=552010&r1=552009&r2=552010 ============================================================================== --- webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/DocLitBareJaxbSchemaGenerator.java (original) +++ webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/DocLitBareJaxbSchemaGenerator.java Fri Jun 29 12:46:45 2007 @@ -35,7 +35,7 @@ public Collection generateSchema() throws Exception { - jaxbSchemaGenerator.generateScheamWithoutCallingParent(); + jaxbSchemaGenerator.generateSchemaForParameters(); return super.generateSchema(); } } Modified: webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java?view=diff&rev=552010&r1=552009&r2=552010 ============================================================================== --- webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java (original) +++ webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java Fri Jun 29 12:46:45 2007 @@ -3,8 +3,6 @@ import org.apache.axis2.description.java2wsdl.DefaultSchemaGenerator; import org.apache.axis2.util.Loader; import org.apache.ws.commons.schema.XmlSchema; -import org.apache.ws.commons.schema.XmlSchemaObject; -import org.apache.ws.commons.schema.XmlSchemaType; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -55,11 +53,17 @@ } public Collection generateSchema() throws Exception { - generateScheamWithoutCallingParent(); + generateSchemaForParameters(); return super.generateSchema(); } - public void generateScheamWithoutCallingParent() throws Exception { + /** + * collects all the method parameters and the extra classes from the command line + * creates a JAXBContext and generates schemas from the JAXBContext + * + * @throws Exception + */ + public void generateSchemaForParameters() throws Exception { Set> classes = new HashSet>(); classes.addAll(processMethods(serviceClass.getMethods())); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org