svn commit: r980149 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java

2010-07-28 Thread scheu
Author: scheu
Date: Wed Jul 28 18:41:51 2010
New Revision: 980149

URL: http://svn.apache.org/viewvc?rev=980149&view=rev
Log:
Quick fix to avoid toString when not monitoring

Modified:

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java?rev=980149&r1=980148&r2=980149&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
 Wed Jul 28 18:41:51 2010
@@ -209,7 +209,9 @@ public class JAXBUtils {
 log.debug(pkg);
 }
 }
-JAXBUtilsMonitor.addPackageKey(contextPackages.toString());
+if (JAXBUtilsMonitor.isMonitoring()) {
+JAXBUtilsMonitor.addPackageKey(contextPackages.toString());
+}
 
 // Get or Create The InnerMap using the package key
 ConcurrentHashMap innerMap = null;




svn commit: r980160 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java

2010-07-28 Thread scheu
Author: scheu
Date: Wed Jul 28 19:02:26 2010
New Revision: 980160

URL: http://svn.apache.org/viewvc?rev=980160&view=rev
Log:
Added trace to help determine when/why message is converted from OM to SAAJ

Modified:

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java?rev=980160&r1=980159&r2=980160&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
 Wed Jul 28 19:02:26 2010
@@ -34,6 +34,7 @@ import org.apache.axis2.jaxws.ExceptionF
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.message.util.SAAJConverter;
 import org.apache.axis2.jaxws.message.util.SOAPElementReader;
+import org.apache.axis2.jaxws.utility.JavaUtils;
 import org.apache.axis2.jaxws.utility.SAAJFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -82,6 +83,7 @@ public class SAAJConverterImpl implement
 throws WebServiceException {
if (log.isDebugEnabled()) {
log.debug("Converting OM SOAPEnvelope to SAAJ SOAPEnvelope");
+   log.debug("The conversion occurs due to " + 
JavaUtils.stackToString());
}

 SOAPEnvelope soapEnvelope = null;
@@ -131,6 +133,7 @@ public class SAAJConverterImpl implement
 throws WebServiceException {
if (log.isDebugEnabled()) {
log.debug("Converting SAAJ SOAPEnvelope to an OM SOAPEnvelope");
+   log.debug("The conversion occurs due to " + 
JavaUtils.stackToString());
}   

// Before we do the conversion, we have to fix the QNames for fault 
elements
@@ -174,6 +177,7 @@ public class SAAJConverterImpl implement
 throws WebServiceException {
if (log.isDebugEnabled()) {
log.debug("Converting SAAJ SOAPEnvelope String to an OM 
SOAPEnvelope");
+   log.debug("The conversion occurs due to " + 
JavaUtils.stackToString());
} 

 XMLStreamReader reader;
@@ -202,6 +206,7 @@ public class SAAJConverterImpl implement
 public OMElement toOM(SOAPElement soapElement) throws WebServiceException {
if (log.isDebugEnabled()) {
log.debug("Converting SAAJ SOAPElement to an OMElement");
+   log.debug("The conversion occurs due to " + 
JavaUtils.stackToString());
}

 // Get a XMLStreamReader backed by a SOAPElement tree
@@ -227,6 +232,7 @@ public class SAAJConverterImpl implement
 public SOAPElement toSAAJ(OMElement omElement, SOAPElement parent) throws 
WebServiceException {
if (log.isDebugEnabled()) {
log.debug("Converting OMElement to an SAAJ SOAPElement");
+   log.debug("The conversion occurs due to " + 
JavaUtils.stackToString());
}

XMLStreamReader reader = null;
@@ -260,6 +266,7 @@ public class SAAJConverterImpl implement
 throws WebServiceException {
if (log.isDebugEnabled()) {
log.debug("Converting OMElement to an SAAJ SOAPElement");
+   log.debug("The conversion occurs due to " + 
JavaUtils.stackToString());
}

XMLStreamReader reader = null;
@@ -707,6 +714,9 @@ public class SAAJConverterImpl implement
 
 public MessageFactory createMessageFactory(String namespace)
 throws SOAPException, WebServiceException {
+if (log.isDebugEnabled()) {
+log.debug("Creating a SAAJ MessageFactory "  + 
JavaUtils.stackToString());
+}
 return SAAJFactory.createMessageFactory(namespace);
 }
 }




svn commit: r980169 - in /axis/axis2/java/core/trunk/modules: jaxws-integration/pom.xml jaxws/pom.xml metadata/pom.xml

2010-07-28 Thread veithen
Author: veithen
Date: Wed Jul 28 19:14:23 2010
New Revision: 980169

URL: http://svn.apache.org/viewvc?rev=980169&view=rev
Log:
Postpone the execution of maven-dependency-plugin from the generate-sources to 
the generate-resources phase. We don't need to execute this to generate the 
Javadocs.

Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws/pom.xml
axis/axis2/java/core/trunk/modules/metadata/pom.xml

Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=980169&r1=980168&r2=980169&view=diff
==
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Wed Jul 28 
19:14:23 2010
@@ -120,7 +120,7 @@
 maven-dependency-plugin
 
 
-generate-sources
+generate-resources
 
 copy
 

Modified: axis/axis2/java/core/trunk/modules/jaxws/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/pom.xml?rev=980169&r1=980168&r2=980169&view=diff
==
--- axis/axis2/java/core/trunk/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/pom.xml Wed Jul 28 19:14:23 2010
@@ -165,7 +165,7 @@
 maven-dependency-plugin
 
 
-generate-sources
+generate-resources
 
 copy
 

Modified: axis/axis2/java/core/trunk/modules/metadata/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/pom.xml?rev=980169&r1=980168&r2=980169&view=diff
==
--- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Wed Jul 28 19:14:23 2010
@@ -142,7 +142,7 @@
 maven-dependency-plugin
 
 
-generate-sources
+generate-resources
 
 copy
 




svn commit: r980242 - in /axis/axis2/java/core/trunk: ./ modules/distribution/src/main/assembly/ modules/documentation/src/site/ modules/integration/ modules/jaxws-integration/ modules/jaxws/ modules/

2010-07-28 Thread veithen
Author: veithen
Date: Wed Jul 28 21:45:31 2010
New Revision: 980242

URL: http://svn.apache.org/viewvc?rev=980242&view=rev
Log:
1. Moved the site from the documentation module to the root project. This has 
different advantages:

* It conforms to the standard Maven project layout.
* Generating the Javadocs becomes straightforward. No need for fancy ant 
scripts.
* We will be able to use other aggregator-style reporting plugins if we want to.
* We will be able to include sites for selected submodules. This is interesting 
for the AAR/MAR Maven plugins, because maven-plugin-plugin can be used to 
generate documentation based on the annotations on the Mojos. This would avoid 
the problem of out of date documentation for these plugins.

2. Moved the docs assembly from the distribution module to the root project and 
modified the POM and assembly descriptor to include a copy of the site instead 
of the Xdocs (see discussion on the mailing list). This is now triggered in the 
apache-release profile.

3. Disabled some reporting plugins (changes, surefire-report, etc.) activated 
in various submodules. They were not executed in the old build process (because 
the site was built in the documentation submodule), but cause troubles now that 
the site is in the root project. This will require some more cleanup.

Note that this is kind of a revert of the changes made for AXIS2-2966. However, 
there is no regression because we simply build the docs distribution in a 
different way.

Added:
axis/axis2/java/core/trunk/src/main/assembly/doc.xml
  - copied, changed from r979883, 
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/doc-assembly.xml
axis/axis2/java/core/trunk/src/site/
  - copied from r979883, 
axis/axis2/java/core/trunk/modules/documentation/src/site/
Removed:

axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/doc-assembly.xml
axis/axis2/java/core/trunk/modules/documentation/src/site/
Modified:
axis/axis2/java/core/trunk/modules/integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws/pom.xml
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/trunk/pom.xml

Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Wed Jul 28 21:45:31 
2010
@@ -394,12 +394,12 @@
 
 
 
-
+
 

Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Wed Jul 28 
21:45:31 2010
@@ -1457,12 +1457,12 @@
 
 
 
-
+
 

Modified: axis/axis2/java/core/trunk/modules/jaxws/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==
--- axis/axis2/java/core/trunk/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/pom.xml Wed Jul 28 21:45:31 2010
@@ -381,12 +381,12 @@
 
 
 
-
+
 

Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Wed Jul 28 21:45:31 2010
@@ -1278,4 +1278,19 @@
 
 
 
+
+
+
+maven-project-info-reports-plugin
+2.1.1
+
+
+
+
+
+
+
+
+
 

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml?rev=980242&r1=980241&r2=980242&vie