3 files changed, 43 insertions, 58 deletions

diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index 430a0946f12c..16be557906b8 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	axis2
-PORTVERSION=	1.7.0
+PORTVERSION=	1.7.1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/axis/${PORTNAME}/java/core/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -41,7 +41,7 @@ JAVA_VERSION=	1.6+
 SHAREOWN=	www
 SHAREGRP=	www
 PLIST_SUB+=	APPHOME=${APPHOME:S|^${PREFIX}/||} \
-		CONF_EXT=${CONF_EXT}
+		CONF_EXT=${CONF_EXT} PORTVERSION=${PORTVERSION}
 CONF_EXT=	sample
 
 PORTEXAMPLES=	*
diff --git a/www/axis2/distinfo b/www/axis2/distinfo
index 5fd621c0d570..d40d462f51d1 100644
--- a/www/axis2/distinfo
+++ b/www/axis2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (axis2-1.7.0-bin.zip) = 075008c4a87c86c90e28a2e56bdfa11abf6adb9351f96777f1edc0a576f0fbf7
-SIZE (axis2-1.7.0-bin.zip) = 24920244
+SHA256 (axis2-1.7.1-bin.zip) = cf0ddefbf82689fc06c5b7b7aa10786794f45e9e21563a2a780e672e5c96708f
+SIZE (axis2-1.7.1-bin.zip) = 22362277
diff --git a/www/axis2/pkg-plist b/www/axis2/pkg-plist
index dc3d4033e66d..bea8377faae0 100644
--- a/www/axis2/pkg-plist
+++ b/www/axis2/pkg-plist
@@ -9,7 +9,7 @@
 %%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-LICENSE.txt
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/xmlschema-core-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/activation-1.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/activation-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/antlr-2-LICENSE.txt
@@ -22,33 +22,33 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-impl-1.2.17.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-jaxb-1.2.17.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-codegen-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-ant-plugin-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-clustering-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-codegen-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-corba-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-fastinfoset-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-java2wsdl-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxbri-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxws-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jibx-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-json-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-kernel-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-metadata-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-mtompolicy-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-saaj-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-soapmonitor-servlet-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-spring-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-base-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-http-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-jms-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-local-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-mail-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-tcp-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-udp-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-xmpp-1.7.0.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-xmlbeans-1.7.0.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-codegen-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-ant-plugin-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-clustering-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-codegen-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-corba-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-fastinfoset-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-java2wsdl-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxbri-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jaxws-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-jibx-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-json-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-kernel-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-metadata-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-mtompolicy-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-saaj-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-soapmonitor-servlet-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-spring-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-base-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-http-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-jms-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-local-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-mail-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-tcp-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-udp-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-transport-xmpp-%%PORTVERSION%%.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-xmlbeans-%%PORTVERSION%%.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/bcel-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/bcel-findbugs-6.0.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/commons-cli-1.2.jar
@@ -78,16 +78,14 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/geronimo-ws-metadata-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/geronimo-ws-metadata_2.0_spec-1.1.2.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/gmbal-api-only-3.1.0-b001.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/gson-2.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/ha-api-3.1.8.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/gson-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/httpclient-4.2.1.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/httpclient-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/httpcore-4.2.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/httpcore-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/istack-commons-runtime-2.4.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jalopy-1.5rc3.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jalopy-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/javax.annotation-3.1.1.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxb-api-2.2.6.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxb-api-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxb-impl-2.2.6.jar
@@ -96,7 +94,6 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxb-xjc-LICENSE.txt
 %%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-rt-2.2.6.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxws-tools-2.2.6.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jaxws-tools-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/jettison-1.3.jar
@@ -105,36 +102,24 @@
 %%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/jsr181-api-1.0-MR1.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
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/junit-4.4.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/log4j-1.2.15.jar
 %%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/management-api-3.0.0-b012.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/mex-1.7.0-impl.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/mimepull-1.8.jar
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/mex-%%PORTVERSION%%-impl.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/neethi-3.0.3.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/neethi-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/policy-2.3.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/regexp-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/relaxngDatatype-20020414.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/stax-ex-1.4.jar
 %%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/streambuffer-1.2.jar
 %%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/txw2-20110809.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/woden-api-LICENSE.txt
+%%APPHOME%%/webapps/axis2/WEB-INF/lib/woden-core-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/woden-core-1.0M10.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/woden-impl-commons-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/woden-impl-dom-LICENSE.txt
-%%APPHOME%%/webapps/axis2/WEB-INF/lib/woodstox-core-asl-4.1.2.jar
+%%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
@@ -145,13 +130,13 @@
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/xmlbeans-2.5.0.jar
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/xmlbeans-LICENSE.txt
 %%APPHOME%%/webapps/axis2/WEB-INF/lib/xmlschema-core-2.2.1.jar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/addressing-1.7.0.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/mex-1.7.0.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/addressing-%%PORTVERSION%%.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/mex-%%PORTVERSION%%.mar
 %%APPHOME%%/webapps/axis2/WEB-INF/modules/modules.list
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/mtompolicy-1.7.0.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/ping-1.7.0.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/scripting-1.7.0.mar
-%%APPHOME%%/webapps/axis2/WEB-INF/modules/soapmonitor-1.7.0.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/mtompolicy-%%PORTVERSION%%.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/ping-%%PORTVERSION%%.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/scripting-%%PORTVERSION%%.mar
+%%APPHOME%%/webapps/axis2/WEB-INF/modules/soapmonitor-%%PORTVERSION%%.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%%