svn commit: r1060294 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java

2011-01-18 Thread isurues 
Author: isurues
Date: Tue Jan 18 10:46:36 2011
New Revision: 1060294

URL: http://svn.apache.org/viewvc?rev=1060294&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-4929. Using a unique id when 
reading a schema using the SchemaCollection

Modified:

axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java

Modified: 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java?rev=1060294&r1=1060293&r2=1060294&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
 Tue Jan 18 10:46:36 2011
@@ -39,6 +39,7 @@ 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.XmlSchemaCollection;
+import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 
 import javax.servlet.ServletConfig;
@@ -47,6 +48,7 @@ import javax.wsdl.Definition;
 import javax.wsdl.WSDLException;
 import javax.wsdl.factory.WSDLFactory;
 import javax.wsdl.xml.WSDLReader;
+import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.ws.WebServiceException;
 import javax.xml.ws.soap.SOAPBinding;
 import java.io.ByteArrayOutputStream;
@@ -321,9 +323,18 @@ public class JAXWSRIWSDLGenerator implem
 schemaCollection.setBaseUri(new 
File(localOutputDirectory).getAbsolutePath());
 
 HashMap docMap = new HashMap();
+
+// Doc factory to read schema files
+DocumentBuilderFactory fac = DocumentBuilderFactory.newInstance();
+fac.setNamespaceAware(true);
+
 List schemaFiles = getSchemaFiles(localOutputDirectory);
 for (File schemaFile : schemaFiles) {
-XmlSchema doc = schemaCollection.read(new 
InputSource(schemaFile.toURL().toString()), null);
+// generate dom document for current schema file
+Document parsedDoc = 
fac.newDocumentBuilder().parse(schemaFile.toURL().toString());
+// read the schema through XmlSchema
+XmlSchema doc = 
schemaCollection.read(parsedDoc.getDocumentElement(),
+"id-" + System.currentTimeMillis());
 if (log.isDebugEnabled()) {
 log.debug("Read in schema file: " + schemaFile.getName());
 }

svn commit: r1060328 - in /axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local: LocalResponder.java LocalTransportSender.java

2011-01-18 Thread amilas 
Author: amilas
Date: Tue Jan 18 11:34:43 2011
New Revision: 1060328

URL: http://svn.apache.org/viewvc?rev=1060328&view=rev
Log:
applied the patch for AXIS2-4931

Modified:

axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java

axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java

Modified: 
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java?rev=1060328&r1=1060327&r2=1060328&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
 Tue Jan 18 11:34:43 2011
@@ -79,9 +79,7 @@ public class LocalResponder extends Abst
 
 try {
 if (log.isDebugEnabled()) {
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-TransportUtils.writeMessage(msgContext, os);
-log.debug("Response - " + new String(os.toByteArray()));
+log.debug("Response - " + msgContext.getEnvelope().toString());
 }
 
 if (epr != null) {

Modified: 
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java?rev=1060328&r1=1060327&r2=1060328&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
 Tue Jan 18 11:34:43 2011
@@ -67,9 +67,7 @@ public class LocalTransportSender extend
 EndpointReference epr = msgContext.getTo();
 
 if (log.isDebugEnabled()) {
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-TransportUtils.writeMessage(msgContext, os);
-log.debug("Sending - " + new String(os.toByteArray()));
+log.debug("Sending - " + msgContext.getEnvelope().toString());
 }
 
 if (epr != null) {

svn commit: r1060357 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java

2011-01-18 Thread isurues 
Author: isurues
Date: Tue Jan 18 13:14:46 2011
New Revision: 1060357

URL: http://svn.apache.org/viewvc?rev=1060357&view=rev
Log:
Using axiom UIDGenerator instead of System.currentTimeMillis() to generate a 
unique ID

Modified:

axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java

Modified: 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java?rev=1060357&r1=1060356&r2=1060357&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
 Tue Jan 18 13:14:46 2011
@@ -19,6 +19,7 @@
 
 package org.apache.axis2.jaxws.description.builder;
 
+import org.apache.axiom.util.UIDGenerator;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.dataretrieval.SchemaSupplier;
@@ -334,7 +335,7 @@ public class JAXWSRIWSDLGenerator implem
 Document parsedDoc = 
fac.newDocumentBuilder().parse(schemaFile.toURL().toString());
 // read the schema through XmlSchema
 XmlSchema doc = 
schemaCollection.read(parsedDoc.getDocumentElement(),
-"id-" + System.currentTimeMillis());
+UIDGenerator.generateUID());
 if (log.isDebugEnabled()) {
 log.debug("Read in schema file: " + schemaFile.getName());
 }

svn commit: r1060360 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerChainProcessor.java

2011-01-18 Thread hemapani 
Author: hemapani
Date: Tue Jan 18 13:28:17 2011
New Revision: 1060360

URL: http://svn.apache.org/viewvc?rev=1060360&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-4365 by putting a copy on 
write array list

Modified:

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerChainProcessor.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerChainProcessor.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerChainProcessor.java?rev=1060360&r1=1060359&r2=1060360&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerChainProcessor.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerChainProcessor.java
 Tue Jan 18 13:28:17 2011
@@ -49,8 +49,10 @@ import javax.xml.ws.handler.Handler;
 import javax.xml.ws.handler.LogicalHandler;
 import javax.xml.ws.handler.soap.SOAPHandler;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 public class HandlerChainProcessor {
 
@@ -75,7 +77,7 @@ public class HandlerChainProcessor {
 
 // Copy of the handler chain used by HandlerChainProcessor
 private List handlers = null;
-private static final List EMPTY_CHAIN = new ArrayList(); 
+private static final List EMPTY_CHAIN = new 
ArrayList(0); 
 
 // for tracking purposes -- see trackInternalCall
 private static Handler currentHandler = null;
@@ -123,8 +125,7 @@ public class HandlerChainProcessor {
 // Use empty chain to avoid excessive garbage collection
 this.handlers = EMPTY_CHAIN;
 } else {
-this.handlers = new ArrayList(); 
-this.handlers.addAll(chain);
+this.handlers = new CopyOnWriteArrayList(chain); 
 }
 }
 } else {

svn commit: r1060695 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java

2011-01-18 Thread isurues 
Author: isurues
Date: Wed Jan 19 07:07:36 2011
New Revision: 1060695

URL: http://svn.apache.org/viewvc?rev=1060695&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-4932 by attaching the 
service name to the folder name

Modified:

axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java

Modified: 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java?rev=1060695&r1=1060694&r2=1060695&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
 Wed Jan 19 07:07:36 2011
@@ -156,11 +156,11 @@ public class JAXWSRIWSDLGenerator implem
 " WsGen classpath: " +
 classPath);
 }
-String localOutputDirectory = tempFile.getAbsolutePath() + className;
+String localOutputDirectory = tempFile.getAbsolutePath() + className
++ "_" + axisService.getName();
 if (log.isDebugEnabled()) {
 log.debug("Output directory for generated WSDL file: " + 
localOutputDirectory);
 }
-boolean errorOnRead = false;
 try {
 
 if (log.isDebugEnabled()) {