From 5ce83ed3fa197ef2b35fbad9281b02c8dbe24f69 Mon Sep 17 00:00:00 2001 From: Marek Goldmann <mgoldman@redhat.com> Date: Thu, 21 Jun 2012 16:18:28 +0200 Subject: [PATCH] Remove javax.jws.api. This is part of the JDK. --- build/build.xml | 6 ----- build/pom.xml | 7 ------ .../resources/modules/javaee/api/main/module.xml | 1 - .../resources/modules/javax/api/main/module.xml | 1 + .../modules/javax/jws/api/main/module.xml | 29 ---------------------- .../modules/org/apache/cxf/main/module.xml | 1 - .../org/jboss/as/webservices/main/module.xml | 1 - .../webservices/server/integration/main/module.xml | 1 - .../modules/org/jboss/metadata/main/module.xml | 1 - .../modules/org/jboss/ws/common/main/module.xml | 1 - .../ws/cxf/jbossws-cxf-server/main/module.xml | 1 - .../ws/native/jbossws-native-core/main/module.xml | 1 - .../modules/org/jboss/xts/main/module.xml | 5 ---- 13 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 build/src/main/resources/modules/javax/jws/api/main/module.xml diff --git a/build/build.xml b/build/build.xml index 63995ba..f4ef723 100644 --- a/build/build.xml +++ b/build/build.xml @@ -388,12 +388,6 @@ <maven-resource group="org.jboss.spec.javax.jms" artifact="jboss-jms-api_1.1_spec"/> </module-def> - <!-- - <module-def name="javax.jws.api"> - <maven-resource group="javax.jws" artifact="jsr181-api"/> - </module-def> - --> - <module-def name="javax.management.j2ee.api"> <maven-resource group="org.jboss.spec.javax.management.j2ee" artifact="jboss-j2eemgmt-api_1.1_spec"/> </module-def> diff --git a/build/pom.xml b/build/pom.xml index 0cb1306..1541a0e 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -318,13 +318,6 @@ <artifactId>javax.inject</artifactId> </dependency> - <!-- - <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - </dependency> - --> - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> diff --git a/build/src/main/resources/modules/javaee/api/main/module.xml b/build/src/main/resources/modules/javaee/api/main/module.xml index a0c5f12..a8c65c7 100644 --- a/build/src/main/resources/modules/javaee/api/main/module.xml +++ b/build/src/main/resources/modules/javaee/api/main/module.xml @@ -36,7 +36,6 @@ <module name="javax.inject.api" export="true"/> <module name="javax.interceptor.api" export="true"/> <module name="javax.jms.api" export="true"/> - <module name="javax.jws.api" export="true"/> <module name="javax.mail.api" export="true"/> <module name="javax.management.j2ee.api" export="true"/> <module name="javax.persistence.api" export="true"/> diff --git a/build/src/main/resources/modules/javax/api/main/module.xml b/build/src/main/resources/modules/javax/api/main/module.xml index 3206521..a675b7a 100644 --- a/build/src/main/resources/modules/javax/api/main/module.xml +++ b/build/src/main/resources/modules/javax/api/main/module.xml @@ -38,6 +38,7 @@ <path name="javax/imageio/plugins/jpeg"/> <path name="javax/imageio/spi"/> <path name="javax/imageio/stream"/> + <path name="javax/jws"/> <path name="javax/lang/model"/> <path name="javax/lang/model/element"/> <path name="javax/lang/model/type"/> diff --git a/build/src/main/resources/modules/javax/jws/api/main/module.xml b/build/src/main/resources/modules/javax/jws/api/main/module.xml deleted file mode 100644 index 3332464..0000000 --- a/build/src/main/resources/modules/javax/jws/api/main/module.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="javax.jws.api"> - <resources> - <!-- Insert resources here --> - </resources> -</module> diff --git a/build/src/main/resources/modules/org/apache/cxf/main/module.xml b/build/src/main/resources/modules/org/apache/cxf/main/module.xml index 24cce6e..91e8fec 100644 --- a/build/src/main/resources/modules/org/apache/cxf/main/module.xml +++ b/build/src/main/resources/modules/org/apache/cxf/main/module.xml @@ -36,7 +36,6 @@ <module name="javax.api" /> <module name="javax.annotation.api" /> <module name="javax.jms.api" /> - <module name="javax.jws.api" /> <module name="javax.mail.api" /> <module name="javax.resource.api" /> <module name="javax.servlet.api" /> diff --git a/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml b/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml index c8b2bca..1d7d8fe 100644 --- a/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml +++ b/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml @@ -35,7 +35,6 @@ <module name="javax.annotation.api"/> <module name="javax.api"/> <module name="javax.ejb.api"/> - <module name="javax.jws.api"/> <module name="javax.servlet.api"/> <module name="javax.xml.ws.api"/> <module name="org.jboss.ejb3"/> diff --git a/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml b/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml index 559ff3f..0129380 100644 --- a/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml +++ b/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml @@ -32,7 +32,6 @@ <dependencies> <module name="javax.api" export="true"/> - <module name="javax.jws.api" export="true"/> <module name="javax.wsdl4j.api" export="true"/> <module name="javax.xml.ws.api" export="true"/> <module name="com.sun.xml.bind" services="export" export="true"/> diff --git a/build/src/main/resources/modules/org/jboss/metadata/main/module.xml b/build/src/main/resources/modules/org/jboss/metadata/main/module.xml index 4d41ac8..6b0f69e 100644 --- a/build/src/main/resources/modules/org/jboss/metadata/main/module.xml +++ b/build/src/main/resources/modules/org/jboss/metadata/main/module.xml @@ -36,7 +36,6 @@ <module name="javax.api"/> <module name="javax.ejb.api"/> <module name="javax.interceptor.api"/> - <module name="javax.jws.api"/> <module name="javax.persistence.api"/> <module name="javax.servlet.api"/> <module name="javax.servlet.jsp.api"/> diff --git a/build/src/main/resources/modules/org/jboss/ws/common/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/common/main/module.xml index 3295568..5f2673b 100644 --- a/build/src/main/resources/modules/org/jboss/ws/common/main/module.xml +++ b/build/src/main/resources/modules/org/jboss/ws/common/main/module.xml @@ -37,7 +37,6 @@ <module name="javax.annotation.api"/> <module name="javax.xml.stream.api"/> <module name="javax.ejb.api"/> - <module name="javax.jws.api"/> <module name="javax.servlet.api"/> <module name="javax.wsdl4j.api" /> <module name="javax.xml.ws.api"/> diff --git a/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml index f2ffe48..67373a7 100644 --- a/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml +++ b/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml @@ -35,7 +35,6 @@ <dependencies> <module name="javax.api" /> <module name="javax.servlet.api" /> - <module name="javax.jws.api" /> <module name="javax.wsdl4j.api" /> <module name="javax.xml.bind.api" /> <module name="javax.xml.stream.api" /> diff --git a/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml index 8230bbc..a06092f 100644 --- a/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml +++ b/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml @@ -38,7 +38,6 @@ <module name="com.sun.xml.fastinfoset" optional="true"/> <module name="javax.api" /> <module name="javax.servlet.api" /> - <module name="javax.jws.api" /> <module name="javax.mail.api" /> <module name="javax.wsdl4j.api" /> <module name="javax.xml.bind.api" /> diff --git a/build/src/main/resources/modules/org/jboss/xts/main/module.xml b/build/src/main/resources/modules/org/jboss/xts/main/module.xml index 114e769..23cf11d 100644 --- a/build/src/main/resources/modules/org/jboss/xts/main/module.xml +++ b/build/src/main/resources/modules/org/jboss/xts/main/module.xml @@ -41,11 +41,6 @@ <module name="javax.xml.stream.api"/> <!-- this is needed to get javax.xml.namespace.QName but it would be better if it were exposed on its own --> <module name="javax.api"/> - <!-- this is needed because our endpoints are not in a normal deployment and we need to be able - to resolve the javax.jws.WebService annotation attached to them. presumably an endpoint - found in a deployment gets this package auto-added to its module loader - --> - <module name="javax.jws.api"/> <!-- this is needed to ensure @Resource annotations on the JaxWS endpoint classes are in the classloader scope--> <module name="javax.annotation.api"/>