November 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15234 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws2241 and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-11-11 02:17:42 -0500 (Fri, 11 Nov 2011) New Revision: 15234 Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-ejb3.xml Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java Log: fixing DD driven security configuration for AS7 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-11-10 16:48:14 UTC (rev 15233) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-11-11 07:17:42 UTC (rev 15234) @@ -698,6 +698,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2241/META-INF"> <include name="jboss.xml" /> + <include name="jboss-ejb3.xml" /> <include name="jboss-webservices.xml" /> </metainf> </jar> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2011-11-10 16:48:14 UTC (rev 15233) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2011-11-11 07:17:42 UTC (rev 15234) @@ -45,7 +45,7 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar"); + return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar", !isTargetJBoss6()); } public void setUp() throws MalformedURLException Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-ejb3.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-ejb3.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-ejb3.xml 2011-11-11 07:17:42 UTC (rev 15234) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> + +<jboss:jboss + xmlns:jboss="http://www.jboss.com/xml/ns/javaee" + xmlns:spec="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd + http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd" + version="3.1" + impl-version="2.0"> + + <spec:assembly-descriptor> + <security xmlns="urn:security"> + <spec:ejb-name>EJB3Bean</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <spec:security-role> + <spec:role-name>friend</spec:role-name> + </spec:security-role> + </spec:assembly-descriptor> + +</jboss:jboss>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15233 - in stack/native/trunk: modules/testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-11-10 11:48:14 -0500 (Thu, 10 Nov 2011) New Revision: 15233 Modified: stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: Fixing jboss-as-webservices-tests-integration version and moving jboss710.version from testsuite pom.xml to main pom.xml Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-11-10 16:25:54 UTC (rev 15232) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-11-10 16:48:14 UTC (rev 15233) @@ -916,7 +916,7 @@ <profile> <id>jboss710</id> <properties> - <jboss.version>7.1.0.Alpha2-SNAPSHOT</jboss.version> + <jboss.version>${jboss710.version}</jboss.version> <jbossws.integration.target>jboss710</jbossws.integration.target> <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> </properties> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2011-11-10 16:25:54 UTC (rev 15232) +++ stack/native/trunk/pom.xml 2011-11-10 16:48:14 UTC (rev 15233) @@ -52,7 +52,7 @@ <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version> <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version> <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version> - <jboss700.version>7.0.0.Final</jboss700.version> + <jboss710.version>7.1.0.Alpha2-SNAPSHOT</jboss710.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <ant.version>1.7.1</ant.version> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> @@ -134,7 +134,7 @@ <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss700.version}</version> + <version>${jboss710.version}</version> </dependency>  <dependency>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15232 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-11-10 11:25:54 -0500 (Thu, 10 Nov 2011) New Revision: 15232 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-10 16:25:17 UTC (rev 15231) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-10 16:25:54 UTC (rev 15232) @@ -1140,7 +1140,6 @@ <profile> <id>jboss710</id> <properties> -  <jboss.version>${jboss710.version}</jboss.version> <jbossws.integration.target>jboss710</jbossws.integration.target> </properties>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15231 - in stack/cxf/trunk: modules/testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-11-10 11:25:17 -0500 (Thu, 10 Nov 2011) New Revision: 15231 Modified: stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: Fixing jboss-as-webservices-tests-integration version and moving jboss710.version from testsuite pom.xml to main pom.xml Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-10 11:38:50 UTC (rev 15230) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-10 16:25:17 UTC (rev 15231) @@ -1140,7 +1140,8 @@ <profile> <id>jboss710</id> <properties> - <jboss.version>7.1.0.Alpha2-SNAPSHOT</jboss.version> +  + <jboss.version>${jboss710.version}</jboss.version> <jbossws.integration.target>jboss710</jbossws.integration.target> </properties> <dependencies> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-11-10 11:38:50 UTC (rev 15230) +++ stack/cxf/trunk/pom.xml 2011-11-10 16:25:17 UTC (rev 15231) @@ -53,7 +53,7 @@ <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version> <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version> <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version> - <jboss700.version>7.0.0.Final</jboss700.version> + <jboss710.version>7.1.0.Alpha2-SNAPSHOT</jboss710.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.4.4</cxf.version> <cxf.asm.version>3.3</cxf.asm.version> @@ -157,7 +157,7 @@ <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss700.version}</version> + <version>${jboss710.version}</version> </dependency> <dependency> <groupId>org.jboss.ws.projects</groupId>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15230 - in stack/cxf/trunk/modules: testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-11-10 06:38:50 -0500 (Thu, 10 Nov 2011) New Revision: 15230 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointTwoImpl.java Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml Log: [JBWS-3363] Properly deal with multiple endpoints in the same deployement extending each other Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2011-11-09 16:14:04 UTC (rev 15229) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2011-11-10 11:38:50 UTC (rev 15230) @@ -58,7 +58,6 @@ private UnifiedVirtualFile deploymentRoot; - @SuppressWarnings("unchecked") @Override public void customize(Object beanInstance) { @@ -78,7 +77,7 @@ { for (Endpoint depEndpoint : depEndpoints) { - if (depEndpoint.getTargetBeanClass().isAssignableFrom(factory.getServiceBean().getClass())) + if (depEndpoint.getTargetBeanClass().getName().equals(factory.getServiceBean().getClass().getName())) { depEndpoint.addAttachment(ServerFactoryBean.class, factory); } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java 2011-11-09 16:14:04 UTC (rev 15229) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOne.java 2011-11-10 11:38:50 UTC (rev 15230) @@ -25,7 +25,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "ServiceOne") +@WebService(targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype") @SOAPBinding(style = SOAPBinding.Style.RPC) public interface EndpointOne { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java 2011-11-09 16:14:04 UTC (rev 15229) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java 2011-11-10 11:38:50 UTC (rev 15230) @@ -29,10 +29,10 @@ import org.jboss.logging.Logger; -@WebService(name = "EJBEndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "EJBServiceOne") +@WebService(targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "EJBServiceOne", portName ="EJBEndpointOnePort", endpointInterface = "org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOne") @SOAPBinding(style = SOAPBinding.Style.RPC) @Stateless -public class EndpointOneEJB3Impl +public class EndpointOneEJB3Impl implements EndpointOne { private volatile static int count = 0; @@ -40,7 +40,7 @@ public String echo(String input) { Logger.getLogger(this.getClass()).info("echo: " + input); - count++; + count = count + 5; return input; } @@ -49,7 +49,7 @@ public void echoOneWay(String input) { Logger.getLogger(this.getClass()).info("echoOneWay: " + input); - count++; + count = count + 5; } @WebMethod Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java 2011-11-09 16:14:04 UTC (rev 15229) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java 2011-11-10 11:38:50 UTC (rev 15230) @@ -29,9 +29,9 @@ import org.jboss.logging.Logger; -@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "ServiceOne") +@WebService(targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "ServiceOne", portName ="EndpointOnePort", endpointInterface = "org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOne") @SOAPBinding(style = SOAPBinding.Style.RPC) -public class EndpointOneImpl +public class EndpointOneImpl implements EndpointOne { private volatile static int count = 0; Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointTwoImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointTwoImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointTwoImpl.java 2011-11-10 11:38:50 UTC (rev 15230) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.test.ws.jaxws.cxf.mixtype; + + +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +@WebService(targetNamespace = "http://org.jboss.ws.jaxws.cxf/mixtype", serviceName = "ServiceOne", portName ="EndpointTwoPort", endpointInterface = "org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOne") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class EndpointTwoImpl extends EndpointOneImpl +{ + @WebMethod + public String echo(String input) + { + Logger.getLogger(this.getClass()).info("echo: " + input); + return super.echo(input); + } + + @WebMethod + @Oneway + public void echoOneWay(String input) + { + Logger.getLogger(this.getClass()).info("echoOneWay: " + input); + super.echoOneWay(input); + } + + @WebMethod + public int getCount() + { + return super.getCount(); + } +} + Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-11-09 16:14:04 UTC (rev 15229) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-11-10 11:38:50 UTC (rev 15230) @@ -22,7 +22,6 @@ package org.jboss.test.ws.jaxws.cxf.mixtype; import java.net.URL; -import java.util.Iterator; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -35,7 +34,8 @@ public class MixedTypeTestCase extends JBossWSTest { private final String endpointURL = "http://" + getServerHost() + ":8080/mixtype/ServiceOne/EndpointOne"; - private final String ejbEndpointURL = "http://" + getServerHost() + ":8080/mixtype/EJBServiceOne/EJBEndpointOne"; + private final String endpoint2URL = "http://" + getServerHost() + ":8080/mixtype/ServiceOne/EndpointTwo"; + private final String ejbEndpointURL = "http://" + getServerHost() + ":8080/mixtype/EJBServiceOne/EndpointOneEJB3Impl"; private String targetNS = "http://org.jboss.ws.jaxws.cxf/mixtype"; @@ -46,24 +46,36 @@ public void testEndpoint() throws Exception { - URL wsdlOneURL = new URL(endpointURL + "?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); - Service serviceOne = Service.create(wsdlOneURL, serviceOneName); - EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EndpointOnePort"), EndpointOne.class); + Service service = Service.create(wsdlOneURL, serviceOneName); + EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EndpointOnePort"), EndpointOne.class); + int initialCount = endpoint.getCount(); assertEquals("mixedType", endpoint.echo("mixedType")); - assertEquals(1, endpoint.getCount()); + assertEquals(1, endpoint.getCount() - initialCount); } public void testEJBEndpoint() throws Exception { URL wsdlOneURL = new URL(ejbEndpointURL + "?wsdl"); QName serviceOneName = new QName(targetNS, "EJBServiceOne"); - Service serviceOne = Service.create(wsdlOneURL, serviceOneName); - EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EJBEndpointOnePort"), EndpointOne.class); + Service service = Service.create(wsdlOneURL, serviceOneName); + EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EJBEndpointOnePort"), EndpointOne.class); + int initialCount = endpoint.getCount(); assertEquals("mixedType", endpoint.echo("mixedType")); - assertEquals(1, endpoint.getCount()); + assertEquals(5, endpoint.getCount() - initialCount); } + public void testEndpoint2() throws Exception + { + //verify everything works with an endpoint extending another one impl + URL wsdlOneURL = new URL(endpoint2URL + "?wsdl"); + QName serviceOneName = new QName(targetNS, "ServiceOne"); + Service service = Service.create(wsdlOneURL, serviceOneName); + EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EndpointTwoPort"), EndpointOne.class); + int initialCount = endpoint.getCount(); + assertEquals("mixedType", endpoint.echo("mixedType")); + assertEquals(1, endpoint.getCount() - initialCount); + } } \ No newline at end of file Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2011-11-09 16:14:04 UTC (rev 15229) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2011-11-10 11:38:50 UTC (rev 15230) @@ -7,8 +7,16 @@ <servlet-name>Ep1Servlet</servlet-name> <servlet-class>org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl</servlet-class> </servlet> + <servlet> + <servlet-name>Ep2Servlet</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.cxf.mixtype.EndpointTwoImpl</servlet-class> + </servlet> <servlet-mapping> <servlet-name>Ep1Servlet</servlet-name> <url-pattern>/ServiceOne/EndpointOne</url-pattern> </servlet-mapping> + <servlet-mapping> + <servlet-name>Ep2Servlet</servlet-name> + <url-pattern>/ServiceOne/EndpointTwo</url-pattern> + </servlet-mapping> </web-app>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15229 - stack/native/trunk/modules/dist/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-11-09 11:14:04 -0500 (Wed, 09 Nov 2011) New Revision: 15229 Modified: stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml Log: Fix project generator regression Modified: stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-11-09 16:12:21 UTC (rev 15228) +++ stack/native/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-11-09 16:14:04 UTC (rev 15229) @@ -31,6 +31,13 @@ <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/> <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/> <taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/> + + <condition property="jbossws.integration.jboss7" value="true"> + <or> + <equals arg1="${jbossws.integration.jboss700}" arg2="true"/> + <equals arg1="${jbossws.integration.jboss710}" arg2="true"/> + </or> + </condition> </target> <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project"> @@ -104,7 +111,7 @@ <target name="configure-project" depends="configure-project-6,configure-project-7"> </target> - <target name="configure-project-7" if="jbossws.integration.jboss70"> + <target name="configure-project-7" if="jbossws.integration.jboss7">  <mkdir dir="${project.home}/src/main/java"/> <mkdir dir="${project.home}/src/main/resources"/> <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml">

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15228 - stack/cxf/trunk/modules/dist/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-11-09 11:12:21 -0500 (Wed, 09 Nov 2011) New Revision: 15228 Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml Log: Fixing project generator regressions Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-11-09 14:43:49 UTC (rev 15227) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-11-09 16:12:21 UTC (rev 15228) @@ -28,6 +28,13 @@ <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/> <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/> <taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/> + + <condition property="jbossws.integration.jboss7" value="true"> + <or> + <equals arg1="${jbossws.integration.jboss700}" arg2="true"/> + <equals arg1="${jbossws.integration.jboss710}" arg2="true"/> + </or> + </condition> </target> <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project"> @@ -101,7 +108,7 @@ <target name="configure-project" depends="configure-project-6,configure-project-7"> </target> - <target name="configure-project-7" if="jbossws.integration.jboss70"> + <target name="configure-project-7" if="jbossws.integration.jboss7">  <mkdir dir="${project.home}/src/main/java"/> <mkdir dir="${project.home}/src/main/resources"/> <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml">

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15227 - stack/native/trunk/modules/dist/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-11-09 09:43:49 -0500 (Wed, 09 Nov 2011) New Revision: 15227 Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml Log: Set proper jbossws.integration.target in bin-dist Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-11-09 14:43:22 UTC (rev 15226) +++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-11-09 14:43:49 UTC (rev 15227) @@ -53,12 +53,12 @@ <equals arg1="${jbossws.integration.target}" arg2="jboss610"/> </or> </condition> - <condition property="jbossws.integration.jboss70" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> - </or> + <condition property="jbossws.integration.jboss700" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> </condition> + <condition property="jbossws.integration.jboss710" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> + </condition> <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15226 - stack/cxf/trunk/modules/dist/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-11-09 09:43:22 -0500 (Wed, 09 Nov 2011) New Revision: 15226 Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml Log: Set proper jbossws.integration.target in bin-dist Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-11-09 14:42:17 UTC (rev 15225) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-11-09 14:43:22 UTC (rev 15226) @@ -53,12 +53,12 @@ <equals arg1="${jbossws.integration.target}" arg2="jboss610"/> </or> </condition> - <condition property="jbossws.integration.jboss70" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> - </or> + <condition property="jbossws.integration.jboss700" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> </condition> + <condition property="jbossws.integration.jboss710" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> + </condition> <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15225 - shared-testsuite/trunk/testsuite/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-11-09 09:42:17 -0500 (Wed, 09 Nov 2011) New Revision: 15225 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: Split test-client-classpath declarations for jboss700 and jboss710 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-11-09 12:55:29 UTC (rev 15224) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-11-09 14:42:17 UTC (rev 15225) @@ -108,7 +108,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss70,tests-classpath-jboss60"> + <target name="tests-classpath" depends="tests-classpath-jboss710,tests-classpath-jboss700,tests-classpath-jboss60"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="integration.target.javac.classpath"/> @@ -199,7 +199,7 @@ </path> </target> - <target name="tests-classpath-jboss70" depends="tests-prepare" if="jbossws.integration.jboss70"> + <target name="tests-classpath-jboss700" depends="tests-prepare" if="jbossws.integration.jboss700"> <path id="integration.target.javac.classpath"> <fileset dir="${jboss.home}/modules/javax/activation/api/main/"> @@ -309,6 +309,127 @@ <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/"> <include name="jboss-sasl-*.jar"/> </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/xnio/main/"> + <include name="xnio-api-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/"> + <include name="xnio-nio-*.jar"/> + </fileset> + <pathelement location="${tools.jar}"/> + </path> + </target> + + + <target name="tests-classpath-jboss710" depends="tests-prepare" if="jbossws.integration.jboss710"> + + <path id="integration.target.javac.classpath"> + <fileset dir="${jboss.home}/modules/javax/activation/api/main/"> + <include name="activation-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/mail/api/main/"> + <include name="mail-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/"> + <include name="jboss-common-core-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> + <include name="jboss-logging-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/ejb/api/main/"> + <include name="jboss-ejb-api_3.1_spec-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/ejb3/main/"> + <include name="jboss-ejb3-ext-api-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/servlet/api/main/"> + <include name="jboss-servlet-api_3.0_spec-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/annotation/api/main/"> + <include name="jboss-annotations-api_1.1_spec-*.jar"/> + </fileset> + </path> + +  + <path id="integration.target.client.classpath"> + <pathelement location="${thirdparty.dir}/jboss-as-webservices-tests-integration.jar"/>  + <pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/>  + <pathelement location="${thirdparty.dir}/jnp-client.jar"/>  + <pathelement location="${jboss.home}/jboss-modules.jar"/> + <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> + <include name="jboss-logging-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/as/controller/main/"> + <include name="jboss-as-controller-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/as/controller-client/main/"> + <include name="jboss-as-controller-client-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/as/server/main/"> + <include name="jboss-as-server-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/as/protocol/main/"> + <include name="jboss-as-protocol-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/dmr/main/"> + <include name="jboss-dmr-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/marshalling/main/"> + <include name="jboss-marshalling-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/slf4j/main/"> + <include name="slf4j-api-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/slf4j/jcl-over-slf4j/main/"> + <include name="jcl-over-slf4j-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/slf4j/impl/main/"> + <include name="slf4j-jboss-logmanager-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/logmanager/main/"> + <include name="jboss-logmanager-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/apache/log4j/main/"> + <include name="log4j-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/mail/api/main/"> + <include name="mail-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/servlet/api/main/"> + <include name="jboss-servlet-api_3.0_spec-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/threads/main/"> + <include name="jboss-threads-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/picketbox/main/"> + <include name="picketbox-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/ejb/api/main/"> + <include name="jboss-ejb-api_3.1_spec-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/apache/xerces/main/"> + <include name="xercesImpl-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/"> + <include name="jboss-common-core-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/javassist/main/"> + <include name="javassist-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/security/jacc/api/main/"> + <include name="jboss-jacc-api*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/remoting3/main/"> + <include name="jboss-remoting-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/"> + <include name="jboss-sasl-*.jar"/> + </fileset>  <fileset dir="${jboss.home}/modules/org/jboss/netty/main/"> <include name="netty-*.jar"/>

13 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits November 2011