Author: thomas.diesler(a)jboss.com
Date: 2008-04-07 09:23:23 -0400 (Mon, 07 Apr 2008)
New Revision: 6244
Removed:
stack/native/trunk/src/main/java/org/jboss/annotation/
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
stack/native/trunk/src/test/resources/test-excludes-jboss500.txt
stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
[JBWS-2107] Resolve dependency on @SecurityDomain
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
===================================================================
---
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2008-04-07
10:43:00 UTC (rev 6243)
+++
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2008-04-07
13:23:23 UTC (rev 6244)
@@ -27,7 +27,6 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
@@ -77,7 +76,8 @@
String ejbLink = beanMetaData.getEjbName();
JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData,
beanClass, ejbLink);
- // setup the security domain
+ /* Resolve dependency on @SecurityDomain
+ *
http://jira.jboss.org/jira/browse/JBWS-2107
if (beanClass.isAnnotationPresent(SecurityDomain.class))
{
SecurityDomain anSecurityDomain =
(SecurityDomain)beanClass.getAnnotation(SecurityDomain.class);
@@ -88,6 +88,7 @@
wsMetaData.setSecurityDomain(securityDomain);
}
+ */
}
}
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-07 10:43:00
UTC (rev 6243)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-07 13:23:23
UTC (rev 6244)
@@ -21,3 +21,8 @@
# [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime
org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
+# [JBWS-2107] Resolve dependency on @SecurityDomain
+org/jboss/test/ws/jaxws/webserviceref/Secure**
+org/jboss/test/ws/jaxws/samples/dar/**
+org/jboss/test/ws/jaxws/samples/news/**
+org/jboss/test/ws/jaxws/jbws1840/**
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-07 10:43:00
UTC (rev 6243)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-07 13:23:23
UTC (rev 6244)
@@ -30,3 +30,8 @@
# [JBAS-5257] jboss:service=defaultClassLoader is not registered with dynamic webapp
deployment
org/jboss/test/ws/jaxws/endpoint/**
+# [JBWS-2107] Resolve dependency on @SecurityDomain
+org/jboss/test/ws/jaxws/webserviceref/Secure**
+org/jboss/test/ws/jaxws/samples/dar/**
+org/jboss/test/ws/jaxws/samples/news/**
+org/jboss/test/ws/jaxws/jbws1840/**