Index: build.xml =================================================================== --- build.xml (revision 532) +++ build.xml Tue Nov 04 13:50:18 EST 2008 @@ -4,79 +4,85 @@ - + - + - - - - + + + + - - + + - - - - - + + + + + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + + + - + Index: build.properties =================================================================== --- build.properties (revision 532) +++ build.properties Fri Oct 31 07:10:05 EST 2008 @@ -1,53 +1,57 @@ # # CXF DEPENDENCY JARS # -commons-logging.jar=lib/commons-logging-1.1.jar -geronimo-activation.jar=lib/geronimo-activation_1.1_spec-1.0-M1.jar -geronimo-annotation.jar=lib/geronimo-annotation_1.0_spec-1.1.jar -geronimo-javamail.jar=lib/geronimo-javamail_1.4_spec-1.0-M1.jar -geronimo-ws-metadata.jar=lib/geronimo-ws-metadata_2.0_spec-1.1.1.jar -neethi.jar=lib/neethi-2.0.2.jar -jaxb-api.jar=lib/jaxb-api-2.1.2.jar -jaxb-impl.jar=lib/jaxb-impl-2.1.2.jar -jaxb-xjc.jar=lib/jaxb-xjc-2.1.2.jar -jaxws-api.jar=lib/jaxws-api-2.0.jar -stax-api.jar=lib/stax-api-1.0.1.jar -XmlSchema.jar=lib/XmlSchema-1.2.jar -wstx-asl.jar=lib/wstx-asl-3.2.1.jar -wsdl4j.jar=lib/wsdl4j-1.6.1.jar +commons-logging.jar=lib/commons-logging-1.1.1.jar +geronimo-activation.jar=lib/geronimo-activation_1.1_spec-1.0.2.jar +geronimo-annotation.jar=lib/geronimo-annotation_1.0_spec-1.1.1.jar +geronimo-javamail.jar=lib/geronimo-javamail_1.4_spec-1.3.jar +geronimo-ws-metadata.jar=lib/geronimo-ws-metadata_2.0_spec-1.1.2.jar +neethi.jar=lib/neethi-2.0.4.jar +jaxb-api.jar=lib/jaxb-api-2.1.8.jar +jaxb-impl.jar=lib/jaxb-impl-2.1.8.jar +jaxb-xjc.jar=lib/jaxb-xjc-2.1.8.jar +jaxws-api.jar=lib/jaxws-api-2.1-1.jar +stax-api.jar=lib/geronimo-stax-api_1.0_spec-1.0.1.jar +XmlSchema.jar=lib/XmlSchema-1.4.2.jar +wstx-asl.jar=lib/wstx-asl-3.2.6.jar +wsdl4j.jar=lib/wsdl4j-1.6.2.jar xml-resolver.jar=lib/xml-resolver-1.2.jar # # CXF JARS # -cxf.jar=lib/cxf-2.0.2-incubator.jar +cxf.jar=lib/cxf-2.1.3.jar # # AEGIS JARS # jaxen.jar=lib/jaxen-1.1.jar jdom.jar=lib/jdom-1.0.jar -stax-utils.jar=lib/stax-utils-20060502.jar +stax-utils.jar=lib/jsr173_1.0_api.jar # # JETTY JARS # -geronimo-servlet.jar=lib/geronimo-servlet_2.5_spec-1.1-M1.jar -jetty.jar=lib/jetty-6.1.5.jar -jetty-sslengine.jar= -jetty-util.jar=lib/jetty-util-6.1.5.jar +geronimo-servlet.jar=lib/geronimo-servlet_2.5_spec-1.2.jar +jetty.jar=lib/jetty-6.1.9.jar +#jetty-sslengine.jar= +jetty-util.jar=lib/jetty-util-6.1.9.jar # # GROOVY JARS -groovy-all.jar=lib/groovy-all-1.1-beta-3.jar +groovy-all.jar=lib/groovy-all-1.5.7.jar # # -jarjar.jar=lib/jarjar-1.0rc1.jar +jarjar.jar=lib/jarjar-1.0rc7.jar # -junit.jar=lib/junit-3.8.1.jar -log4j.jar=lib/log4j-1.2.8.jar +junit.jar=lib/junit-3.8.2.jar +log4j.jar=lib/log4j-1.2.14.jar +xmlsec.jar=lib/xmlsec-1.4.0.jar +wss4j.jar=lib/wss4j-1.5.4.jar # jar.compress=false # cxf.classpath=\ ${cxf.jar} # +# ${xmlsec.jar}:\ +# ${jetty-sslengine.jar}:\ cxf.dependency.classpath=\ ${commons-logging.jar}:\ ${geronimo-activation.jar}:\ @@ -62,15 +66,16 @@ ${stax-api.jar}:\ ${XmlSchema.jar}:\ ${wstx-asl.jar}:\ + ${wss4j.jar}:\ + ${xmlsec.jar}:\ ${wsdl4j.jar}:\ ${xml-resolver.jar}:\ ${jaxen.jar}:\ ${jdom.jar}:\ - ${stax-utils.jar}:\ ${geronimo-servlet.jar}:\ ${jetty.jar}:\ - ${jetty-sslengine.jar}:\ ${jetty-util.jar} +# ${stax-utils.jar}:\ # groovy.classpath=\ ${groovy-all.jar} @@ -88,5 +93,5 @@ build.dir=build jar.dir=${build.dir}/jar javadoc.dir=doc -javadoc.packages="groovy.net.soap.*" +javadoc.packages="groovyx.net.ws.*" test.reports=build/test-reports