You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wss4j-dev@ws.apache.org by fa...@apache.org on 2008/04/21 21:58:23 UTC
svn commit: r650238 - in /webservices/wss4j/branches/1_5_4: NOTICE
assembly/bin.xml assembly/src.xml build.xml pom.xml src/META-INF/
src/META-INF/LICENSE.txt src/META-INF/NOTICE
Author: fadushin
Date: Mon Apr 21 12:58:20 2008
New Revision: 650238
URL: http://svn.apache.org/viewvc?rev=650238&view=rev
Log:
Added License and Notice files to source and binary distributions and artifacts
Added:
webservices/wss4j/branches/1_5_4/src/META-INF/
webservices/wss4j/branches/1_5_4/src/META-INF/LICENSE.txt (with props)
webservices/wss4j/branches/1_5_4/src/META-INF/NOTICE (with props)
Modified:
webservices/wss4j/branches/1_5_4/NOTICE
webservices/wss4j/branches/1_5_4/assembly/bin.xml
webservices/wss4j/branches/1_5_4/assembly/src.xml
webservices/wss4j/branches/1_5_4/build.xml
webservices/wss4j/branches/1_5_4/pom.xml
Modified: webservices/wss4j/branches/1_5_4/NOTICE
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_4/NOTICE?rev=650238&r1=650237&r2=650238&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_4/NOTICE (original)
+++ webservices/wss4j/branches/1_5_4/NOTICE Mon Apr 21 12:58:20 2008
@@ -1,3 +1,6 @@
+Apache WSS4J
+Copyright 2004-2008 The Apache Software Foundation
+
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: webservices/wss4j/branches/1_5_4/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_4/assembly/bin.xml?rev=650238&r1=650237&r2=650238&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_4/assembly/bin.xml (original)
+++ webservices/wss4j/branches/1_5_4/assembly/bin.xml Mon Apr 21 12:58:20 2008
@@ -7,6 +7,7 @@
<fileSets>
<fileSet>
<includes>
+ <include>NOTICE</include>
<include>*.txt</include>
</includes>
</fileSet>
Modified: webservices/wss4j/branches/1_5_4/assembly/src.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_4/assembly/src.xml?rev=650238&r1=650237&r2=650238&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_4/assembly/src.xml (original)
+++ webservices/wss4j/branches/1_5_4/assembly/src.xml Mon Apr 21 12:58:20 2008
@@ -6,6 +6,7 @@
<fileSets>
<fileSet>
<includes>
+ <include>NOTICE</include>
<include>*.txt</include>
<include>*.xml</include>
<include>*.properties</include>
@@ -20,4 +21,4 @@
<directory>src</directory>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: webservices/wss4j/branches/1_5_4/build.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_4/build.xml?rev=650238&r1=650237&r2=650238&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_4/build.xml (original)
+++ webservices/wss4j/branches/1_5_4/build.xml Mon Apr 21 12:58:20 2008
@@ -9,7 +9,7 @@
ANT is available from http://jakarta.apache.org/ant/index.html
Prerequisites:
- See the README file
+ See the README file
Build Instructions:
To build, run
@@ -29,7 +29,7 @@
<property name='product.version.minor' value='5'/>
<property name='product.version.level' value='4-SNAPSHOT'/>
<property name='product.version' value='${product.version.major}.${product.version.minor}.${product.version.level}'/>
- <property name="year" value="2005"/>
+ <property name="year" value="2008"/>
<property name="copyright" value="Copyright © ${year} Apache WSS4J Project. All Rights Reserved."/>
<!-- Give user a chance to override without editing this file
@@ -99,8 +99,8 @@
the CLASSPATH includes all required packages (see above
-->
-
-
+
+
<path id="classpath.libraries" description="3rd party libs">
<fileset dir="${dir.libs}">
<include name="**/*.jar"/>
@@ -152,11 +152,14 @@
<patternset id="distFiles">
<include name="build.xml"/>
<include name="LICENSE.txt"/>
+ <include name="NOTICE"/>
</patternset>
<patternset id="srcFiles">
<!-- for some strange reasons, I can't use ${src} but must use src -->
<include name="src/**/*"/>
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE"/>
</patternset>
<patternset id="srcSamplesFiles">
@@ -285,7 +288,7 @@
<!-- ################################################################## -->
<target name="prepare-src" depends="prepare"
- description="This target copies the Java sources and brands the version information">
+ description="This target copies the Java sources and brands the version information">
<!-- create directories -->
<mkdir dir="${build.classes}"/>
</target>
@@ -442,7 +445,7 @@
</path>
<property name="undeploy_xml_property" refid="undeploy_xml_files"/>
- <antcall target="deployWSDD" />
+ <antcall target="deployWSDD" />
<junit printsummary="yes"
haltonfailure="yes"
fork="yes"
@@ -469,7 +472,7 @@
"${build.work}/org/apache/ws/axis/oasis/ping/undeploy.wsdd"/>
</java>
- <junit printsummary="yes"
+ <junit printsummary="yes"
haltonfailure="yes"
fork="yes"
dir="${basedir}">
@@ -567,14 +570,14 @@
</java>
</target>
- <!--
- This runs the selected scenario with SimpleAxisServer locally.
- Before you start this target be sure you have started tcpmon too
+ <!--
+ This runs the selected scenario with SimpleAxisServer locally.
+ Before you start this target be sure you have started tcpmon too
in a separate
- "ant tcpmon" call.
- To run different scenarios use: "ant -DNumber=x scenarioTest"
+ "ant tcpmon" call.
+ To run different scenarios use: "ant -DNumber=x scenarioTest"
to run scenario x
- -->
+ -->
<target name="scenarioTest" depends="compile"
if="junit.present"
description="Runs all JUnit tests">
@@ -589,28 +592,28 @@
<echo message=
"Running interop test scenario ${Number} on SimpleAxisServer"/>
- <antcall target="deployWSDD" />
-
+ <antcall target="deployWSDD" />
+
<java classname="interop.TestScenario${Number}" fork="yes"
dir="${basedir}">
<jvmarg value="-Djava.endorsed.dirs=${basedir}/endorsed"/>
<classpath refid="classpath.library"/>
</java>
- <antcall target="undeployWSDD" />
+ <antcall target="undeployWSDD" />
</target>
-
- <!--
- This runs the selected scenario with SimpleAxisServer locally
+
+ <!--
+ This runs the selected scenario with SimpleAxisServer locally
with perfomance
- timing switched on.
- You may also emable the **.TIME entry in log4j.properties to get
+ timing switched on.
+ You may also emable the **.TIME entry in log4j.properties to get
the internal
- timing.
- To run different scenarios use: "ant -DNumber=x scenarioTest"
+ timing.
+ To run different scenarios use: "ant -DNumber=x scenarioTest"
to run scenario x
- -->
+ -->
<target name="performanceTest" depends="compile"
if="junit.present"
description="Runs all JUnit tests">
@@ -625,17 +628,17 @@
<echo message=
"Running performance test scenario ${Number} on SimpleAxisServer"/>
- <antcall target="deployWSDD" />
+ <antcall target="deployWSDD" />
<java classname="interop.TestScenario${Number}" fork="yes"
dir="${basedir}">
<jvmarg value="-Djava.endorsed.dirs=${basedir}/endorsed"/>
<arg value="-lhttp://localhost:8080/axis/services/Ping${Number}" />
- <arg value="-t" />
+ <arg value="-t" />
<classpath refid="classpath.library"/>
</java>
- <antcall target="undeployWSDD" />
+ <antcall target="undeployWSDD" />
</target>
-
+
<target name="deployWSDD">
<path id="deploy_xml_files">
<fileset dir="${build.work}">
@@ -663,7 +666,7 @@
<arg line="${deploy_xml_property}"/>
</java>
</target>
-
+
<target name="undeployWSDD">
<path id="undeploy_xml_files">
<fileset dir="${build.work}">
@@ -685,8 +688,8 @@
<arg line="${undeploy_xml_property}"/>
</java>
</target>
-
- <!-- generate a report from all the tests.
+
+ <!-- generate a report from all the tests.
requires Xalan or other XSLT engine in ant\lib-->
<target name="report" depends="init">
@@ -706,11 +709,13 @@
<jar jarfile="${build.dir}/${jar.library}"
basedir="${build.classes}"
- includes="**/*, *.txt"
+ includes="**/*, *.txt, NOTICE"
excludes="components/**, *.properties, **/sandbox/**, wssec/**, **/interop/**, **/oasis/**, **/samples/**"
/>
</target>
+ <target name="dist" depends="bindist, otherdist, srcdist"/>
+
<target name="bindist" depends="gump"
description="Build zip file for distro">
<delete dir="${dir.dist}"/>
@@ -734,15 +739,15 @@
<target name="otherdist" depends="init"
description="Build zip for required jars">
- <mkdir dir="${dir.dist}"/>
- <zip destfile=
+ <mkdir dir="${dir.dist}"/>
+ <zip destfile=
"${dir.dist}/${product.shortname}-otherjars-${product.version}.zip">
- <zipfileset prefix="wss4j" dir="."
- includes="lib/*.jar, endorsed/*.jar"/>
- </zip>
- </target>
-
- <target name="srcdist" depends="init" description=
+ <zipfileset prefix="wss4j" dir="."
+ includes="lib/*.jar, endorsed/*.jar"/>
+ </zip>
+ </target>
+
+ <target name="srcdist" depends="init" description=
"Build source zip file for distro">
<mkdir dir="${dir.dist}"/>
<zip destfile=
Modified: webservices/wss4j/branches/1_5_4/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_4/pom.xml?rev=650238&r1=650237&r2=650238&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_4/pom.xml (original)
+++ webservices/wss4j/branches/1_5_4/pom.xml Mon Apr 21 12:58:20 2008
@@ -70,6 +70,18 @@
<email>ruchithf@apache.org</email>
<organization></organization>
</developer>
+ <developer>
+ <name>Nandana Mihindukulasooriya</name>
+ <id>nandana</id>
+ <email>nandana@apache.org</email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Fred Dushin</name>
+ <id>fadushin</id>
+ <email>fadushin@apache.org</email>
+ <organization></organization>
+ </developer>
</developers>
<licenses>
<license>
@@ -90,24 +102,15 @@
</organization>
<build>
<sourceDirectory>src</sourceDirectory>
- <resources>
-
- <resource>
-
- <directory>src</directory>
-
- <includes>
-
- <include>org/**/errors.properties</include>
-
- </includes>
-
- <filtering>false</filtering>
-
- </resource>
-
- </resources>
-
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>org/**/errors.properties</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
<!--<testSourceDirectory>test</testSourceDirectory> -->
<plugins>
<plugin>
@@ -122,7 +125,7 @@
<copy todir="${project.build.outputDirectory}/META-INF">
<fileset dir="${basedir}">
<include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
+ <include name="NOTICE"/>
</fileset>
</copy>
</tasks>
@@ -136,32 +139,32 @@
<phase>generate-resources</phase>
<configuration>
<tasks>
-
- <mkdir dir="target/work"/>
- <axis-wsdl2java
- output="target/work"
- serverSide="yes"
- testcase="no"
- verbose="no"
- url="interop/ping.wsdl">
- <mapping
- namespace="http://xmlsoap.org/Ping"
- package="org.apache.ws.axis.oasis.ping"/>
- </axis-wsdl2java>
-
- <echo message="Starting http server."/>
+
+ <mkdir dir="target/work"/>
+ <axis-wsdl2java
+ output="target/work"
+ serverSide="yes"
+ testcase="no"
+ verbose="no"
+ url="interop/ping.wsdl">
+ <mapping
+ namespace="http://xmlsoap.org/Ping"
+ package="org.apache.ws.axis.oasis.ping"/>
+ </axis-wsdl2java>
+
+ <echo message="Starting http server."/>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
- <execution>
+ <execution>
<id>stopServer</id>
<phase>install</phase>
<configuration>
<tasks>
- <echo message="Stopping http server."/>
+ <echo message="Stopping http server."/>
</tasks>
</configuration>
<goals>
@@ -199,7 +202,7 @@
</configuration>
</plugin>
- <!--<plugin>
+ <!--<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
@@ -210,7 +213,7 @@
</excludes>
</configuration>
</plugin> -->
-
+
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -295,7 +298,7 @@
</profiles>
<properties>
<xmlsec.version>1.4.0</xmlsec.version>
- <opensaml.version>1.1</opensaml.version>
+ <opensaml.version>1.1</opensaml.version>
<xml.apis.version>1.3.03</xml.apis.version>
<bcprov.jdk13.version>132</bcprov.jdk13.version>
<bcprov.jdk15.version>132</bcprov.jdk15.version>
@@ -306,53 +309,53 @@
<junit.version>3.8.1</junit.version>
</properties>
<repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <id>apache-snapshots</id>
- <name>Apache Maven2 SNAPSHOTS</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
- <id>apache-ws-snapshots2</id>
- <name>Apache ws.zones - 2</name>
- <url>http://ws.zones.apache.org/repository2/</url>
- </repository>
- <repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
- <id>maven2</id>
- <name>Maven2 repo</name>
- <url>http://repo1.maven.org/maven2/</url>
- </repository>
- </repositories>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <id>apache-snapshots</id>
+ <name>Apache Maven2 SNAPSHOTS</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ <id>apache-ws-snapshots2</id>
+ <name>Apache ws.zones - 2</name>
+ <url>http://ws.zones.apache.org/repository2/</url>
+ </repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ <id>maven2</id>
+ <name>Maven2 repo</name>
+ <url>http://repo1.maven.org/maven2/</url>
+ </repository>
+ </repositories>
<pluginRepositories>
<pluginRepository>
<id>snapshot</id>
@@ -393,39 +396,39 @@
<artifactId>opensaml</artifactId>
<version>${opensaml.version}</version>
</dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>${axis.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-ant</artifactId>
- <version>${axis.version}</version>
- </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>${axis.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-ant</artifactId>
+ <version>${axis.version}</version>
+ </dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml.apis.version}</version>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml.apis.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
-
+
<reporting>
<plugins>
<!--plugin>
Added: webservices/wss4j/branches/1_5_4/src/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_4/src/META-INF/LICENSE.txt?rev=650238&view=auto
==============================================================================
--- webservices/wss4j/branches/1_5_4/src/META-INF/LICENSE.txt (added)
+++ webservices/wss4j/branches/1_5_4/src/META-INF/LICENSE.txt Mon Apr 21 12:58:20 2008
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
Propchange: webservices/wss4j/branches/1_5_4/src/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/wss4j/branches/1_5_4/src/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: webservices/wss4j/branches/1_5_4/src/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_4/src/META-INF/NOTICE?rev=650238&view=auto
==============================================================================
--- webservices/wss4j/branches/1_5_4/src/META-INF/NOTICE (added)
+++ webservices/wss4j/branches/1_5_4/src/META-INF/NOTICE Mon Apr 21 12:58:20 2008
@@ -0,0 +1,8 @@
+Apache WSS4J
+Copyright 2004-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software Copyright University of Southampton IT
+Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
Propchange: webservices/wss4j/branches/1_5_4/src/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/wss4j/branches/1_5_4/src/META-INF/NOTICE
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org