Author: alessio.soldano(a)jboss.com Date: 2010-08-24 18:44:47 -0400 (Tue, 24 Aug 2010) New Revision: 12848 Modified: stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsconsume.bat stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsconsume.sh stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsprovide.bat stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsprovide.sh stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsrunclient.bat stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsrunclient.sh stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/resources/deploy.conf stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java Log: [JBWS-3079] Remove remaining references to Jetty in scripts and fixing deploy/undeploy macros Modified: stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsconsume.bat 2010-08-24 22:43:19 UTC (rev 12847) +++ stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsconsume.bat 2010-08-24 22:44:47 UTC (rev 12848) @@ -61,7 +61,6 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-jms.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-local.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http-jetty.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-addr.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-policy.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-rm.jar Modified: stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsconsume.sh 2010-08-24 22:43:19 UTC (rev 12847) +++ stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsconsume.sh 2010-08-24 22:44:47 UTC (rev 12848) @@ -100,7 +100,6 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-transports-jms.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-transports-local.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-transports-http.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-transports-http-jetty.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-ws-addr.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-ws-policy.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-ws-rm.jar" Modified: stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsprovide.bat 2010-08-24 22:43:19 UTC (rev 12847) +++ stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsprovide.bat 2010-08-24 22:44:47 UTC (rev 12848) @@ -59,7 +59,6 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-javascript.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-management.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http-jetty.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-jms.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-local.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-addr.jar Modified: stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsprovide.sh 2010-08-24 22:43:19 UTC (rev 12847) +++ stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsprovide.sh 2010-08-24 22:44:47 UTC (rev 12848) @@ -101,7 +101,6 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-javascript.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-management.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-http.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-http-jetty.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-jms.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-local.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-ws-addr.jar" Modified: stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-08-24 22:43:19 UTC (rev 12847) +++ stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-08-24 22:44:47 UTC (rev 12848) @@ -80,7 +80,6 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-javascript.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-management.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http-jetty.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-jms.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-local.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-addr.jar Modified: stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-08-24 22:43:19 UTC (rev 12847) +++ stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-08-24 22:44:47 UTC (rev 12848) @@ -100,7 +100,6 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-javascript.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-management.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-transports-http.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-transports-http-jetty.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-transports-jms.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-transports-local.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-ws-addr.jar" Modified: stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/resources/deploy.conf =================================================================== --- stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/resources/deploy.conf 2010-08-24 22:43:19 UTC (rev 12847) +++ stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/resources/deploy.conf 2010-08-24 22:44:47 UTC (rev 12848) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/wscommons-policy.ja! r client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-cxf-* lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/jaxws-httpserver-httpspi.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossw! s-spi.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-cxf-* lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar Modified: stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-08-24 22:43:19 UTC (rev 12847) +++ stack/cxf/branches/cxf-2.3/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-08-24 22:44:47 UTC (rev 12848) @@ -42,7 +42,6 @@ <include name="**/jbossws-spi.jar"/> <include name="**/jbossws-cxf-transports-httpserver.jar"/> <include name="**/jdom.jar"/> - <include name="**/jetty*.jar"/> <include name="**/neethi.jar"/> <include name="**/saaj-api.jar"/> <include name="**/stax-api.jar"/> Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-24 22:43:19 UTC (rev 12847) +++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-24 22:44:47 UTC (rev 12848) @@ -64,7 +64,7 @@ super(); this.metadata = metadata; bus = new JBossWSNonSpringBusFactory().createBus(); - //Force servlet transport to prevent CXF from using Jetty as a transport + //Force servlet transport to prevent CXF from using Jetty or other transports ExtensionManager em = bus.getExtension(ExtensionManager.class); em.activateAllByType(ConduitInitiator.class); //need to activate/register all the beans implementing ConduitInitiator so that does not happen later DestinationFactory factory = new ServletTransportFactory(bus); Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2010-08-24 22:43:19 UTC (rev 12847) +++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2010-08-24 22:44:47 UTC (rev 12848) @@ -95,7 +95,7 @@ log.trace("Could not load additional config from location: " + location, e); } } - //Force servlet transport to prevent CXF from using Jetty as a transport + //Force servlet transport to prevent CXF from using Jetty or other transports DestinationFactory factory = new ServletTransportFactory(bus); for (String s : factory.getTransportIds()) {