JBossWS SVN: r14639 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-28 06:24:24 -0400 (Tue, 28 Jun 2011)
New Revision: 14639
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-28 10:20:14 UTC (rev 14638)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-28 10:24:24 UTC (rev 14639)
@@ -1026,7 +1026,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/management/recording/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
13 years, 6 months
JBossWS SVN: r14638 - in stack/native/trunk/modules/testsuite: native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-28 06:20:14 -0400 (Tue, 28 Jun 2011)
New Revision: 14638
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBMETA-334] use EJB3 annotations for now. There's no support for DD driven security-domain configuration on AS7
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2011-06-28 10:16:12 UTC (rev 14637)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2011-06-28 10:20:14 UTC (rev 14638)
@@ -32,13 +32,14 @@
import org.jboss.logging.Logger;
import org.jboss.ws.api.annotation.EndpointConfig;
import org.jboss.ws.api.annotation.WebContext;
+import org.jboss.ejb3.annotation.SecurityDomain;
-
@Stateless
@WebService(name = "Hello", serviceName = "HelloService", targetNamespace = "http://org.jboss.ws/jbws1988")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@WebContext(contextRoot = "/jaxws-jbws1988", urlPattern = "/*")
@EndpointConfig(configName = "Standard WSSecurity Endpoint")
+@SecurityDomain(value="JBossWSDigest")
@RolesAllowed({"friend"})
public class HelloJavaBean
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java 2011-06-28 10:16:12 UTC (rev 14637)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java 2011-06-28 10:20:14 UTC (rev 14638)
@@ -29,16 +29,17 @@
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.WebServiceContext;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.ws.api.annotation.EndpointConfig;
import org.jboss.ws.api.annotation.WebContext;
-
@Stateless
@WebService(name = "Hello", serviceName = "HelloService", targetNamespace = "http://org.jboss.ws/jbws1991")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@WebContext(contextRoot = "/jaxws-jbws1991", urlPattern = "/*")
@EndpointConfig(configName = "Standard WSSecurity Endpoint")
+@SecurityDomain(value="JBossWS")
@RolesAllowed({"friend"})
public class HelloJavaBean
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2011-06-28 10:16:12 UTC (rev 14637)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2011-06-28 10:20:14 UTC (rev 14638)
@@ -46,7 +46,7 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1991.jar");
+ return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1991.jar", !isTargetJBoss6());
}
public void testAuth() throws Exception
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-28 10:16:12 UTC (rev 14637)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-28 10:20:14 UTC (rev 14638)
@@ -833,11 +833,7 @@
<!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
-
- <!-- TODO: implement EJB security integration -->
- <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*</exclude>
</excludes>
</configuration>
</plugin>
13 years, 6 months
JBossWS SVN: r14637 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-28 06:16:12 -0400 (Tue, 28 Jun 2011)
New Revision: 14637
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
Log:
[JBMETA-334] use EJB3 annotations for now. There's no support for DD driven security-domain configuration on AS7
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2011-06-27 20:00:23 UTC (rev 14636)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2011-06-28 10:16:12 UTC (rev 14637)
@@ -41,6 +41,7 @@
import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.MessageContext;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.ws.common.DOMWriter;
import org.jboss.ws.api.util.DOMUtils;
import org.jboss.ws.api.annotation.AuthMethod;
@@ -67,8 +68,7 @@
)
// [JBWS-1339] @Security domain vs. <security-domain>
-//@SecurityDomain("JBossWS")
-
+@SecurityDomain("JBossWS")
@RolesAllowed("friend")
public class EndpointEJB
{
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-06-27 20:00:23 UTC (rev 14636)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-06-28 10:16:12 UTC (rev 14637)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.samples.context;
-import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -45,7 +44,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar");
+ return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar", !isTargetJBoss6());
}
public void setUp() throws Exception
13 years, 6 months
JBossWS SVN: r14636 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-27 16:00:23 -0400 (Mon, 27 Jun 2011)
New Revision: 14636
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-27 19:36:35 UTC (rev 14635)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-27 20:00:23 UTC (rev 14636)
@@ -1009,14 +1009,10 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!--# not yet supported on AS7 -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
-
<!-- EJB3 client API dependencies -->
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
<!-- TODO: Unexpected element 'class-loading' encountered -->
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
13 years, 6 months
JBossWS SVN: r14635 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-27 15:36:35 -0400 (Mon, 27 Jun 2011)
New Revision: 14635
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
cleanup excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-27 19:31:40 UTC (rev 14634)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-27 19:36:35 UTC (rev 14635)
@@ -812,8 +812,10 @@
<exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
- <!-- [AS7-1125] implement service-ref/wsdl-override parsing -->
+ <!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
@@ -832,10 +834,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
- <!-- [AS7-1101][JBWS-3322] fixing of these two issues will solve the following two tests -->
- <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
-
<!-- TODO: implement EJB security integration -->
<exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
13 years, 6 months
JBossWS SVN: r14634 - in stack/native/trunk/modules/testsuite: native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-27 15:31:40 -0400 (Mon, 27 Jun 2011)
New Revision: 14634
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes & fixing test
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2011-06-27 19:29:39 UTC (rev 14633)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2011-06-27 19:31:40 UTC (rev 14634)
@@ -41,7 +41,7 @@
return new JBossWSTestSetup
(
SecureNewsTestCase.class,
- "jaxws-samples-news-step2-newspaper.jar, jaxws-samples-news-step2-agency-client.jar"
+ "jaxws-samples-news-step2-newspaper.jar, jaxws-samples-news-step2-agency-client.jar", !isTargetJBoss6()
);
}
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-27 19:29:39 UTC (rev 14633)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-27 19:31:40 UTC (rev 14634)
@@ -812,6 +812,9 @@
<exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
+ <!-- [AS7-1125] implement service-ref/wsdl-override parsing -->
+ <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
+
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
@@ -837,11 +840,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*</exclude>
-
- <!-- TODO: tests using org.jboss.ejb3.annotation.SecurityDomain -->
- <exclude>org/jboss/test/ws/jaxws/samples/news/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
</excludes>
</configuration>
</plugin>
13 years, 6 months
JBossWS SVN: r14633 - in container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration: deployers and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-27 15:29:39 -0400 (Mon, 27 Jun 2011)
New Revision: 14633
Added:
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java
Modified:
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java
Log:
[JBWS-3323] adding ASIL abstraction classes
Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java 2011-06-27 19:29:39 UTC (rev 14633)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, 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.
+ */
+package org.jboss.webservices.integration;
+
+import javax.naming.Context;
+
+/**
+ * A minimum web service meta data representation that offers a generic
+ * way to access more fine grained meta data through {@link #getAnnotation(Class)}
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface WebServiceDeclaration
+{
+ /**
+ * A distinct identifier across deployments.<br>
+ * In case of EJB3 this would be the <code>ObjectName</code> under which get's registered with the MC.
+ * @return
+ */
+ String getContainerName();
+
+ /**
+ * An identifier within a deployment.
+ * In case of EJB3 this would be the <code>ejb-name</code>.
+ * @return a name, that can be used to susequently address the service impl.
+ */
+ String getComponentName();
+
+ /**
+ * Web service endpoint implementation class
+ * @return
+ */
+ String getComponentClassName();
+
+ /**
+ * Get a unified meta data view represented by an annotation.
+ *
+ * @param t
+ * @return
+ */
+ <T extends java.lang.annotation.Annotation> T getAnnotation(Class<T> t);
+}
Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java 2011-06-27 19:29:39 UTC (rev 14633)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, 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.
+ */
+package org.jboss.webservices.integration;
+
+import java.util.List;
+
+/**
+ * A web service deployment contains {@link WebServiceDeclaration} declarations.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface WebServiceDeployment
+{
+ List<WebServiceDeclaration> getServiceEndpoints();
+}
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-06-27 19:27:12 UTC (rev 14632)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-06-27 19:29:39 UTC (rev 14633)
@@ -40,8 +40,8 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-06-27 19:27:12 UTC (rev 14632)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-06-27 19:29:39 UTC (rev 14633)
@@ -28,7 +28,7 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-06-27 19:27:12 UTC (rev 14632)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-06-27 19:29:39 UTC (rev 14633)
@@ -25,7 +25,7 @@
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-06-27 19:27:12 UTC (rev 14632)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-06-27 19:29:39 UTC (rev 14633)
@@ -26,8 +26,8 @@
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
/**
* Creates new JAXWS EJB3 deployment.
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-06-27 19:27:12 UTC (rev 14632)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-06-27 19:29:39 UTC (rev 14633)
@@ -49,8 +49,8 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.spi.metadata.injection.ReferenceResolver;
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-06-27 19:27:12 UTC (rev 14632)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-06-27 19:29:39 UTC (rev 14633)
@@ -29,8 +29,8 @@
import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-06-27 19:27:12 UTC (rev 14632)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-06-27 19:29:39 UTC (rev 14633)
@@ -32,8 +32,8 @@
import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
/**
* Creates web app security meta data for EJB 3 deployment.
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-06-27 19:27:12 UTC (rev 14632)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-06-27 19:29:39 UTC (rev 14633)
@@ -39,8 +39,8 @@
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
/**
* JBoss AS integration helper class.
13 years, 6 months
JBossWS SVN: r14632 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-27 15:27:12 -0400 (Mon, 27 Jun 2011)
New Revision: 14632
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
Log:
fixing test
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2011-06-27 19:25:33 UTC (rev 14631)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2011-06-27 19:27:12 UTC (rev 14632)
@@ -48,7 +48,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(SecurityDomainTestCase.class, "jaxws-samples-securityDomain.jar");
+ return new JBossWSTestSetup(SecurityDomainTestCase.class, "jaxws-samples-securityDomain.jar", !isTargetJBoss6());
}
private SecureEndpoint getPort() throws Exception
13 years, 6 months
JBossWS SVN: r14631 - common/trunk/src/test/java/org/jboss/test/ws/common.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-27 15:25:33 -0400 (Mon, 27 Jun 2011)
New Revision: 14631
Modified:
common/trunk/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java
common/trunk/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java
Log:
[JBWS-3323] fixing test to match new SPI packages hierarchy
Modified: common/trunk/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java
===================================================================
--- common/trunk/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2011-06-27 19:24:04 UTC (rev 14630)
+++ common/trunk/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2011-06-27 19:25:33 UTC (rev 14631)
@@ -50,16 +50,12 @@
assertNotNull(children);
assertTrue(children.size() > 0);
UnifiedVirtualFile unifiedVirtualFile = null;
- UnifiedVirtualFile integration = null;
for (UnifiedVirtualFile uvf : children)
{
if (uvf.getName().equals(UnifiedVirtualFile.class.getSimpleName() + ".class"))
unifiedVirtualFile = uvf;
- else if (uvf.getName().equals("integration/"))
- integration = uvf;
}
assertNotNull(unifiedVirtualFile);
- assertNotNull(integration);
assertTrue(unifiedVirtualFile.getChildren().size() == 0);
}
Modified: common/trunk/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java
===================================================================
--- common/trunk/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2011-06-27 19:24:04 UTC (rev 14630)
+++ common/trunk/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2011-06-27 19:25:33 UTC (rev 14631)
@@ -53,16 +53,12 @@
assertNotNull(children);
assertTrue(children.size() > 0);
UnifiedVirtualFile unifiedVirtualFile = null;
- UnifiedVirtualFile integration = null;
for (UnifiedVirtualFile uvf : children)
{
if (uvf.getName().equals(UnifiedVirtualFile.class.getSimpleName() + ".class"))
unifiedVirtualFile = uvf;
- else if (uvf.getName().equals("integration/"))
- integration = uvf;
}
assertNotNull(unifiedVirtualFile);
- assertNotNull(integration);
assertTrue(unifiedVirtualFile.getChildren().size() == 0);
}
13 years, 6 months