www/axis2: 1.6.2 -> 1.6.4

Changes:
  http://axis.apache.org/axis2/java/core/release-notes/1.6.3.html
  http://axis.apache.org/axis2/java/core/release-notes/1.6.4.html
  fixes approx. 55 issues

PR:		206024
Submitted by:	w.schwarzenfeld@aon.at

3 files changed, 92 insertions, 61 deletions

diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index a73b8392228..a476893ff4d 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	axis2
-PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTVERSION=	1.6.4
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/axis/${PORTNAME}/java/core/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -60,7 +59,6 @@ do-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/{} \;
-	${FIND} -d ${STAGEDIR}${EXAMPLESDIR} -type d -empty -exec ${RMDIR} {} \;
 	cd ${WRKSRC}/samples && ${FIND} . -type f -not -name '*.class' -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;
 .endif
 
diff --git a/www/axis2/distinfo b/www/axis2/distinfo
index 30635b336d1..5b4f84b1fc3 100644
--- a/www/axis2/distinfo
+++ b/www/axis2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (axis2-1.6.2-bin.zip) = d79d0432402c922acbcfbcff81a17f65c510165b01941810c5a5e919c276260a
-SIZE (axis2-1.6.2-bin.zip) = 20592286
+SHA256 (axis2-1.6.4-bin.zip) = d9bf3ae99bec5489bde43815289230d76e2460e6ad4f6ae431a524db0c38398a
+SIZE (axis2-1.6.4-bin.zip) = 21592298
diff --git a/www/axis2/pkg-plist b/www/axis2/pkg-plist
index 22136ea6bf8..522a8d0384f 100644
--- a/www/axis2/pkg-plist
+++ b/www/axis2/pkg-plist
@@ -1,3 +1,14 @@
+%%APPHOME%%/webapps/axis2/WEB-INF/classes/META-INF/LICENSE
+%%APPHOME%%/webapps/axis2/WEB-INF/classes/META-INF/NOTICE
+%%APPHOME%%/webapps/axis2/WEB-INF/classes/commons-logging.properties
+%%APPHOME%%/webapps/axis2/WEB-INF/classes/log4j.properties
+%%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/transport/http/AxisAdminServlet.class
+%%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/webapp/AdminAgent.class
+%%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/webapp/AxisAdminServlet.class
+%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy.%%CONF_EXT%%
+%%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml.%%CONF_EXT%%
+%%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties.%%CONF_EXT%%
+%%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties.%%CONF_EXT%%
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/XmlSchema-1.4.7.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/XmlSchema-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/activation-1.1.jar
@@ -6,45 +17,50 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/antlr-2.7.7.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/apache-mime4j-core-0.7.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/apache-mime4j-core-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-api-1.2.13.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-api-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-dom-1.2.13.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-dom-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-impl-1.2.13.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-impl-LICENSE.txt
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-LICENSE.txt
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-api-1.2.15.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-compat-1.2.15.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-dom-1.2.15.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-impl-1.2.15.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-codegen-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-ant-plugin-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-clustering-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-codegen-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-corba-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-fastinfoset-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-java2wsdl-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxbri-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxws-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jibx-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-json-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-kernel-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-metadata-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-mtompolicy-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-saaj-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-soapmonitor-servlet-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-spring-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-http-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-local-1.6.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-xmlbeans-1.6.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-codegen-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-ant-plugin-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-clustering-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-codegen-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-corba-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-fastinfoset-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-java2wsdl-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxbri-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxws-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jibx-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-json-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-kernel-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-metadata-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-mtompolicy-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-saaj-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-soapmonitor-servlet-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-spring-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-base-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-http-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-jms-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-local-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-mail-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-tcp-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-udp-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-xmpp-1.6.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-xmlbeans-1.6.4.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/bcel-5.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/bcel-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-cli-1.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-cli-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-codec-1.3.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-codec-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-fileupload-1.2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-fileupload-1.3.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-fileupload-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-httpclient-3.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-httpclient-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-io-1.4.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-io-2.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-io-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-logging-1.1.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-logging-LICENSE.txt
@@ -73,17 +89,17 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxb-impl-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxb-xjc-2.1.7.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxb-xjc-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxen-1.1.1.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxen-1.1.6.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxen-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxws-tools-2.1.3.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxws-tools-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/jettison-1.0-RC2.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/jettison-1.3.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jettison-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jibx-bind-1.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jibx-bind-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jibx-run-1.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jibx-run-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/jsr311-api-1.0.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/jsr311-api-1.1.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jsr311-api-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/juli-6.0.16.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/juli-LICENSE.txt
@@ -91,11 +107,13 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/log4j-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/mail-1.4.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/mail-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/mex-1.6.2-impl.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/mex-1.6.4-impl.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/neethi-3.0.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/neethi-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/regexp-1.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/regexp-LICENSE.txt
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/stax2-api-3.1.1.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/stax2-api.LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/tribes-6.0.16.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/tribes-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/woden-api-1.0M9.jar
@@ -104,28 +122,26 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/woden-impl-commons-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/woden-impl-dom-1.0M9.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/woden-impl-dom-LICENSE.txt
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/woodstox-core-asl-4.2.0.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/woodstox-core-asl-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/wsdl4j-1.6.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/wsdl4j-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/wstx-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/wstx-asl-3.2.9.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/xalan-2.7.0.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/xalan-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/xml-resolver-1.2.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/xml-resolver-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/xmlbeans-2.3.0.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/xmlbeans-LICENSE.txt
-@sample %%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.policy.sample
-@sample %%APPHOME%%/webapps/axis2/WEB-INF/conf/axis2.xml.sample
-@sample %%APPHOME%%/webapps/axis2/WEB-INF/conf/commons-logging.properties.sample
-@sample %%APPHOME%%/webapps/axis2/WEB-INF/conf/log4j.properties.sample
-%%APPHOME%%/webapps/axis2/WEB-INF/classes/META-INF/LICENSE
-%%APPHOME%%/webapps/axis2/WEB-INF/classes/META-INF/NOTICE
-%%APPHOME%%/webapps/axis2/WEB-INF/classes/commons-logging.properties
-%%APPHOME%%/webapps/axis2/WEB-INF/classes/log4j.properties
-%%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/transport/http/AxisAdminServlet.class
-%%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/webapp/AdminAgent.class
-%%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/webapp/AxisAdminServlet.class
-@sample %%APPHOME%%/webapps/axis2/WEB-INF/web.xml.sample
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/addressing-1.6.4.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/mex-1.6.4.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/modules.list
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/mtompolicy-1.6.4.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/ping-1.6.4.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/scripting-1.6.4.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/soapmonitor-1.6.4.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/services/services.list
+%%APPHOME%%/webapps/axis2/WEB-INF/services/version.aar
+%%APPHOME%%/webapps/axis2/WEB-INF/web.xml.%%CONF_EXT%%
 %%APPHOME%%/webapps/axis2/axis2-web/ActivateService.jsp
 %%APPHOME%%/webapps/axis2/axis2-web/EngageToServiceGroup.jsp
 %%APPHOME%%/webapps/axis2/axis2-web/Error/AuthError.html
@@ -177,12 +193,29 @@
 %%APPHOME%%/webapps/axis2/axis2-web/viewServiceContext.jsp
 %%APPHOME%%/webapps/axis2/axis2-web/viewServiceGroupContext.jsp
 %%APPHOME%%/webapps/axis2/axis2-web/viewphases.jsp
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/addressing-1.6.2.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/mex-1.6.2.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/modules.list
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/mtompolicy-1.6.2.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/ping-1.6.2.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/scripting-1.6.2.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/soapmonitor-1.6.2.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/services/services.list
-%%APPHOME%%/webapps/axis2/WEB-INF/services/version.aar
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/databinding/docs
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/pojoguidespring/src/lib
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/version/target/aar/%%CONF_EXT%%/axisversion
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/version/target/classes/%%CONF_EXT%%/axisversion
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/classes/META-INF
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/transport/http
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/transport
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2/webapp
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache/axis2
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/classes/org/apache
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/classes/org
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/classes
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/conf
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/lib/endorsed
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/lib
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/modules
+@dir %%APPHOME%%/webapps/axis2/WEB-INF/services
+@dir %%APPHOME%%/webapps/axis2/WEB-INF
+@dir %%APPHOME%%/webapps/axis2/axis2-web/Error
+@dir %%APPHOME%%/webapps/axis2/axis2-web/css
+@dir %%APPHOME%%/webapps/axis2/axis2-web/images
+@dir %%APPHOME%%/webapps/axis2/axis2-web/include
+@dir %%APPHOME%%/webapps/axis2/axis2-web
+@dir %%APPHOME%%/webapps/axis2
+@dir %%APPHOME%%/webapps
+@dir %%APPHOME%%