April 2008 - jbossws-commits - Jboss List Archives

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-12 07:09:18 -0400 (Sat, 12 Apr 2008) New Revision: 6374 Modified: spi/trunk/pom.xml Log: update jaxws-api Modified: spi/trunk/pom.xml =================================================================== --- spi/trunk/pom.xml 2008-04-12 10:52:05 UTC (rev 6373) +++ spi/trunk/pom.xml 2008-04-12 11:09:18 UTC (rev 6374) @@ -25,12 +25,6 @@ <version>1.0.13</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> <version>3.0</version> @@ -46,6 +40,17 @@ <version>2.1</version> </dependency> <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>1.7.0</version> @@ -56,11 +61,6 @@ <artifactId>jboss-kernel</artifactId> <version>2.0.0.Beta4</version> </dependency> - <dependency> - <groupId>sun-jaxws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1.1</version> - </dependency> </dependencies>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6373 - common/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-12 06:52:05 -0400 (Sat, 12 Apr 2008) New Revision: 6373 Modified: common/trunk/.classpath Log: eclipse classpath Modified: common/trunk/.classpath =================================================================== --- common/trunk/.classpath 2008-04-12 10:45:58 UTC (rev 6372) +++ common/trunk/.classpath 2008-04-12 10:52:05 UTC (rev 6373) @@ -5,5 +5,12 @@ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta11/jboss-kernel-2.0.0.Beta11.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta11/jboss-dependency-2.0.0.Beta11.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/> <classpathentry kind="output" path="target/eclipse"/> </classpath>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6372 - spi/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-12 06:45:58 -0400 (Sat, 12 Apr 2008) New Revision: 6372 Modified: spi/trunk/.classpath Log: eclipse classpath Modified: spi/trunk/.classpath =================================================================== --- spi/trunk/.classpath 2008-04-12 10:38:42 UTC (rev 6371) +++ spi/trunk/.classpath 2008-04-12 10:45:58 UTC (rev 6372) @@ -4,21 +4,15 @@ <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/> - <classpathentry kind="lib" path="thirdparty/activation.jar"/> - <classpathentry kind="lib" path="thirdparty/dom4j.jar"/> - <classpathentry kind="lib" path="thirdparty/getopt.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-log4j.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-xml-binding-sources.jar"/> - <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> - <classpathentry kind="lib" path="thirdparty/ant.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar"/> + <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta11/jboss-kernel-2.0.0.Beta11.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR7/jbossxb-2.0.0.CR7.jar"/> <classpathentry kind="output" path="target/eclipse"/> </classpath>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6371 - in common/trunk: src/main/etc and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-12 06:38:42 -0400 (Sat, 12 Apr 2008) New Revision: 6371 Added: common/trunk/pom.xml Removed: common/trunk/ant-import/ common/trunk/src/main/etc/default.mf common/trunk/version.properties Modified: common/trunk/ common/trunk/.classpath common/trunk/ant.properties.example common/trunk/build.xml common/trunk/src/main/etc/component-info.xml Log: Switch to maven build Property changes on: common/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties version.properties.md5 output* thirdparty + ant.properties version.properties.md5 output* thirdparty target Modified: common/trunk/.classpath =================================================================== --- common/trunk/.classpath 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/.classpath 2008-04-12 10:38:42 UTC (rev 6371) @@ -3,17 +3,7 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/> - <classpathentry kind="lib" path="thirdparty/activation.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> - <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> - <classpathentry kind="lib" path="thirdparty/ant.jar"/> - <classpathentry kind="output" path="output/eclipse"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/> + <classpathentry kind="output" path="target/eclipse"/> </classpath> Modified: common/trunk/ant.properties.example =================================================================== --- common/trunk/ant.properties.example 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/ant.properties.example 2008-04-12 10:38:42 UTC (rev 6371) @@ -3,18 +3,5 @@ # # $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ -# JBoss Repository -#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository -jboss.repository=http://repository.jboss.org - -# JBossWS Release -jboss.local.repository=/home/tdiesler/svn/jboss.local.repository - -# Force thirdparty HTTP get -#force.thirdparty.get=true - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no +# JBossWS local repository +jboss.local.repository=/home/tdiesler/svn/jboss.local.repository \ No newline at end of file Modified: common/trunk/build.xml =================================================================== --- common/trunk/build.xml 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/build.xml 2008-04-12 10:38:42 UTC (rev 6371) @@ -12,140 +12,70 @@  <project name="JBossWS-Common" default="main" basedir="."> + +  +  +  + + <property name="common.dir" value="${basedir}"/> + <property name="common.etc.dir" value="${common.dir}/src/main/etc"/> + <property name="common.target.dir" value="${common.dir}/target"/> + +  +  +  + + <target name="init"> + +  + <available property="ant.properties.available" file="${basedir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + + <property file="${common.dir}/ant.properties"/> + + <xmlproperty file="${common.dir}/pom.xml"/> + <property name="version.id" value="${project.version}"/> + <property name="repository.id" value="${project.version}"/> + + <echo message="version.id=${version.id}"/> + <echo message="repository.id=${repository.id}"/> + </target> + +  +  +  - <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> - <import file="${basedir}/ant-import/build-thirdparty.xml"/> - -  -  -  - - <property name="common.src.dir" value="${common.dir}/src/main"/> - <property name="common.etc.dir" value="${common.src.dir}/etc"/> - <property name="common.java.dir" value="${common.src.dir}/java"/> - <property name="common.resources.dir" value="${common.src.dir}/resources"/> - <property name="common.output.dir" value="${common.dir}/output"/> - <property name="common.output.apidocs.dir" value="${common.output.dir}/apidocs"/> - <property name="common.output.etc.dir" value="${common.output.dir}/etc"/> - <property name="common.output.classes.dir" value="${common.output.dir}/classes"/> - <property name="common.output.lib.dir" value="${common.output.dir}/lib"/> - -  -  -  - - <target name="init" depends="prepare,thirdparty-classpath"> - </target> - -  -  -  - -  - - <target name="compile" depends="init,compile-classes,compile-etc" - description="Compile all source files."/> - -  - <target name="compile-classes" depends="init"> - -  - <mkdir dir="${common.output.classes.dir}"/> - <javac srcdir="${common.java.dir}" sourcepath="" destdir="${common.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> - <include name="org/jboss/wsf/**"/> - <include name="org/jboss/ws/**"/> - <classpath refid="common.thirdparty.classpath"/> - </javac> - </target> - -  - <target name="compile-etc" depends="init"> - <mkdir dir="${common.output.etc.dir}"/> - <copy todir="${common.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${common.etc.dir}"> - <include name="default.mf"/> - </fileset> +  + <target name="install" depends="init" description="Install to jboss.local.repository"> + +  + <available property="jbossws.common.jar.available" file="${common.target.dir}/jbossws-common-${version.id}.jar"/> + <fail message="Cannot find jbossws-common-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.common.jar.available"/> + +  + <available property="jbossws.common.sources.jar.available" file="${common.target.dir}/jbossws-common-${version.id}-sources.jar"/> + <fail message="Cannot find jbossws-common-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.common.sources.jar.available"/> + +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-common/${repository.id}/lib"/> + <copy file="${common.target.dir}/jbossws-common-${version.id}.jar" tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/lib/jbossws-common.jar" overwrite="true"/> + <copy file="${common.target.dir}/jbossws-common-${version.id}-sources.jar" tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/lib/jbossws-common-src.jar" overwrite="true"/> + <copy tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/component-info.xml" file="${common.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> <filtersfile file="${common.dir}/version.properties"/> </filterset> </copy> - </target> + </target>  -  +   - -  - <target name="jars" depends="compile,module-jars" description="Builds all jar files."> - </target> - -  - <target name="module-jars"> - -  - <mkdir dir="${common.output.lib.dir}"/> - <jar jarfile="${common.output.lib.dir}/jbossws-common.jar" manifest="${common.output.etc.dir}/default.mf"> - <fileset dir="${common.output.classes.dir}"> - <include name="org/jboss/wsf/**"/> - <include name="org/jboss/ws/**"/> - </fileset> - </jar> - -  - <zip zipfile="${common.output.lib.dir}/jbossws-common-src.zip" > - <fileset dir="${common.java.dir}"/> - </zip> + <target name="clean" depends="init" description="Cleans up most generated files."> + <delete dir="${common.target.dir}"/> </target> - -  -  -  -  - <target name="javadoc" depends="init" description="Generate the Javadoc"> + <target name="main" description="Executes the default target (install)." depends="install"/> - <mkdir dir="${common.output.apidocs.dir}"/> - <javadoc destdir="${common.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath refid="common.thirdparty.classpath"/> - <packageset dir="${common.java.dir}" defaultexcludes="yes"> - <include name="org/jboss/ws/**"/> - <include name="org/jboss/wsf/**"/> - </packageset> - <doctitle><![CDATA[<h1>JBoss Web Service Framework - SPI</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> - </javadoc> - </target> - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${common.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${common.dir}/thirdparty"/> - </target> - - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jars"/> - - <target name="all" description="Create a distribution zip file" depends="main"> - </target> - </project> Added: common/trunk/pom.xml =================================================================== --- common/trunk/pom.xml (rev 0) +++ common/trunk/pom.xml 2008-04-12 10:38:42 UTC (rev 6371) @@ -0,0 +1,103 @@ +<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> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <packaging>jar</packaging> + <version>3.0.0-SNAPSHOT</version> + <name>JBoss Web Services - Common</name> + <organization> + <name>JBoss, a division of Red Hat</name> + <url>http://www.jboss.org</url> + </organization> + <url>http://maven.apache.org</url> + +  + <properties> + <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi> + </properties> + +  + <dependencies> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>2.0.0.Beta4</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>${jbossws-spi}</version> + </dependency> + </dependencies> + +  + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>3</version> + </parent> + +  + <build> + <resources> + <resource> + <targetPath>../etc</targetPath> + <directory>src/main/etc</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + +  + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Releases Repository</name> + <url>http://repository.jboss.org/maven2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>java.net</id> + <url>http://download.java.net/maven/1</url> + <layout>legacy</layout> + </repository> + </repositories> +</project> Property changes on: common/trunk/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: common/trunk/src/main/etc/component-info.xml =================================================================== --- common/trunk/src/main/etc/component-info.xml 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/src/main/etc/component-info.xml 2008-04-12 10:38:42 UTC (rev 6371) @@ -2,14 +2,14 @@ <component id="jboss/jbossws-common" description="JBossWS Common" - version="@repository.id@" + version="${version}" licenseType="lgpl"> <artifact id="jbossws-common.jar"/> <artifact id="jbossws-common-src.zip"/> <import componentref="jboss/jbossws-spi"> - <compatible version="@jbossws-spi@"/> + <compatible version="${jbossws-spi}"/> </import> <export> Deleted: common/trunk/src/main/etc/default.mf =================================================================== --- common/trunk/src/main/etc/default.mf 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/src/main/etc/default.mf 2008-04-12 10:38:42 UTC (rev 6371) @@ -1,10 +0,0 @@ -Manifest-Version: 1.2 -Created-By: @java.vm.version@ (@java.vm.vendor@) -Specification-Title: @specification.title@ -Specification-Version: @specification.version@ -Specification-Vendor: @specification.vendor@ -Implementation-Title: @implementation.title@ -Implementation-URL: @implementation.url@ -Implementation-Version: @implementation.version@ (build=(a)build.id@) -Implementation-Vendor: @implementation.vendor@ -Implementation-Vendor-Id: @implementation.vendor.id@ Deleted: common/trunk/version.properties =================================================================== --- common/trunk/version.properties 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/version.properties 2008-04-12 10:38:42 UTC (rev 6371) @@ -1,27 +0,0 @@ - -# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $ - -specification.title=JBossWS -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-3.0 - -version.id=2.0.5.DEV -repository.id=snapshot - -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - -# Thirdparty library versions -jbossws-spi=1.0.2.GA - -jboss-common-core=2.0.2.GA -jboss-common-logging-spi=2.0.2.GA -jboss-javaee=5.0.0.Beta3Update1 -jboss-microcontainer=2.0.0.Beta3 -apache-ant=1.6.5 -junit=3.8.1 -sun-jaf=1.1 -sun-jaxb=2.1.4 -sun-jaxrpc=1.1 -sun-jaxws=2.1.1

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6370 - spi/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-12 06:09:58 -0400 (Sat, 12 Apr 2008) New Revision: 6370 Modified: spi/trunk/pom.xml Log: copy component-info.xml Modified: spi/trunk/pom.xml =================================================================== --- spi/trunk/pom.xml 2008-04-12 10:09:25 UTC (rev 6369) +++ spi/trunk/pom.xml 2008-04-12 10:09:58 UTC (rev 6370) @@ -91,14 +91,11 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> -  - <excludes> - <exclude>**/component-info.xml</exclude> - </excludes> + </archive> </configuration> </plugin> </plugins>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6369 - in spi/trunk: src/main/etc and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-12 06:09:25 -0400 (Sat, 12 Apr 2008) New Revision: 6369 Modified: spi/trunk/build.xml spi/trunk/pom.xml spi/trunk/src/main/etc/component-info.xml Log: copy component-info.xml Modified: spi/trunk/build.xml =================================================================== --- spi/trunk/build.xml 2008-04-12 09:35:05 UTC (rev 6368) +++ spi/trunk/build.xml 2008-04-12 10:09:25 UTC (rev 6369) @@ -61,11 +61,7 @@ <mkdir dir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib"/> <copy file="${spi.target.dir}/jbossws-spi-${version.id}.jar" tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib/jbossws-spi.jar" overwrite="true"/> <copy file="${spi.target.dir}/jbossws-spi-${version.id}-sources.jar" tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib/jbossws-spi-src.jar" overwrite="true"/> - <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${spi.etc.dir}/component-info.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${spi.dir}/version.properties"/> - </filterset> - </copy> + <copy file="${spi.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" overwrite="true"/> </target>  Modified: spi/trunk/pom.xml =================================================================== --- spi/trunk/pom.xml 2008-04-12 09:35:05 UTC (rev 6368) +++ spi/trunk/pom.xml 2008-04-12 10:09:25 UTC (rev 6369) @@ -72,6 +72,12 @@  <build> + <resources> + <resource> + <targetPath>../etc</targetPath> + <directory>src/main/etc</directory> + </resource> + </resources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -85,11 +91,14 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> - <archive> +  + <excludes> + <exclude>**/component-info.xml</exclude> + </excludes> </configuration> </plugin> </plugins> Modified: spi/trunk/src/main/etc/component-info.xml =================================================================== --- spi/trunk/src/main/etc/component-info.xml 2008-04-12 09:35:05 UTC (rev 6368) +++ spi/trunk/src/main/etc/component-info.xml 2008-04-12 10:09:25 UTC (rev 6369) @@ -6,7 +6,7 @@ licenseType="lgpl"> <artifact id="jbossws-spi.jar"/> - <artifact id="jbossws-spi-src.zip"/> + <artifact id="jbossws-spi-sources.jar"/> <export> <include input="jbossws-spi.jar"/>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6368 - spi/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-12 05:35:05 -0400 (Sat, 12 Apr 2008) New Revision: 6368 Modified: spi/trunk/build.xml spi/trunk/pom.xml Log: <groupId>org.jboss.ws</groupId> Modified: spi/trunk/build.xml =================================================================== --- spi/trunk/build.xml 2008-04-11 18:14:02 UTC (rev 6367) +++ spi/trunk/build.xml 2008-04-12 09:35:05 UTC (rev 6368) @@ -21,8 +21,6 @@ <property name="spi.etc.dir" value="${spi.dir}/src/main/etc"/> <property name="spi.target.dir" value="${spi.dir}/target"/> - <property name="repository.id" value="3.0-snapshot"/> -    @@ -37,6 +35,7 @@ <xmlproperty file="${spi.dir}/pom.xml"/> <property name="version.id" value="${project.version}"/> + <property name="repository.id" value="${project.version}"/> <echo message="version.id=${version.id}"/> <echo message="repository.id=${repository.id}"/> Modified: spi/trunk/pom.xml =================================================================== --- spi/trunk/pom.xml 2008-04-11 18:14:02 UTC (rev 6367) +++ spi/trunk/pom.xml 2008-04-12 09:35:05 UTC (rev 6368) @@ -1,7 +1,7 @@ <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> - <groupId>org.jboss.wsf</groupId> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> <packaging>jar</packaging> <version>3.0.0-SNAPSHOT</version>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6367 - in stack/metro/trunk: src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-04-11 14:14:02 -0400 (Fri, 11 Apr 2008) New Revision: 6367 Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl Log: [JBWS-2097] finalizing Metro WS-RM client - based on Metro WS-RM tutorial Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-11 16:41:01 UTC (rev 6366) +++ stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-11 18:14:02 UTC (rev 6367) @@ -65,7 +65,7 @@ <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF"> - <include name="wsrm-jaxws-endpoint-config.xml"/> + <include name="wsit-*.xml"/> </webinf> <zipfileset dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/wsdl" Modified: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-11 16:41:01 UTC (rev 6366) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-11 18:14:02 UTC (rev 6367) @@ -35,7 +35,7 @@ import com.sun.xml.ws.Closeable; /** - * Reliable JBoss WebService client invoking one way methods + * Client invoking web service using WS-RM * * @author richard.opalka(a)jboss.com */ @@ -64,8 +64,7 @@ { proxy.ping(); // one way call assertEquals("Hello World!", proxy.echo("Hello World!")); // request responce call - System.out.println("FIXME: [JBWS-2097] Unlock WS-ReliableMessaging in all stacks"); - //((Closeable)proxy).close(); // TODO: uncomment this + ((Closeable)proxy).close(); } } Modified: stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-11 16:41:01 UTC (rev 6366) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-11 18:14:02 UTC (rev 6367) @@ -1,6 +1,19 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>  -<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" name="SimpleService" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/"> +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" name="SimpleService" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + <wsp:UsingPolicy/> + <wsp:Policy + wsu:Id="wsrm11policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsp:All> + <wsp:ExactlyOne> + <wsp:All> + <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/> + <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:All> + </wsp:Policy> <types> <xsd:schema> <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" schemaLocation="SimpleService_schema1.xsd"/> @@ -25,6 +38,7 @@ </operation> </portType> <binding name="SimpleServicePortBinding" type="tns:SimpleService"> + <wsp:PolicyReference URI="#wsrm11policy"/> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> <operation name="ping"> <soap:operation soapAction=""/> Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml 2008-04-11 18:14:02 UTC (rev 6367) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + name="SimpleService" + targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:wsaws="http://www.w3.org/2005/08/addressing" + xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> + <message name="ping"/> + <message name="echo"/> + <message name="echoResponse"/> + <portType name="SimpleService"> + <operation name="ping"> + <input message="tns:ping"/> + </operation> + <operation name="echo"> + <input message="tns:echo"/> + <output message="tns:echoResponse"/> + </operation> + </portType> + <binding name="SimpleServicePortBinding" type="tns:SimpleService"> + <wsp:PolicyReference URI="#wsrm11policy"/> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <operation name="ping"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + </operation> + <operation name="echo"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <service name="SimpleService"> + <port name="SimpleServicePort" binding="tns:SimpleServicePortBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> + <wsp:Policy wsu:Id="CalculatorWSPortBindingPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/> + <wsrm:RMAssertion/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy + wsu:Id="wsrm11policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsp:All> + <wsp:ExactlyOne> + <wsp:All> + <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/> + <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:All> + </wsp:Policy> +</definitions> Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6366 - in stack/native/branches/dlofthouse/JBWS-1316: src/main/java/org/jboss/ws/metadata/wsse and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-04-11 12:41:01 -0400 (Fri, 11 Apr 2008) New Revision: 6366 Added: stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/TimestampVerification.java stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/ stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-empty-tv.xml stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-full-tv.xml stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-no-tv.xml Modified: stack/native/branches/dlofthouse/JBWS-1316/.classpath stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java stack/native/branches/dlofthouse/JBWS-1316/src/main/resources/schema/jboss-ws-security_1_0.xsd Log: Add timestamp-verification element to wsse configuration and test case to verify. Modified: stack/native/branches/dlofthouse/JBWS-1316/.classpath =================================================================== --- stack/native/branches/dlofthouse/JBWS-1316/.classpath 2008-04-11 16:36:30 UTC (rev 6365) +++ stack/native/branches/dlofthouse/JBWS-1316/.classpath 2008-04-11 16:41:01 UTC (rev 6366) @@ -13,6 +13,7 @@ <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-j2ee.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> Added: stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/TimestampVerification.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/TimestampVerification.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/TimestampVerification.java 2008-04-11 16:41:01 UTC (rev 6366) @@ -0,0 +1,94 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.ws.metadata.wsse; + +import java.io.Serializable; + +/** + * Represents the "timestamp-verification" tag. + * + * @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a> + * @version $Revision$ + */ +public class TimestampVerification implements Serializable +{ + + private static final long serialVersionUID = -1097288149565604697L; + + private long createdTolerance; + + private boolean warnCreated; + + private long expiresTolerance; + + private boolean warnExpires; + + public TimestampVerification(long createdTolerance, boolean warnCreated, long expiresTolerance, boolean warnExpires) + { + this.createdTolerance = createdTolerance; + this.warnCreated = warnCreated; + this.expiresTolerance = expiresTolerance; + this.warnExpires = warnExpires; + } + + public long getCreatedTolerance() + { + return createdTolerance; + } + + public void setCreatedTolerance(long createdTolerance) + { + this.createdTolerance = createdTolerance; + } + + public boolean isWarnCreated() + { + return warnCreated; + } + + public void setWarnCreated(boolean warnCreated) + { + this.warnCreated = warnCreated; + } + + public long getExpiresTolerance() + { + return expiresTolerance; + } + + public void setExpiresTolerance(long expiresTolerance) + { + this.expiresTolerance = expiresTolerance; + } + + public boolean isWarnExpires() + { + return warnExpires; + } + + public void setWarnExpires(boolean warnExpires) + { + this.warnExpires = warnExpires; + } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/TimestampVerification.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java 2008-04-11 16:36:30 UTC (rev 6365) +++ stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java 2008-04-11 16:41:01 UTC (rev 6366) @@ -47,6 +47,7 @@ private String trustStorePassword; private HashMap<String, String> keyPasswords = new HashMap<String, String>(); private String nonceFactory; + private TimestampVerification timestampVerification; public WSSecurityConfiguration() { @@ -176,4 +177,15 @@ { this.nonceFactory = nonceFactory; } + + public TimestampVerification getTimestampVerification() + { + return timestampVerification; + } + + public void setTimestampVerification(TimestampVerification timestampVerification) + { + this.timestampVerification = timestampVerification; + } + } Modified: stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2008-04-11 16:36:30 UTC (rev 6365) +++ stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2008-04-11 16:41:01 UTC (rev 6366) @@ -179,6 +179,34 @@ { return new Port(attrs.getValue("", "name")); } + if ("timestamp-verification".equals(localName)) + { + //By default, the createdTolerance should be '0' + Long createdTolerance = new Long(0); + String createdToleranceAttr = attrs.getValue("", "createdTolerance"); + if (createdToleranceAttr != null) + createdTolerance = (Long)SimpleTypeBindings.unmarshal(SimpleTypeBindings.XS_LONG_NAME, createdToleranceAttr, null); + + //By default, we do log warnings if the tolerance is used. + Boolean warnCreated = new Boolean(true); + String warnCreatedAttr = attrs.getValue("", "warnCreated"); + if (warnCreatedAttr != null) + warnCreated = (Boolean)SimpleTypeBindings.unmarshal(SimpleTypeBindings.XS_BOOLEAN_NAME, warnCreatedAttr, null); + + //By default, the expiresTolerance should be '0' + Long expiresTolerance = new Long(0); + String expiresToleranceAttr = attrs.getValue("", "expiresTolerance"); + if (expiresToleranceAttr != null) + expiresTolerance = (Long)SimpleTypeBindings.unmarshal(SimpleTypeBindings.XS_LONG_NAME, expiresToleranceAttr, null); + + //By default, we do log warnings if the tolerance is used. + Boolean warnExpires = new Boolean(true); + String warnExpiresAttr = attrs.getValue("", "warnExpires"); + if (warnExpiresAttr != null) + warnExpires = (Boolean)SimpleTypeBindings.unmarshal(SimpleTypeBindings.XS_BOOLEAN_NAME, warnExpiresAttr, null); + + return new TimestampVerification(createdTolerance, warnCreated, expiresTolerance, warnExpires); + } return null; } @@ -216,6 +244,16 @@ } /** + * Called when parsing TimestampVerification is complete. + */ + public void addChild(WSSecurityConfiguration configuration, TimestampVerification timestampVerification, UnmarshallingContext navigator, String namespaceURI, + String localName) + { + log.trace("addChild: [obj=" + configuration + ",child=" + timestampVerification + "]"); + configuration.setTimestampVerification(timestampVerification); + } + + /** * Called when parsing of a new element started. */ public Object newChild(Config config, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) @@ -233,7 +271,8 @@ } else if ("encrypt".equals(localName)) { - return new Encrypt(attrs.getValue("", "type"), attrs.getValue("", "alias"), attrs.getValue("", "algorithm"), attrs.getValue("", "keyWrapAlgorithm"), attrs.getValue("", "tokenReference")); + return new Encrypt(attrs.getValue("", "type"), attrs.getValue("", "alias"), attrs.getValue("", "algorithm"), attrs.getValue("", "keyWrapAlgorithm"), attrs + .getValue("", "tokenReference")); } else if ("timestamp".equals(localName)) { @@ -250,19 +289,19 @@ String digestPasswordAttr = attrs.getValue("", "digestPassword"); if (digestPasswordAttr != null) digestPassword = (Boolean)SimpleTypeBindings.unmarshal(SimpleTypeBindings.XS_BOOLEAN_NAME, digestPasswordAttr, null); - + //if password digest is enabled, we use nonces by default Boolean useNonce = new Boolean(true); String useNonceAttr = attrs.getValue("", "useNonce"); if (useNonceAttr != null) useNonce = (Boolean)SimpleTypeBindings.unmarshal(SimpleTypeBindings.XS_BOOLEAN_NAME, useNonceAttr, null); - + //if password digest is enabled, we use the created element by default Boolean useCreated = new Boolean(true); String useCreatedAttr = attrs.getValue("", "useCreated"); if (useCreatedAttr != null) useCreated = (Boolean)SimpleTypeBindings.unmarshal(SimpleTypeBindings.XS_BOOLEAN_NAME, useCreatedAttr, null); - + return new Username(digestPassword, useNonce, useCreated); } Modified: stack/native/branches/dlofthouse/JBWS-1316/src/main/resources/schema/jboss-ws-security_1_0.xsd =================================================================== --- stack/native/branches/dlofthouse/JBWS-1316/src/main/resources/schema/jboss-ws-security_1_0.xsd 2008-04-11 16:36:30 UTC (rev 6365) +++ stack/native/branches/dlofthouse/JBWS-1316/src/main/resources/schema/jboss-ws-security_1_0.xsd 2008-04-11 16:41:01 UTC (rev 6366) @@ -38,6 +38,11 @@ <xs:documentation>The passwords for the private keys in the keystore. Only required if the passwords are different from that of the keystore.</xs:documentation> </xs:annotation> </xs:element> + <xs:element name="timestamp-verification" type="timestampVerificationType" minOccurs="0"> + <xs:annotation> + <xs:documentation>The tolerances and logging required when verifying the 'created' and 'expires' value of the timestamps.</xs:documentation> + </xs:annotation> + </xs:element> <xs:element name="config" type="configType" minOccurs="0"> <xs:annotation> <xs:documentation>The default security configuration that is applied to all operations on all ports. This is only used if there is no port/operation config.</xs:documentation> @@ -77,6 +82,28 @@ </xs:annotation> </xs:attribute> </xs:complexType> + <xs:complexType name="timestampVerificationType"> + <xs:attribute name="createdTolerance" type="xs:long" use="optional"> + <xs:annotation> + <xs:documentation>The number of seconds in the future the created value on a message will be accepted.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="warnCreated" type="xs:boolean" use="optional"> + <xs:annotation> + <xs:documentation>Specifies if a WARN should be logged if a message in the future is accepted within the configured 'createdTolerance'.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="expiresTolerance" type="xs:long" use="optional"> + <xs:annotation> + <xs:documentation>The number of seconds tolerance when checking the expires value of the timestamp.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="warnExpires" type="xs:boolean" use="optional"> + <xs:annotation> + <xs:documentation>Specifies if a WARN should be logged if an expired message is accepted that is within the 'expiresTolerance'.</xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:complexType> <xs:complexType name="configType" mixed="true"> <xs:all> <xs:element name="timestamp" type="timestampType" minOccurs="0"> Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java 2008-04-11 16:41:01 UTC (rev 6366) @@ -0,0 +1,102 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.test.ws.jaxrpc.jbws1316; + +import java.io.File; +import java.io.IOException; + +import org.jboss.ws.metadata.wsse.TimestampVerification; +import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; +import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Test case to test reading the TimestampVerification configuration. + * + * @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a> + * @version $Revision$ + */ +public class JBWS1316ConfigurationTestCase extends JBossWSTest +{ + + private WSSecurityConfiguration load(final String fileName) throws IOException + { + File configFile = new File("resources/jaxrpc/jbws1316/config/" + fileName); + WSSecurityOMFactory factory = WSSecurityOMFactory.newInstance(); + + return factory.parse(configFile.toURL()); + } + + /** + * Test loading a wsse configuration with no timestamp-verification + * element. + * + * This test case verifies that no TimestampVerification will be set + * and matches the scenario that would be encountered when reading + * existing descriptors. + */ + public void testLoadNoTimestampVerification() throws Exception + { + WSSecurityConfiguration config = load("jboss-wsse-no-tv.xml"); + assertNull("No TimestampVerification expected.", config.getTimestampVerification()); + } + + /** + * Test loading a wsse configuration with an empty timestamp-verification + * element. + * + * This test case verifies the default values that will be used when missing from + * the timestamp-verification element. + */ + public void testLoadEmptyTimestampVerification() throws Exception + { + WSSecurityConfiguration config = load("jboss-wsse-empty-tv.xml"); + assertNotNull("TimestampVerification Missing", config.getTimestampVerification()); + + TimestampVerification tv = config.getTimestampVerification(); + assertEquals("Expected 'createdTolerance' to be '0'", 0, tv.getCreatedTolerance()); + assertTrue("Expected 'warnCreated' to default to 'true'", tv.isWarnCreated()); + assertEquals("Expected 'expiresTolerance' to be '0'", 0, tv.getExpiresTolerance()); + assertTrue("Expected 'warnExpires' to default to 'true'", tv.isWarnExpires()); + } + + /** + * Test loading a wsse configuration with a full timestamp-verification + * element. + * + * This test case verifies all the values are correctly loaded from the + * timestamp-verification element. + */ + public void testLoadFullTimestampVerification() throws Exception + { + WSSecurityConfiguration config = load("jboss-wsse-full-tv.xml"); + assertNotNull("TimestampVerification Missing", config.getTimestampVerification()); + + TimestampVerification tv = config.getTimestampVerification(); + assertEquals("Expected 'createdTolerance' to be '5'", 5, tv.getCreatedTolerance()); + assertFalse("Expected 'warnCreated' to default to 'false'", tv.isWarnCreated()); + assertEquals("Expected 'expiresTolerance' to be '10'", 10, tv.getExpiresTolerance()); + assertFalse("Expected 'warnExpires' to default to 'false'", tv.isWarnExpires()); + } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-empty-tv.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-empty-tv.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-empty-tv.xml 2008-04-11 16:41:01 UTC (rev 6366) @@ -0,0 +1,5 @@ +<jboss-ws-security xmlns='http://www.jboss.com/ws-security/config' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xsi:schemaLocation='http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd'> + <timestamp-verification/> +</jboss-ws-security> \ No newline at end of file Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-empty-tv.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-full-tv.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-full-tv.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-full-tv.xml 2008-04-11 16:41:01 UTC (rev 6366) @@ -0,0 +1,5 @@ +<jboss-ws-security xmlns='http://www.jboss.com/ws-security/config' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xsi:schemaLocation='http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd'> + <timestamp-verification createdTolerance="5" warnCreated="false" expiresTolerance="10" warnExpires="false" /> +</jboss-ws-security> \ No newline at end of file Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-full-tv.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-no-tv.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-no-tv.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-no-tv.xml 2008-04-11 16:41:01 UTC (rev 6366) @@ -0,0 +1,6 @@ +<jboss-ws-security xmlns='http://www.jboss.com/ws-security/config' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xsi:schemaLocation='http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd'> + + +</jboss-ws-security> \ No newline at end of file Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/config/jboss-wsse-no-tv.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6365 - in framework/trunk/src/test: java/org/jboss/test/ws/jaxws and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-04-11 12:36:30 -0400 (Fri, 11 Apr 2008) New Revision: 6365 Removed: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ framework/trunk/src/test/resources/jaxws/wsrm/ Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml Log: [JBWS-2097] refactoring - moving native specific wsrm tests back to native Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-11 16:35:13 UTC (rev 6364) +++ framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-11 16:36:30 UTC (rev 6365) @@ -553,67 +553,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/libs/jaxws-wsrm.war" - webxml="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF"> - <include name="wsrm-jaxws-endpoint-config.xml"/> - </webinf> - <zipfileset - dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl" - prefix="WEB-INF/wsdl"/> - <zipfileset - file="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml" - prefix="META-INF"/> - </war> - - <war warfile="${tests.output.dir}/libs/jaxws-secured-wsrm.war" - webxml="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF"> - <include name="wsrm-jaxws-endpoint-config.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/wssecurity/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - <zipfileset - dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/wsdl" - prefix="WEB-INF/wsdl"/> - <zipfileset - file="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml" - prefix="META-INF"/> - </war> - - <jar jarfile="${tests.output.dir}/libs/jaxws-wsrm-client.jar"> - <metainf dir="${tests.output.dir}/resources/jaxws/wsrm/META-INF"> - <include name="wsrm-jaxws-client-config.xml"/> - </metainf> - </jar> - - <jar jarfile="${tests.output.dir}/libs/jaxws-secured-wsrm-client.jar"> - <metainf dir="${tests.output.dir}/resources/jaxws/wsrm/META-INF"> - <include name="wsrm-jaxws-client-config.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxws/wsrm/wssecurity/META-INF"> - <include name="jboss-wsse-client.xml"/> - </metainf> - </jar> -  </target>

16 years, 9 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2008