JBossWS SVN: r12242 - in thirdparty/cxf/tags/cxf-2.2.6: maven-plugins/archetypes/cxf-jaxws-javafirst and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-17 09:09:03 -0400 (Mon, 17 May 2010)
New Revision: 12242
Modified:
thirdparty/cxf/tags/cxf-2.2.6/integration/jca/
thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/archetypes/cxf-jaxws-javafirst/
thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/corba/
thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/java2ws-plugin/
thirdparty/cxf/tags/cxf-2.2.6/systests/wsdl_maven/
thirdparty/cxf/tags/cxf-2.2.6/systests/wsdl_maven/java2ws/
thirdparty/cxf/tags/cxf-2.2.6/tools/javato/ws/
thirdparty/cxf/tags/cxf-2.2.6/tools/validator/
thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/frontend/jaxws/
Log:
[JBPAPP-2994] Further svn:ignore props
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/integration/jca
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/archetypes/cxf-jaxws-javafirst
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/corba
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/java2ws-plugin
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/systests/wsdl_maven
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/systests/wsdl_maven/java2ws
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/javato/ws
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/validator
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/frontend/jaxws
___________________________________________________________________
Name: svn:ignore
+ target
14 years, 7 months
- 1
- 0
JBossWS SVN: r12241 - in thirdparty/cxf/tags/cxf-2.2.6: api and 89 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-17 08:54:29 -0400 (Mon, 17 May 2010)
New Revision: 12241
Modified:
thirdparty/cxf/tags/cxf-2.2.6/
thirdparty/cxf/tags/cxf-2.2.6/api/
thirdparty/cxf/tags/cxf-2.2.6/benchmark/
thirdparty/cxf/tags/cxf-2.2.6/benchmark/benchmark1/
thirdparty/cxf/tags/cxf-2.2.6/benchmark/benchmark1/wsdl/
thirdparty/cxf/tags/cxf-2.2.6/benchmark/performance/
thirdparty/cxf/tags/cxf-2.2.6/benchmark/performance/base/
thirdparty/cxf/tags/cxf-2.2.6/benchmark/performance/complex_type/
thirdparty/cxf/tags/cxf-2.2.6/benchmark/performance/etc/
thirdparty/cxf/tags/cxf-2.2.6/benchmark/profiling/
thirdparty/cxf/tags/cxf-2.2.6/bin/
thirdparty/cxf/tags/cxf-2.2.6/buildtools/
thirdparty/cxf/tags/cxf-2.2.6/common/
thirdparty/cxf/tags/cxf-2.2.6/common/common/
thirdparty/cxf/tags/cxf-2.2.6/common/schemas/
thirdparty/cxf/tags/cxf-2.2.6/common/wstx-msv-validation/
thirdparty/cxf/tags/cxf-2.2.6/common/xerces-xsd-validation/
thirdparty/cxf/tags/cxf-2.2.6/common/xjc/
thirdparty/cxf/tags/cxf-2.2.6/common/xjc/boolean-test/
thirdparty/cxf/tags/cxf-2.2.6/common/xjc/boolean/
thirdparty/cxf/tags/cxf-2.2.6/common/xjc/bug671/
thirdparty/cxf/tags/cxf-2.2.6/common/xjc/dv-test/
thirdparty/cxf/tags/cxf-2.2.6/common/xjc/dv/
thirdparty/cxf/tags/cxf-2.2.6/common/xjc/ts-test/
thirdparty/cxf/tags/cxf-2.2.6/common/xjc/ts/
thirdparty/cxf/tags/cxf-2.2.6/common/xsd/
thirdparty/cxf/tags/cxf-2.2.6/distribution/
thirdparty/cxf/tags/cxf-2.2.6/distribution/bundle/
thirdparty/cxf/tags/cxf-2.2.6/etc/
thirdparty/cxf/tags/cxf-2.2.6/integration/
thirdparty/cxf/tags/cxf-2.2.6/integration/jbi/
thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/
thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/archetypes/
thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/codegen-plugin/
thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/wsdl-validator-plugin/
thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/xml2fastinfoset-plugin/
thirdparty/cxf/tags/cxf-2.2.6/parent/
thirdparty/cxf/tags/cxf-2.2.6/rt/
thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/
thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/coloc/
thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/corba/
thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/http/
thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/jbi/
thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/object/
thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/soap/
thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/xml/
thirdparty/cxf/tags/cxf-2.2.6/rt/core/
thirdparty/cxf/tags/cxf-2.2.6/rt/databinding/
thirdparty/cxf/tags/cxf-2.2.6/rt/databinding/aegis/
thirdparty/cxf/tags/cxf-2.2.6/rt/databinding/jaxb/
thirdparty/cxf/tags/cxf-2.2.6/rt/databinding/xmlbeans/
thirdparty/cxf/tags/cxf-2.2.6/rt/frontend/
thirdparty/cxf/tags/cxf-2.2.6/rt/frontend/jaxrs/
thirdparty/cxf/tags/cxf-2.2.6/rt/frontend/jaxws/
thirdparty/cxf/tags/cxf-2.2.6/rt/frontend/js/
thirdparty/cxf/tags/cxf-2.2.6/rt/frontend/simple/
thirdparty/cxf/tags/cxf-2.2.6/rt/javascript/
thirdparty/cxf/tags/cxf-2.2.6/rt/management/
thirdparty/cxf/tags/cxf-2.2.6/rt/testsupport/
thirdparty/cxf/tags/cxf-2.2.6/rt/transports/
thirdparty/cxf/tags/cxf-2.2.6/rt/transports/http-jetty/
thirdparty/cxf/tags/cxf-2.2.6/rt/transports/http-osgi/
thirdparty/cxf/tags/cxf-2.2.6/rt/transports/http/
thirdparty/cxf/tags/cxf-2.2.6/rt/transports/jbi/
thirdparty/cxf/tags/cxf-2.2.6/rt/transports/jms/
thirdparty/cxf/tags/cxf-2.2.6/rt/transports/local/
thirdparty/cxf/tags/cxf-2.2.6/rt/ws/
thirdparty/cxf/tags/cxf-2.2.6/rt/ws/addr/
thirdparty/cxf/tags/cxf-2.2.6/rt/ws/policy/
thirdparty/cxf/tags/cxf-2.2.6/rt/ws/rm/
thirdparty/cxf/tags/cxf-2.2.6/rt/ws/security/
thirdparty/cxf/tags/cxf-2.2.6/systests/
thirdparty/cxf/tags/cxf-2.2.6/systests/databinding/
thirdparty/cxf/tags/cxf-2.2.6/systests/jaxrs/
thirdparty/cxf/tags/cxf-2.2.6/systests/jaxws/
thirdparty/cxf/tags/cxf-2.2.6/systests/transports/
thirdparty/cxf/tags/cxf-2.2.6/systests/uncategorized/
thirdparty/cxf/tags/cxf-2.2.6/systests/ws-specs/
thirdparty/cxf/tags/cxf-2.2.6/systests/wsdl_maven/codegen/
thirdparty/cxf/tags/cxf-2.2.6/testutils/
thirdparty/cxf/tags/cxf-2.2.6/tools/
thirdparty/cxf/tags/cxf-2.2.6/tools/common/
thirdparty/cxf/tags/cxf-2.2.6/tools/corba/
thirdparty/cxf/tags/cxf-2.2.6/tools/javato/
thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/
thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/core/
thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/databinding/
thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/databinding/jaxb/
thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/frontend/javascript/
thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/misc/
thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/test/
Log:
[JBPAPP-2994] Adding svn:ignore
Property changes on: thirdparty/cxf/tags/cxf-2.2.6
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/api
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/benchmark
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/benchmark/benchmark1
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/benchmark/benchmark1/wsdl
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/benchmark/performance
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/benchmark/performance/base
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/benchmark/performance/complex_type
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/benchmark/performance/etc
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/benchmark/profiling
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/bin
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/buildtools
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/common
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/schemas
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/wstx-msv-validation
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/xerces-xsd-validation
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/xjc
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/xjc/boolean
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/xjc/boolean-test
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/xjc/bug671
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/xjc/dv
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/xjc/dv-test
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/xjc/ts
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/xjc/ts-test
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/common/xsd
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/distribution
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/distribution/bundle
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/etc
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/integration
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/integration/jbi
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/maven-plugins
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/archetypes
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/codegen-plugin
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/wsdl-validator-plugin
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/maven-plugins/xml2fastinfoset-plugin
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/parent
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/bindings
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/coloc
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/corba
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/http
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/jbi
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/object
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/soap
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/bindings/xml
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/core
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/databinding
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/databinding/aegis
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/databinding/jaxb
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/databinding/xmlbeans
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/frontend
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/frontend/jaxrs
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/frontend/jaxws
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/frontend/js
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/frontend/simple
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/javascript
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/management
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/testsupport
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/transports
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/transports/http
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/transports/http-jetty
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/transports/http-osgi
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/transports/jbi
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/transports/jms
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/transports/local
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/ws
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/ws/addr
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/ws/policy
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/ws/rm
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/rt/ws/security
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/systests
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/systests/databinding
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/systests/jaxrs
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/systests/jaxws
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/systests/transports
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/systests/uncategorized
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/systests/ws-specs
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/systests/wsdl_maven/codegen
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/testutils
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/common
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/corba
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/javato
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/core
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/databinding
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/databinding/jaxb
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/frontend/javascript
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/misc
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
Property changes on: thirdparty/cxf/tags/cxf-2.2.6/tools/wsdlto/test
___________________________________________________________________
Name: svn:ignore
+ .pmd
.checkstyle
.ruleset
target
eclipse-classes
.settings
.classpath
.project
.wtpmodules
14 years, 7 months
- 1
- 0
JBossWS SVN: r12239 - thirdparty and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-17 04:34:44 -0400 (Mon, 17 May 2010)
New Revision: 12239
Added:
thirdparty/
thirdparty/cxf/
thirdparty/cxf/branches/
thirdparty/cxf/tags/
Log:
[JBPAPP-2994] Creating svn repo area for CXF sources
14 years, 7 months
- 1
- 0
JBossWS SVN: r12238 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-14 11:17:30 -0400 (Fri, 14 May 2010)
New Revision: 12238
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
Log:
[JBWS-2210] Adding another testcase
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2010-05-14 15:08:02 UTC (rev 12237)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2010-05-14 15:17:30 UTC (rev 12238)
@@ -62,6 +62,24 @@
setupWsse(proxy, "kermit");
assertEquals("Secure Hello World!", proxy.sayHello());
}
+
+ public void testUnauthenticated() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy, "foo");
+ try
+ {
+ proxy.sayHello();
+ fail("User foo should not be authenticated.");
+ }
+ catch (Exception ex)
+ {
+ //expected
+ }
+ }
public void testUnauthorized() throws Exception
{
14 years, 7 months
- 1
- 0
JBossWS SVN: r12237 - in stack/cxf/trunk/modules: testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-14 11:08:02 -0400 (Fri, 14 May 2010)
New Revision: 12237
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java
Log:
[JBWS-2210] Minor changes
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2010-05-14 11:43:43 UTC (rev 12236)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2010-05-14 15:08:02 UTC (rev 12237)
@@ -21,8 +21,6 @@
*/
package org.jboss.wsf.stack.cxf.security.authentication;
-import java.util.Hashtable;
-
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2010-05-14 11:43:43 UTC (rev 12236)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2010-05-14 15:08:02 UTC (rev 12237)
@@ -21,22 +21,16 @@
*/
package org.jboss.wsf.stack.cxf.security.authentication;
-import java.util.Calendar;
+import java.security.Principal;
import java.util.Collections;
import java.util.Map;
-import java.security.Principal;
-import java.security.acl.Group;
import javax.security.auth.Subject;
-import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.security.SimplePrincipal;
import org.apache.cxf.ws.security.wss4j.AbstractUsernameTokenAuthenticatingInterceptor;
-
import org.jboss.logging.Logger;
-
import org.jboss.security.AuthenticationManager;
-
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
@@ -51,9 +45,6 @@
public class SubjectCreatingInterceptor extends AbstractUsernameTokenAuthenticatingInterceptor
{
private static final Logger log = Logger.getLogger(SubjectCreatingInterceptor.class);
- private static final int TIMESTAMP_FRESHNESS_THRESHOLD = 300;
-
- // private NonceStore nonceStore;
private SecurityAdaptorFactory secAdaptorFactory;
public SubjectCreatingInterceptor()
@@ -91,7 +82,7 @@
// verify timestamp and nonce if digest
if (isDigest)
{
- verifyUsernameToken(nonce, created);
+ //verifyUsernameToken(nonce, created);
// CallbackHandler cb = new UsernameTokenCallbackHandler(nonce, created);
// CallbackHandlerPolicyContextHandler.setCaallbackHandler(cb);
}
@@ -124,21 +115,26 @@
return subject;
}
+ /** TODO: JBWS-3028
+ private static final int TIMESTAMP_FRESHNESS_THRESHOLD = 300;
+ private NonceStore nonceStore;
+
private void verifyUsernameToken(String nonce, String created)
{
-// if (created != null)
-// {
-// Calendar cal = SimpleTypeBindings.unmarshalDateTime(created);
-// Calendar ref = Calendar.getInstance();
-// ref.add(Calendar.SECOND, -TIMESTAMP_FRESHNESS_THRESHOLD);
-// if (ref.after(cal))
-// throw new SecurityException("Request rejected since a stale timestamp has been provided: " + created);
-// }
-//
-// if (nonce != null)
-// {
-// if (nonceStore.hasNonce(nonce))
-// throw new SecurityException("Request rejected since a message with the same nonce has been recently received; nonce = " + nonce);
-// }
+ if (created != null)
+ {
+ Calendar cal = SimpleTypeBindings.unmarshalDateTime(created);
+ Calendar ref = Calendar.getInstance();
+ ref.add(Calendar.SECOND, -TIMESTAMP_FRESHNESS_THRESHOLD);
+ if (ref.after(cal))
+ throw new SecurityException("Request rejected since a stale timestamp has been provided: " + created);
+ }
+
+ if (nonce != null)
+ {
+ if (nonceStore.hasNonce(nonce))
+ throw new SecurityException("Request rejected since a message with the same nonce has been recently received; nonce = " + nonce);
+ }
}
+ */
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2010-05-14 11:43:43 UTC (rev 12236)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2010-05-14 15:08:02 UTC (rev 12237)
@@ -33,7 +33,7 @@
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
- if (!("kermit".equals(pc.getIdentifer()) && "thefrog".equals(pc.getPassword())))
- throw new SecurityException("User '" + pc.getIdentifer() + "' with password '" + pc.getPassword() + "' not allowed.");
+ if (!("kermit".equals(pc.getIdentifier()) && "thefrog".equals(pc.getPassword())))
+ throw new SecurityException("User '" + pc.getIdentifier() + "' with password '" + pc.getPassword() + "' not allowed.");
}
}
14 years, 7 months
- 1
- 0
JBossWS SVN: r12236 - common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-05-14 07:43:43 -0400 (Fri, 14 May 2010)
New Revision: 12236
Modified:
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/test/JBossWSTest.java
Log:
[JBPAPP-3813]:Give more time to copy the process inputstream and error stream in JBossWSTest.executeCommand()
Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2010-05-14 11:21:44 UTC (rev 12235)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2010-05-14 11:43:43 UTC (rev 12236)
@@ -172,10 +172,14 @@
// unfortunately the following threads are needed because of Windows behavior
System.out.println("Process input stream:");
System.err.println("Process error stream:");
- new Thread( inputStreamJob ).start();
- new Thread( errorStreamJob ).start();
+ Thread inputJob = new Thread(inputStreamJob);
+ Thread outputJob = new Thread(errorStreamJob);
try
- {
+ {
+ inputJob.start();
+ inputJob.join(5000);
+ outputJob.start();
+ outputJob.join(5000);
int statusCode = p.waitFor();
String fallbackMessage = "Process did exit with status " + statusCode;
assertTrue(message != null ? message : fallbackMessage, statusCode == 0);
14 years, 7 months
- 1
- 0
JBossWS SVN: r12235 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/resources/src/main/resources/resources and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-14 07:21:44 -0400 (Fri, 14 May 2010)
New Revision: 12235
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml
Removed:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-tp-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-tp-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-tp-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-tp-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-tp-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/tp-installer/
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/build.xml
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml
Log:
Removing references to "Tech Preview" and "tp"
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2010-05-14 10:04:52 UTC (rev 12234)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2010-05-14 11:21:44 UTC (rev 12235)
@@ -134,25 +134,25 @@
</zip>
</target>
- <target name="build-tp-installer" depends="prepare-deploy,os-init" description="Build the CXF Tech Preview Installer">
+ <target name="build-installer" depends="prepare-deploy,os-init" description="Build the CXF stack installer">
<echo/>
- <echo message="${mvn} ${maven.opts} -Ptp-installer package assembly:directory"/>
+ <echo message="${mvn} ${maven.opts} -Pinstaller package assembly:directory"/>
<echo/>
- <delete dir="${stack.output.dir}/jbossws-cxf-tp-installer"/>
+ <delete dir="${stack.output.dir}/jbossws-cxf-installer"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg line="${maven.opts} -Ptp-installer dependency:tree"/>
+ <arg line="${maven.opts} -Pinstaller dependency:tree"/>
</exec>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg line="${maven.opts} -Ptp-installer package assembly:directory"/>
+ <arg line="${maven.opts} -Pinstaller package assembly:directory"/>
</exec>
- <zip destfile="${stack.output.dir}/jbossws-cxf-tp-installer.zip">
+ <zip destfile="${stack.output.dir}/jbossws-cxf-installer.zip">
<zipfileset
- dir="${stack.output.dir}/jbossws-cxf-tp-installer"
+ dir="${stack.output.dir}/jbossws-cxf-installer"
includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example"
- prefix="jbossws-cxf-tp-installer"/>
+ prefix="jbossws-cxf-installer"/>
</zip>
</target>
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf (from rev 12228, stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-tp-installer.conf)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf 2010-05-14 11:21:44 UTC (rev 12235)
@@ -0,0 +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/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja!
r server/all/deploy/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-*
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-tp-installer.conf
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-tp-installer.conf 2010-05-14 10:04:52 UTC (rev 12234)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-tp-installer.conf 2010-05-14 11:21:44 UTC (rev 12235)
@@ -1 +0,0 @@
-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/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja!
r server/all/deploy/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-*
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf (from rev 12228, stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-tp-installer.conf)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf 2010-05-14 11:21:44 UTC (rev 12235)
@@ -0,0 +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/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja!
r server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-*
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-tp-installer.conf
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-tp-installer.conf 2010-05-14 10:04:52 UTC (rev 12234)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-tp-installer.conf 2010-05-14 11:21:44 UTC (rev 12235)
@@ -1 +0,0 @@
-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/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja!
r server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-*
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml (from rev 12228, stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml 2010-05-14 11:21:44 UTC (rev 12235)
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<project>
+
+ <!--
+ These patterns should be common for all supported containers.
+ All jars must also be declared in component-info.xml to ensure
+ that the AS build uses the same version.
+ -->
+ <patternset id="jbossws.bin.patternset">
+ <include name="**/wsconsume.bat"/>
+ <include name="**/wsconsume.sh"/>
+ <include name="**/wsprovide.bat"/>
+ <include name="**/wsprovide.sh"/>
+ <include name="**/wsrunclient.bat"/>
+ <include name="**/wsrunclient.sh"/>
+ </patternset>
+
+ <patternset id="jbossws.client.patternset">
+ <include name="**/cxf-*.jar"/>
+ <include name="**/commons-lang.jar"/>
+ <include name="**/jbossws-cxf-client*.jar"/>
+ <!-- <include name="**/jdom.jar"/> -->
+ <include name="**/neethi.jar"/>
+ <include name="**/spring-beans.jar"/>
+ <include name="**/spring-context.jar"/>
+ <include name="**/spring-core.jar"/>
+ <include name="**/XmlSchema.jar"/>
+ <include name="**/velocity.jar"/>
+ <!-- Do not replace these until they are really different
+ from the ones shipped with the JBoss ative EAP AS -->
+ <!-- <include name="**/jbossws-spi.jar"/> -->
+ <!-- <include name="**/jbossws-common.jar"/> -->
+ <!-- <include name="**/jbossws-framework.jar"/> -->
+ <!-- Already in the AS endorsed dir -->
+ <!-- <include name="**/xml-resolver.jar"/> -->
+ </patternset>
+ <!-- Copy these ones from the EAP AS common/lib so the MD5 is the same -->
+ <patternset id="jbossws.client.patternset2">
+ <include name="**/asm.jar"/>
+ <include name="**/commons-collections.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.patternset">
+ <include name="**/nothing-to-deploy"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.endorsed.patternset">
+ <include name="**/nothing-to-deploy"/>
+ </patternset>
+
+ <patternset id="jbossws.server.lib.patternset">
+ <include name="**/nothing-to-deploy"/>
+ <!-- Do not replace these until they are really different
+ from the ones shipped with the JBoss ative EAP AS -->
+ <!-- <include name="**/jbossws-common.jar"/> -->
+ <!-- <include name="**/jbossws-framework.jar"/> -->
+ <!-- <include name="**/jbossws-spi.jar"/> -->
+ </patternset>
+
+ <patternset id="jbossws.service.lib.patternset">
+ <include name="**/cxf-*.jar"/>
+ <!-- ws-metadata -->
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/jaxrpc-api.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jbossws-cxf-client*.jar"/>
+ <include name="**/jbossws-cxf-server*.jar"/>
+ <!-- <include name="**/jdom.jar"/> -->
+ <include name="**/neethi.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/saaj-impl.jar"/>
+ <include name="**/spring-beans.jar"/>
+ <include name="**/spring-context.jar"/>
+ <include name="**/spring-core.jar"/>
+ <include name="**/wss4j.jar"/>
+ <include name="**/XmlSchema.jar"/>
+ <!-- The ones below are not removed and there are no changes to them
+ so there is no need to override what is already there -->
+ <!-- <include name="**/FastInfoset.jar"/> -->
+ <!-- <include name="**/xmlsec.jar"/> -->
+ <!-- <include name="**/wsdl4j.jar"/> -->
+ <!-- Already in the AS common/lib and thus visible -->
+ <!-- <include name="**/asm.jar"/> -->
+ <!-- <include name="**/geronimo-javamail*.jar"/> -->
+ <!-- Already in the AS endorsed dir and thus visible -->
+ <!-- <include name="**/xml-resolver.jar"/> -->
+ </patternset>
+
+
+ <!-- ================================================================== -->
+ <!-- Deploy Bin -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-bin">
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
+ <fileset dir="@{artifactsdir}/bin">
+ <patternset refid="jbossws.bin.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-lib51">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib Endorsed -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-endorsed">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Client -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-client51">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ -->
+ <!-- END -->
+ </fileset>
+ </copy>
+ <!-- Copy these ones from the EAP AS common/lib so the MD5 is the same -->
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
+ <fileset dir="@{thirdpartydir}/../../common/lib">
+ <patternset refid="jbossws.client.patternset2"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Server Lib -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-server-lib51">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JUDDI Service -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-juddi-sar">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <unzip dest="@{targetdir}">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/juddi-service.sar"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/juddi.jar"/>
+ <include name="**/scout.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS Service -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-cxf51-sar">
+ <attribute name="thirdpartydir"/>
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <unzip dest="@{targetdir}/jbossws-management.war">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-cxf-management.war"/>
+ </fileset>
+ </unzip>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deployers -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deployers51">
+ <attribute name="thirdpartydir"/>
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}">
+ <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/nothing-to-deploy"/>
+ <!-- <include name="**/jbossws-common.jar"/> -->
+ <!-- <include name="**/jbossws-framework.jar"/> -->
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ -->
+ <!-- END -->
+ </fileset>
+ </copy>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true" verbose="true">
+ <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
+ <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+ -->
+ <!-- END -->
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jbossws-cxf51" depends="check-parameters">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib51 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
+ <macro-deploy-jbossws-cxf51-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <!-- No need to do this until we are actually changing something in it
+ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
+ -->
+ </target>
+
+ <target name="check-parameters">
+ <fail message="installserver must be specified" unless="installserver"/>
+ <fail message="artifactsdir must be specified" unless="artifactsdir"/>
+ <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Undeploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-undeploy-jbossws51">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!-- delete stale container integration jars -->
+ <!--
+ <delete verbose="true">
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
+ -->
+ <!-- END -->
+
+ <!-- delete content of last deployment -->
+ <delete verbose="true">
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}">
+ <exclude name="**/jbossws-spi.jar"/>
+ <exclude name="**/jbossws-common.jar"/>
+ <exclude name="**/jbossws-framework.jar"/>
+ </fileset>
+ </delete>
+
+ <!-- delete jbossws.sar -->
+ <delete dir="@{targetdir}" verbose="true"/>
+
+ <!-- No need to do this until we are actually changing something in it -->
+ <!-- delete juddi-service.sar -->
+ <!-- <delete dir="@{targetdir}/../juddi-service.sar" verbose="true"/> -->
+
+ </sequential>
+ </macrodef>
+
+</project>
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2010-05-14 10:04:52 UTC (rev 12234)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2010-05-14 11:21:44 UTC (rev 12235)
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project>
-
- <!--
- These patterns should be common for all supported containers.
- All jars must also be declared in component-info.xml to ensure
- that the AS build uses the same version.
- -->
- <patternset id="jbossws.bin.patternset">
- <include name="**/wsconsume.bat"/>
- <include name="**/wsconsume.sh"/>
- <include name="**/wsprovide.bat"/>
- <include name="**/wsprovide.sh"/>
- <include name="**/wsrunclient.bat"/>
- <include name="**/wsrunclient.sh"/>
- </patternset>
-
- <patternset id="jbossws.client.patternset">
- <include name="**/cxf-*.jar"/>
- <include name="**/commons-lang.jar"/>
- <include name="**/jbossws-cxf-client*.jar"/>
- <!-- <include name="**/jdom.jar"/> -->
- <include name="**/neethi.jar"/>
- <include name="**/spring-beans.jar"/>
- <include name="**/spring-context.jar"/>
- <include name="**/spring-core.jar"/>
- <include name="**/XmlSchema.jar"/>
- <include name="**/velocity.jar"/>
- <!-- Do not replace these until they are really different
- from the ones shipped with the JBoss ative EAP AS -->
- <!-- <include name="**/jbossws-spi.jar"/> -->
- <!-- <include name="**/jbossws-common.jar"/> -->
- <!-- <include name="**/jbossws-framework.jar"/> -->
- <!-- Already in the AS endorsed dir -->
- <!-- <include name="**/xml-resolver.jar"/> -->
- </patternset>
- <!-- Copy these ones from the EAP AS common/lib so the MD5 is the same -->
- <patternset id="jbossws.client.patternset2">
- <include name="**/asm.jar"/>
- <include name="**/commons-collections.jar"/>
- </patternset>
-
- <patternset id="jbossws.lib.patternset">
- <include name="**/nothing-to-deploy"/>
- </patternset>
-
- <patternset id="jbossws.lib.endorsed.patternset">
- <include name="**/nothing-to-deploy"/>
- </patternset>
-
- <patternset id="jbossws.server.lib.patternset">
- <include name="**/nothing-to-deploy"/>
- <!-- Do not replace these until they are really different
- from the ones shipped with the JBoss ative EAP AS -->
- <!-- <include name="**/jbossws-common.jar"/> -->
- <!-- <include name="**/jbossws-framework.jar"/> -->
- <!-- <include name="**/jbossws-spi.jar"/> -->
- </patternset>
-
- <patternset id="jbossws.service.lib.patternset">
- <include name="**/cxf-*.jar"/>
- <!-- ws-metadata -->
- <include name="**/jsr181-api.jar"/>
- <include name="**/jaxrpc-api.jar"/>
- <include name="**/jaxws-api.jar"/>
- <include name="**/jbossws-cxf-client*.jar"/>
- <include name="**/jbossws-cxf-server*.jar"/>
- <!-- <include name="**/jdom.jar"/> -->
- <include name="**/neethi.jar"/>
- <include name="**/saaj-api.jar"/>
- <include name="**/saaj-impl.jar"/>
- <include name="**/spring-beans.jar"/>
- <include name="**/spring-context.jar"/>
- <include name="**/spring-core.jar"/>
- <include name="**/wss4j.jar"/>
- <include name="**/XmlSchema.jar"/>
- <!-- The ones below are not removed and there are no changes to them
- so there is no need to override what is already there -->
- <!-- <include name="**/FastInfoset.jar"/> -->
- <!-- <include name="**/xmlsec.jar"/> -->
- <!-- <include name="**/wsdl4j.jar"/> -->
- <!-- Already in the AS common/lib and thus visible -->
- <!-- <include name="**/asm.jar"/> -->
- <!-- <include name="**/geronimo-javamail*.jar"/> -->
- <!-- Already in the AS endorsed dir and thus visible -->
- <!-- <include name="**/xml-resolver.jar"/> -->
- </patternset>
-
-
- <!-- ================================================================== -->
- <!-- Deploy Bin -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-bin">
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
- <fileset dir="@{artifactsdir}/bin">
- <patternset refid="jbossws.bin.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Lib -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-lib51">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Lib Endorsed -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-endorsed">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Client -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-client51">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.client.patternset"/>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <include name="**/jbossws-(a){jbossid}.jar"/>
- -->
- <!-- END -->
- </fileset>
- </copy>
- <!-- Copy these ones from the EAP AS common/lib so the MD5 is the same -->
- <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
- <fileset dir="@{thirdpartydir}/../../common/lib">
- <patternset refid="jbossws.client.patternset2"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Server Lib -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-server-lib51">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.server.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy JUDDI Service -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-juddi-sar">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}">
- <fileset dir="@{thirdpartydir}">
- <include name="**/juddi-service.sar"/>
- </fileset>
- </unzip>
- <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/juddi.jar"/>
- <include name="**/scout.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy JBossWS Service -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-cxf51-sar">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-cxf-management.war"/>
- </fileset>
- </unzip>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Deployers -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deployers51">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/nothing-to-deploy"/>
- <!-- <include name="**/jbossws-common.jar"/> -->
- <!-- <include name="**/jbossws-framework.jar"/> -->
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <include name="**/jbossws-(a){jbossid}.jar"/>
- -->
- <!-- END -->
- </fileset>
- </copy>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true" verbose="true">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
- </fileset>
- </copy>
- -->
- <!-- END -->
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy JBossWS -->
- <!-- ================================================================== -->
-
- <target name="deploy-jbossws-cxf51" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib51 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
- <macro-deploy-jbossws-cxf51-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <!-- No need to do this until we are actually changing something in it
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- -->
- </target>
-
- <target name="check-parameters">
- <fail message="installserver must be specified" unless="installserver"/>
- <fail message="artifactsdir must be specified" unless="artifactsdir"/>
- <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Undeploy JBossWS -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-undeploy-jbossws51">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!-- delete stale container integration jars -->
- <!--
- <delete verbose="true">
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
- -->
- <!-- END -->
-
- <!-- delete content of last deployment -->
- <delete verbose="true">
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}">
- <exclude name="**/jbossws-spi.jar"/>
- <exclude name="**/jbossws-common.jar"/>
- <exclude name="**/jbossws-framework.jar"/>
- </fileset>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}" verbose="true"/>
-
- <!-- No need to do this until we are actually changing something in it -->
- <!-- delete juddi-service.sar -->
- <!-- <delete dir="@{targetdir}/../juddi-service.sar" verbose="true"/> -->
-
- </sequential>
- </macrodef>
-
-</project>
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf (from rev 12228, stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-tp-installer.conf)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf 2010-05-14 11:21:44 UTC (rev 12235)
@@ -0,0 +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/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja!
r server/production/deploy/jbossws.sar server/production/deploy/juddi-service.sar server/production/deploy/jbossws-container-jboss-beans.xml server/production/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/production/deployers/jbossws.deployer/jbossws-native-core.jar server/production/deployers/jbossws.deployer/jettison.jar server/production/deployers/jbossws.deployer/policy.jar server/production/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-*
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-tp-installer.conf
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-tp-installer.conf 2010-05-14 10:04:52 UTC (rev 12234)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-tp-installer.conf 2010-05-14 11:21:44 UTC (rev 12235)
@@ -1 +0,0 @@
-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/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja!
r server/production/deploy/jbossws.sar server/production/deploy/juddi-service.sar server/production/deploy/jbossws-container-jboss-beans.xml server/production/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/production/deployers/jbossws.deployer/jbossws-native-core.jar server/production/deployers/jbossws.deployer/jettison.jar server/production/deployers/jbossws.deployer/policy.jar server/production/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-*
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf (from rev 12228, stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-tp-installer.conf)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf 2010-05-14 11:21:44 UTC (rev 12235)
@@ -0,0 +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/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja!
r server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-*
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-tp-installer.conf
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-tp-installer.conf 2010-05-14 10:04:52 UTC (rev 12234)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-tp-installer.conf 2010-05-14 11:21:44 UTC (rev 12235)
@@ -1 +0,0 @@
-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/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja!
r server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-*
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf (from rev 12228, stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-tp-installer.conf)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf 2010-05-14 11:21:44 UTC (rev 12235)
@@ -0,0 +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/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja!
r server/web/deploy/jbossws.sar server/web/deploy/juddi-service.sar server/web/deploy/jbossws-container-jboss-beans.xml server/web/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/web/deployers/jbossws.deployer/jbossws-native-core.jar server/web/deployers/jbossws.deployer/jettison.jar server/web/deployers/jbossws.deployer/policy.jar server/web/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-*
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-tp-installer.conf
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-tp-installer.conf 2010-05-14 10:04:52 UTC (rev 12234)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-tp-installer.conf 2010-05-14 11:21:44 UTC (rev 12235)
@@ -1 +0,0 @@
-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/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja!
r server/web/deploy/jbossws.sar server/web/deploy/juddi-service.sar server/web/deploy/jbossws-container-jboss-beans.xml server/web/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/web/deployers/jbossws.deployer/jbossws-native-core.jar server/web/deployers/jbossws.deployer/jettison.jar server/web/deployers/jbossws.deployer/policy.jar server/web/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-*
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-14 10:04:52 UTC (rev 12234)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-14 11:21:44 UTC (rev 12235)
@@ -724,21 +724,21 @@
</profile>
<!--
- Name: tp-installer
- Descr: Build the CXF Tech Preview Installer
+ Name: installer
+ Descr: Build the CXF Installer
-->
<profile>
- <id>tp-installer</id>
+ <id>installer</id>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <finalName>jbossws-cxf-tp-installer</finalName>
+ <finalName>jbossws-cxf-installer</finalName>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>src/main/scripts/assembly-tp-installer.xml</descriptor>
+ <descriptor>src/main/scripts/assembly-installer.xml</descriptor>
</descriptors>
</configuration>
</plugin>
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer (from rev 12228, stack/cxf/branches/jbossws-cxf-3.1.2/src/main/tp-installer)
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/tp-installer/build-deploy.xml 2010-05-13 15:38:57 UTC (rev 12228)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml 2010-05-14 11:21:44 UTC (rev 12235)
@@ -59,7 +59,7 @@
<!-- ================================================================== -->
<target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51">
- <fail message="Please make sure you're running this script from $JBOSS_HOME/jbossws-cxf-tp-installer" unless="jboss510.available"/>
+ <fail message="Please make sure you're running this script from $JBOSS_HOME/jbossws-cxf-installer" unless="jboss510.available"/>
<copy todir="${jboss510.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
</copy>
@@ -67,7 +67,7 @@
</target>
<target name="undeploy-jboss510" depends="init">
- <fail message="Please make sure you're running this script from your $JBOSS_HOME/jbossws-cxf-tp-installer" unless="jboss510.available"/>
+ <fail message="Please make sure you're running this script from your $JBOSS_HOME/jbossws-cxf-installer" unless="jboss510.available"/>
<macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/all/deploy/jbossws.sar" defaultconf="${jbossws.all.deploy.conf}"/>
<macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/production/deploy/jbossws.sar" defaultconf="${jbossws.production.deploy.conf}"/>
<macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/web/deploy/jbossws.sar" defaultconf="${jbossws.web.deploy.conf}"/>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/tp-installer/build.xml 2010-05-13 15:38:57 UTC (rev 12228)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml 2010-05-14 11:21:44 UTC (rev 12235)
@@ -9,7 +9,7 @@
<!-- -->
<!-- ====================================================================== -->
-<project basedir="." name="JBossWS-CXF-TP-Installer" default="install">
+<project basedir="." name="JBossWS-CXF-Installer" default="install">
<!-- ================================================================== -->
<!-- Setup -->
@@ -20,11 +20,11 @@
<property name="output.dir" value="${basedir}/output"/>
<property name="thirdparty.dir" value="${basedir}/deploy/lib"/>
<property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
- <property name="jbossws.default.deploy.conf" value="${build.dir}/default-deploy-tp-installer.conf"/>
- <property name="jbossws.standard.deploy.conf" value="${build.dir}/standard-deploy-tp-installer.conf"/>
- <property name="jbossws.production.deploy.conf" value="${build.dir}/production-deploy-tp-installer.conf"/>
- <property name="jbossws.web.deploy.conf" value="${build.dir}/web-deploy-tp-installer.conf"/>
- <property name="jbossws.all.deploy.conf" value="${build.dir}/all-deploy-tp-installer.conf"/>
+ <property name="jbossws.default.deploy.conf" value="${build.dir}/default-deploy-installer.conf"/>
+ <property name="jbossws.standard.deploy.conf" value="${build.dir}/standard-deploy-installer.conf"/>
+ <property name="jbossws.production.deploy.conf" value="${build.dir}/production-deploy-installer.conf"/>
+ <property name="jbossws.web.deploy.conf" value="${build.dir}/web-deploy-installer.conf"/>
+ <property name="jbossws.all.deploy.conf" value="${build.dir}/all-deploy-installer.conf"/>
<property name="jbossws.integration.target" value="jboss510"/>
<property name="jboss510.home" value="${basedir}/.."/>
@@ -32,7 +32,7 @@
<import file="${build.dir}/build-setup.xml"/>
<import file="${build.dir}/build-deploy.xml"/>
- <import file="${build.dir}/jbossws-tp-installer-macros.xml"/>
+ <import file="${build.dir}/jbossws-installer-macros.xml"/>
<!-- ================================================================== -->
<!-- Initialization -->
@@ -52,10 +52,8 @@
<!-- dummy targets -->
<target name="prepare-deploy" depends="init"/>
- <target name="install" depends="clean, deploy-jboss510" description="Install JBossWS-CXF Tech Preview">
+ <target name="install" depends="clean, deploy-jboss510" description="Install JBossWS-CXF">
<echo message="-----------------------------------------------------------------------"/>
- <echo message=" WARNING: JBossWS-CXF Tech Preview is not meant for production use yet"/>
- <echo message="-----------------------------------------------------------------------"/>
</target>
<target name="clean" depends="prepare">
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml (from rev 12228, stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml 2010-05-14 11:21:44 UTC (rev 12235)
@@ -0,0 +1,76 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>tech-preview-installer</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <!-- root -->
+ <fileSet>
+ <directory>src/main/installer</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>build.xml</include>
+ </includes>
+ </fileSet>
+ <!-- build -->
+ <fileSet>
+ <directory>src/main/installer</directory>
+ <outputDirectory>build</outputDirectory>
+ <includes>
+ <include>build-deploy.xml</include>
+ <include>build-setup.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>modules/resources/src/main/resources/resources</directory>
+ <outputDirectory>build</outputDirectory>
+ <includes>
+ <include>default-deploy-installer.conf</include>
+ <include>standard-deploy-installer.conf</include>
+ <include>all-deploy-installer.conf</include>
+ <include>production-deploy-installer.conf</include>
+ <include>web-deploy-installer.conf</include>
+ <include>jbossws-installer-macros.xml</include>
+ </includes>
+ </fileSet>
+ <!-- docs -->
+ <fileSet>
+ <directory>src/main/installer</directory>
+ <outputDirectory>docs</outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>Install.txt</include>
+ <include>JBossORG-EULA.txt</include>
+ </includes>
+ </fileSet>
+ <!-- deploy (excludes libs already on EAP5) -->
+ <fileSet>
+ <directory>target/deploy-artifacts</directory>
+ <outputDirectory>deploy</outputDirectory>
+ <excludes>
+ <exclude>**/jaxb-*.jar</exclude>
+ <exclude>**/junit.jar</exclude>
+ <exclude>**/mail.jar</exclude>
+ <exclude>**/stax-api.jar</exclude>
+ <exclude>**/wstx.jar</exclude>
+ <exclude>**/lib/jbossws-spi.jar</exclude>
+ <exclude>**/lib/jbossws-common.jar</exclude>
+ <exclude>**/lib/jbossws-framework.jar</exclude>
+ <exclude>**/lib/xml-resolver.jar</exclude>
+ <exclude>**/lib/asm.jar</exclude>
+ <exclude>**/lib/commons-collections.jar</exclude>
+ <exclude>**/lib/FastInfoset.jar</exclude>
+ <exclude>**/lib/xmlsec.jar</exclude>
+ <exclude>**/lib/wsdl4j.jar</exclude>
+ <exclude>**/lib/juddi-service.sar</exclude>
+ <exclude>**/lib/scout.jar</exclude>
+ <exclude>**/lib/juddi.jar</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml 2010-05-14 10:04:52 UTC (rev 12234)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml 2010-05-14 11:21:44 UTC (rev 12235)
@@ -1,76 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
- <id>tech-preview-installer</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <!-- root -->
- <fileSet>
- <directory>src/main/tp-installer</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>build.xml</include>
- </includes>
- </fileSet>
- <!-- build -->
- <fileSet>
- <directory>src/main/tp-installer</directory>
- <outputDirectory>build</outputDirectory>
- <includes>
- <include>build-deploy.xml</include>
- <include>build-setup.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>modules/resources/src/main/resources/resources</directory>
- <outputDirectory>build</outputDirectory>
- <includes>
- <include>default-deploy-tp-installer.conf</include>
- <include>standard-deploy-tp-installer.conf</include>
- <include>all-deploy-tp-installer.conf</include>
- <include>production-deploy-tp-installer.conf</include>
- <include>web-deploy-tp-installer.conf</include>
- <include>jbossws-tp-installer-macros.xml</include>
- </includes>
- </fileSet>
- <!-- docs -->
- <fileSet>
- <directory>src/main/tp-installer</directory>
- <outputDirectory>docs</outputDirectory>
- <filtered>true</filtered>
- <includes>
- <include>Install.txt</include>
- <include>JBossORG-EULA.txt</include>
- </includes>
- </fileSet>
- <!-- deploy (excludes libs already on EAP5) -->
- <fileSet>
- <directory>target/deploy-artifacts</directory>
- <outputDirectory>deploy</outputDirectory>
- <excludes>
- <exclude>**/jaxb-*.jar</exclude>
- <exclude>**/junit.jar</exclude>
- <exclude>**/mail.jar</exclude>
- <exclude>**/stax-api.jar</exclude>
- <exclude>**/wstx.jar</exclude>
- <exclude>**/lib/jbossws-spi.jar</exclude>
- <exclude>**/lib/jbossws-common.jar</exclude>
- <exclude>**/lib/jbossws-framework.jar</exclude>
- <exclude>**/lib/xml-resolver.jar</exclude>
- <exclude>**/lib/asm.jar</exclude>
- <exclude>**/lib/commons-collections.jar</exclude>
- <exclude>**/lib/FastInfoset.jar</exclude>
- <exclude>**/lib/xmlsec.jar</exclude>
- <exclude>**/lib/wsdl4j.jar</exclude>
- <exclude>**/lib/juddi-service.sar</exclude>
- <exclude>**/lib/scout.jar</exclude>
- <exclude>**/lib/juddi.jar</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
-</assembly>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12234 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/client and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-14 06:04:52 -0400 (Fri, 14 May 2010)
New Revision: 12234
Removed:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxrs-binding.xml
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf.extension
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
[JBPAPP-4194] Removing cxf jaxrs from EAP branch
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2010-05-14 08:59:04 UTC (rev 12233)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2010-05-14 10:04:52 UTC (rev 12234)
@@ -66,10 +66,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-05-14 08:59:04 UTC (rev 12233)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-05-14 10:04:52 UTC (rev 12234)
@@ -81,8 +81,5 @@
<extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
<namespace>http://apache.org/cxf/binding/http</namespace>
</extension>
- <extension class="org.apache.cxf.jaxrs.JAXRSBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://apache.org/cxf/binding/jaxrs</namespace>
- </extension>
</extensions>
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml 2010-05-14 08:59:04 UTC (rev 12233)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml 2010-05-14 10:04:52 UTC (rev 12234)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:foo="http://cxf.apache.org/configuration/foo"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean class="org.apache.cxf.jaxrs.JAXRSBindingFactory"
- id="org.apache.cxf.jaxrs.JAXRSBindingFactory"
- lazy-init="true">
- <property name="activationNamespaces">
- <set>
- <value>http://apache.org/cxf/binding/jaxrs</value>
- </set>
- </property>
- <property name="bus" ref="cxf"/>
- </bean>
-</beans>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf.extension
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf.extension 2010-05-14 08:59:04 UTC (rev 12233)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf.extension 2010-05-14 10:04:52 UTC (rev 12234)
@@ -11,7 +11,6 @@
META-INF/cxf/cxf-extension-jms.xml
META-INF/cxf/cxf-extension-object-binding.xml
META-INF/cxf/cxf-extension-http-binding.xml
-META-INF/cxf/cxf-extension-jaxrs-binding.xml
META-INF/cxf/cxf-extension-ws-security.xml
META-INF/cxf/cxf-extension-policy.xml
META-INF/cxf/cxf-extension-rm.xml
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2010-05-14 08:59:04 UTC (rev 12233)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2010-05-14 10:04:52 UTC (rev 12234)
@@ -52,10 +52,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2010-05-14 08:59:04 UTC (rev 12233)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2010-05-14 10:04:52 UTC (rev 12234)
@@ -81,8 +81,5 @@
<extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
<namespace>http://apache.org/cxf/binding/http</namespace>
</extension>
- <extension class="org.apache.cxf.jaxrs.JAXRSBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://apache.org/cxf/binding/jaxrs</namespace>
- </extension>
</extensions>
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxrs-binding.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxrs-binding.xml 2010-05-14 08:59:04 UTC (rev 12233)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxrs-binding.xml 2010-05-14 10:04:52 UTC (rev 12234)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:foo="http://cxf.apache.org/configuration/foo"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean class="org.apache.cxf.jaxrs.JAXRSBindingFactory"
- id="org.apache.cxf.jaxrs.JAXRSBindingFactory"
- lazy-init="true">
- <property name="activationNamespaces">
- <set>
- <value>http://apache.org/cxf/binding/jaxrs</value>
- </set>
- </property>
- <property name="bus" ref="cxf"/>
- </bean>
-</beans>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension 2010-05-14 08:59:04 UTC (rev 12233)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension 2010-05-14 10:04:52 UTC (rev 12234)
@@ -11,7 +11,6 @@
META-INF/cxf/cxf-extension-jms.xml
META-INF/cxf/cxf-extension-object-binding.xml
META-INF/cxf/cxf-extension-http-binding.xml
-META-INF/cxf/cxf-extension-jaxrs-binding.xml
META-INF/cxf/cxf-extension-ws-security.xml
META-INF/cxf/cxf-extension-policy.xml
META-INF/cxf/cxf-extension-rm.xml
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-14 08:59:04 UTC (rev 12233)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-14 10:04:52 UTC (rev 12234)
@@ -276,26 +276,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </exclusion>
- <!-- Specify the Spring bits we need at the version we need later -->
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12233 - in stack/native/trunk/modules/testsuite: framework-tests and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-14 04:59:04 -0400 (Fri, 14 May 2010)
New Revision: 12233
Added:
stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml
Modified:
stack/native/trunk/modules/testsuite/framework-tests/pom.xml
stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
stack/native/trunk/modules/testsuite/native-tests/pom.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3024] endorsing wsconsume and wsprovide tools when generating test artifacts
Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-05-14 06:56:04 UTC (rev 12232)
+++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-05-14 08:59:04 UTC (rev 12233)
@@ -1,10 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<name>JBoss Web Services - Stack Native Framework Tests</name>
<artifactId>jbossws-native-framework-tests</artifactId>
<packaging>jar</packaging>
-
+
<!-- Parent -->
<parent>
<groupId>org.jboss.ws.native</groupId>
@@ -12,7 +12,7 @@
<version>3.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -22,7 +22,7 @@
<type>zip</type>
</dependency>
</dependencies>
-
+
<!-- Plugins -->
<build>
<plugins>
@@ -43,11 +43,11 @@
</plugin>
</plugins>
</build>
-
+
<!-- Profiles -->
<profiles>
-
- <!--
+
+ <!--
Name: noprepare
Descr: Skip test preparation with -Dnoprepare
-->
@@ -97,6 +97,8 @@
<property name="tests.resources.dir" value="${basedir}/src/test/resources" />
<property name="tests.output.dir" value="${project.build.directory}" />
<property name="project.version" value="${project.version}" />
+ <property name="log4j.output.dir" value="{log4j.output.dir}"/>
+ <property name="jboss.home" value="${jboss.home}"/>
<ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" />
</tasks>
</configuration>
@@ -112,6 +114,9 @@
<property name="tests.resources.dir" value="${basedir}/src/test/resources" />
<property name="tests.output.dir" value="${project.build.directory}" />
<property name="project.version" value="${project.version}" />
+ <property name="log4j.output.dir" value="{log4j.output.dir}"/>
+ <property name="jboss.home" value="${jboss.home}"/>
+ <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/>
<ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" />
<ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" />
<ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
@@ -143,7 +148,7 @@
</plugins>
</build>
</profile>
-
+
</profiles>
-
+
</project>
Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-05-14 06:56:04 UTC (rev 12232)
+++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-05-14 08:59:04 UTC (rev 12233)
@@ -8,29 +8,57 @@
<project>
- <!-- ================================================================== -->
- <!-- Generating sources -->
- <!-- ================================================================== -->
+ <target name="wsconsume" description="Consume JAX-WS contracts">
- <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts">
-
<taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
<classpath>
- <pathelement path="${wsconsume.classpath}"/>
+ <pathelement path="${maven.test.classpath}"/>
</classpath>
</taskdef>
- <!--
- [JBWS-2950] We need to specify JAX-WS 2.1 target
- explicitely here, because native default is 2.2
- but JDK6 comes with JAX-WS 2.1 API only.
- -->
- <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false" target="2.1"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false" target="2.1"/>
- </target>
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl"
+ package="org.jboss.test.ws.jaxws.complex"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ loggingDir="${log4j.output.dir}"
+ />
- <target name="prepend-jars">
- <property name="wsconsume.classpath" value="${maven.test.classpath}"/>
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl"
+ package="org.jboss.test.ws.jaxws.holder"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ loggingDir="${log4j.output.dir}"
+ />
+
</target>
+ <macrodef name="wsconsume-macro">
+
+ <attribute name="wsdl"/>
+ <attribute name="package"/>
+ <attribute name="outputDir"/>
+ <attribute name="jbossHome"/>
+ <attribute name="loggingDir"/>
+
+ <sequential>
+ <wsconsume
+ wsdl="@{wsdl}"
+ package="@{package}"
+ sourcedestdir="@{outputdir}/wsconsume/java"
+ destdir="@{outputdir}"
+ nocompile="true"
+ keep="true"
+ verbose="false"
+ target="2.2"
+ fork="true"
+ >
+ <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
+ </wsconsume>
+ </sequential>
+
+ </macrodef>
+
</project>
Copied: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml (from rev 12203, stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml)
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-05-14 08:59:04 UTC (rev 12233)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<project>
+
+ <target name="wsprovide" description="Provide JAX-WS contracts">
+
+ <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask">
+ <classpath>
+ <pathelement path="${maven.test.classpath}"/>
+ </classpath>
+ </taskdef>
+
+ <wsprovide-macro
+ sei="org.jboss.test.ws.jaxws.jbws2960.AddNumbersImpl"
+ destdir="jaxws/jbws2960"
+ jbossHome="${jboss.home}"
+ outputDir="${tests.output.dir}"
+ loggingDir="${log4j.output.dir}"
+ resourcesDir="jaxws/jbws2960"
+ />
+
+ </target>
+
+ <macrodef name="wsprovide-macro">
+
+ <attribute name="sei"/>
+ <attribute name="destDir"/>
+ <attribute name="jbossHome"/>
+ <attribute name="outputDir"/>
+ <attribute name="loggingDir"/>
+ <attribute name="resourcesDir"/>
+
+ <sequential>
+ <wsprovide
+ sei="@{sei}"
+ fork="true"
+ genwsdl="true"
+ verbose="false"
+ classpath="@{outputDir}/test-classes"
+ destdir="@{outputDir}/test-classes/@{destDir}"
+ resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}"
+ >
+ <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
+ </wsprovide>
+ </sequential>
+
+ </macrodef>
+
+</project>
Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2010-05-14 06:56:04 UTC (rev 12232)
+++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2010-05-14 08:59:04 UTC (rev 12233)
@@ -54,6 +54,8 @@
<property name="tests.resources.dir" value="${basedir}/src/test/resources" />
<property name="tests.output.dir" value="${project.build.directory}" />
<property name="project.version" value="${project.version}" />
+ <property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="jboss.home" value="${jboss.home}"/>
<ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" />
</tasks>
</configuration>
@@ -70,6 +72,8 @@
<property name="tests.resources.dir" value="${test.resources.directory}" />
<property name="tests.output.dir" value="${project.build.directory}" />
<property name="jboss.bind.address" value="${jboss.bind.address}" />
+ <property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="jboss.home" value="${jboss.home}"/>
<ant antfile="scripts/antrun-wstools.xml" target="wstools" />
</tasks>
</configuration>
@@ -85,6 +89,8 @@
<property name="maven.test.classpath" refid="maven.test.classpath" />
<property name="tests.resources.dir" value="${basedir}/src/test/resources" />
<property name="tests.output.dir" value="${project.build.directory}" />
+ <property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="jboss.home" value="${jboss.home}"/>
<ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide" />
</tasks>
</configuration>
@@ -97,8 +103,10 @@
</goals>
<configuration>
<tasks>
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources" />
<property name="tests.output.dir" value="${project.build.directory}" />
- <property name="tests.resources.dir" value="${basedir}/src/test/resources" />
+ <property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="jboss.home" value="${jboss.home}"/>
<ant antfile="scripts/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" />
<ant antfile="scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" />
<ant antfile="scripts/build-jars-jaxws.xml" target="build-jars-jaxws" />
@@ -112,7 +120,7 @@
</plugins>
</build>
</profile>
-
+
</profiles>
-
+
</project>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2010-05-14 06:56:04 UTC (rev 12232)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2010-05-14 08:59:04 UTC (rev 12233)
@@ -8,34 +8,97 @@
<project>
- <!-- ================================================================== -->
- <!-- Generating sources -->
- <!-- ================================================================== -->
+ <target name="wsconsume" description="Consume JAX-WS contracts">
- <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts">
-
<taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
<classpath>
- <pathelement path="${wsconsume.classpath}"/>
+ <pathelement path="${maven.test.classpath}"/>
</classpath>
</taskdef>
- <!--
- [JBWS-2950] We need to specify JAX-WS 2.1 target
- explicitely here, because native default is 2.2
- but JDK6 comes with JAX-WS 2.1 API only.
- -->
- <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false" target="2.1"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false" target="2.1"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false" target="2.1"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false" target="2.1"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false" target="2.1"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false" target="2.1"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false" target="2.1"/>
- </target>
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl"
+ package="org.jboss.test.ws.benchmark.jaxws.doclit"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ loggingDir="${log4j.output.dir}"
+ />
- <target name="prepend-jars">
- <property name="wsconsume.classpath" value="${maven.test.classpath}"/>
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl"
+ package="org.jboss.test.ws.interop.soapwsdl.basedoclitb"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ loggingDir="${log4j.output.dir}"
+ />
+
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl"
+ package="org.jboss.test.ws.interop.soapwsdl.basedoclitw"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ loggingDir="${log4j.output.dir}"
+ />
+
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl"
+ package="org.jboss.test.ws.interop.soapwsdl.baserpclit"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ loggingDir="${log4j.output.dir}"
+ />
+
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl"
+ package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ loggingDir="${log4j.output.dir}"
+ />
+
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl"
+ package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ loggingDir="${log4j.output.dir}"
+ />
+
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl"
+ package="org.jboss.test.ws.jaxws.samples.wssecurity"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ loggingDir="${log4j.output.dir}"
+ />
+
</target>
+ <macrodef name="wsconsume-macro">
+
+ <attribute name="wsdl"/>
+ <attribute name="package"/>
+ <attribute name="outputDir"/>
+ <attribute name="jbossHome"/>
+ <attribute name="loggingDir"/>
+
+ <sequential>
+ <wsconsume
+ wsdl="@{wsdl}"
+ package="@{package}"
+ sourcedestdir="@{outputdir}/wsconsume/java"
+ destdir="@{outputdir}"
+ nocompile="true"
+ keep="true"
+ verbose="false"
+ target="2.2"
+ fork="true"
+ >
+ <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
+ </wsconsume>
+ </sequential>
+
+ </macrodef>
+
</project>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2010-05-14 06:56:04 UTC (rev 12232)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2010-05-14 08:59:04 UTC (rev 12233)
@@ -7,14 +7,9 @@
<!-- ============================================================ -->
<project>
-
- <!-- ================================================================== -->
- <!-- Generating sources -->
- <!-- ================================================================== -->
<target name="wsprovide" description="Provide the JAX-WS contracts.">
- <!-- Define the JAX-WS wsprovide task -->
<taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask">
<classpath>
<pathelement path="${maven.test.classpath}"/>
@@ -22,20 +17,50 @@
<classpath location="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
</taskdef>
- <wsprovide
- resourcedestdir="${tests.output.dir}/test-resources/wsprovide/jaxws/samples/wssecurity"
- genwsdl="true"
+ <wsprovide-macro
sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"
- destdir="${tests.output.dir}/test-classes"
- verbose="false"/>
+ destDir=""
+ jbossHome="${jboss.home}"
+ outputDir="${tests.output.dir}"
+ loggingDir="${log4j.output.dir}"
+ resourcesDir="wsprovide/jaxws/samples/wssecurity"
+ />
- <wsprovide
- resourcedestdir="${tests.output.dir}/test-resources/wsprovide/jaxws/samples/wssecurityAnnotatedpolicy"
- genwsdl="true"
+ <wsprovide-macro
sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"
- destdir="${tests.output.dir}/test-classes"
- verbose="false"/>
+ destDir=""
+ jbossHome="${jboss.home}"
+ outputDir="${tests.output.dir}"
+ loggingDir="${log4j.output.dir}"
+ resourcesDir="wsprovide/jaxws/samples/wssecurityAnnotatedpolicy"
+ />
</target>
+ <macrodef name="wsprovide-macro">
+
+ <attribute name="sei"/>
+ <attribute name="destDir"/>
+ <attribute name="jbossHome"/>
+ <attribute name="outputDir"/>
+ <attribute name="loggingDir"/>
+ <attribute name="resourcesDir"/>
+
+ <sequential>
+ <wsprovide
+ sei="@{sei}"
+ fork="true"
+ genwsdl="true"
+ verbose="false"
+ classpath="@{outputDir}/test-classes"
+ destdir="@{outputDir}/test-classes/@{destDir}"
+ resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}"
+ >
+ <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
+ </wsprovide>
+ </sequential>
+
+ </macrodef>
+
</project>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2010-05-14 06:56:04 UTC (rev 12232)
+++ stack/native/trunk/modules/testsuite/pom.xml 2010-05-14 08:59:04 UTC (rev 12233)
@@ -27,6 +27,7 @@
<hibernate.version>3.2.4.sp1</hibernate.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
<hornetq.version>2.1.0.BETA3</hornetq.version>
+ <log4j.output.dir>${project.build.directory}</log4j.output.dir>
</properties>
<!-- Modules -->
@@ -195,7 +196,7 @@
</property>
<property>
<name>log4j.output.dir</name>
- <value>${project.build.directory}</value>
+ <value>${log4j.output.dir}</value>
</property>
<property>
<name>org.jboss.ws.wsse.keyStore</name>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12232 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws2960 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-14 02:56:04 -0400 (Fri, 14 May 2010)
New Revision: 12232
Removed:
framework/trunk/testsuite/test/resources/jaxws/jbws2960/
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java
Log:
[JBWS-3024] rollback endorsing workaround - use forked and endorsed tools
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-05-14 06:53:26 UTC (rev 12231)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-05-14 06:56:04 UTC (rev 12232)
@@ -883,18 +883,6 @@
</webinf>
</war>
- <!-- jaxws-jbws2960 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2960.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2960/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2960/AddNumbersImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws2960/AddNumbersException.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws2960/TooBigNumbersException.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2960/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
<!-- jaxws-jbws2985 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2985.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2985/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java 2010-05-14 06:53:26 UTC (rev 12231)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java 2010-05-14 06:56:04 UTC (rev 12232)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.ws.jaxws.jbws2960;
-import java.net.URL;
+import java.io.File;
import java.util.List;
import javax.wsdl.Definition;
@@ -34,11 +34,10 @@
import javax.xml.namespace.QName;
import junit.framework.Assert;
-import junit.framework.Test;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.wsf.test.JBossWSTestHelper;
import org.w3c.dom.Element;
/**
@@ -53,17 +52,12 @@
private static final QName WSAM_NON_ANONYMOUS_RESPONSES_QNAME = new QName("http://www.w3.org/2007/05/addressing/metadata", "NonAnonymousResponses");
private static final QName POLICY_QNAME = new QName("http://www.w3.org/ns/ws-policy", "Policy");
private static final QName POLICY_REFERENCE_QNAME = new QName("http://www.w3.org/ns/ws-policy", "PolicyReference");
- private URL wsdlFile;
+ private final File wsdlFile = JBossWSTestHelper.getResourceFile("jaxws/jbws2960/AddNumbersService.wsdl");
- public static Test suite()
+ public void setUp()
{
- return new JBossWSTestSetup(JBWS2960TestCase.class, "jaxws-jbws2960.war");
- }
-
- public void setUp() throws Exception
- {
- wsdlFile = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2960/Endpoint?wsdl");
assertNotNull("WSDL not found", wsdlFile);
+ assertTrue("WSDL doesn't exist", wsdlFile.exists());
}
/*
@@ -92,7 +86,7 @@
@SuppressWarnings("unchecked")
public void testPolicyReference() throws Exception
{
- Definition wsdl = getWSDLDefinition(wsdlFile);
+ Definition wsdl = getWSDLDefinition(wsdlFile.getAbsolutePath());
List definitionExtElements = wsdl.getExtensibilityElements();
QName serviceQName = new QName("http://foobar.org/", "AddNumbersService");
Port wsdlPort = wsdl.getService(serviceQName).getPort("AddNumbersPort");
@@ -115,7 +109,7 @@
public void testOperations() throws Exception
{
- Definition wsdl = getWSDLDefinition(wsdlFile);
+ Definition wsdl = getWSDLDefinition(wsdlFile.getAbsolutePath());
PortType port = wsdl.getPortType(new QName("http://foobar.org/", "AddNumbers"));
Operation operation = null;
@@ -236,12 +230,12 @@
Assert.assertEquals("Wrong WSAM attr. value", expectedValue, wsamValue.getLocalPart());
}
- private Definition getWSDLDefinition(final URL wsdlLocation) throws Exception
+ private Definition getWSDLDefinition(final String wsdlLocation) throws Exception
{
WSDLFactory wsdlFactory = WSDLFactory.newInstance();
WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
- return wsdlReader.readWSDL(null, wsdlLocation.toURI().toString());
+ return wsdlReader.readWSDL(null, wsdlLocation);
}
@SuppressWarnings("unchecked")
14 years, 7 months
- 1
- 0