Author: jochen Date: Wed Oct 26 12:42:00 2005 New Revision: 328717 URL: http://svn.apache.org/viewcvs?rev=328717&view=rev Log: Mavenized the project.
Added: webservices/commons/trunk/util/.classpath webservices/commons/trunk/util/.project webservices/commons/trunk/util/LICENSE.txt webservices/commons/trunk/util/project.properties webservices/commons/trunk/util/project.xml Modified: webservices/commons/trunk/util/ (props changed) webservices/commons/trunk/util/build.xml webservices/commons/trunk/util/src/test/org/apache/ws/commons/util/test/Base64Test.java Propchange: webservices/commons/trunk/util/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Oct 26 12:42:00 2005 @@ -0,0 +1,2 @@ + +target Added: webservices/commons/trunk/util/.classpath URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/util/.classpath?rev=328717&view=auto ============================================================================== --- webservices/commons/trunk/util/.classpath (added) +++ webservices/commons/trunk/util/.classpath Wed Oct 26 12:42:00 2005 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<classpath> + <classpathentry excluding="" kind="src" path="src/java"> + </classpathentry> + <classpathentry output="target/test-classes" kind="src" path="src/test"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/xml-apis/jars/xml-apis-1.3.02.jar"> + </classpathentry> + <classpathentry kind="output" path="target/classes"> + </classpathentry> +</classpath> \ No newline at end of file Added: webservices/commons/trunk/util/.project URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/util/.project?rev=328717&view=auto ============================================================================== --- webservices/commons/trunk/util/.project (added) +++ webservices/commons/trunk/util/.project Wed Oct 26 12:42:00 2005 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<projectDescription> + <name>ws-commons-util</name> + <comment>These classes are used for creating and reading XML with JAXP 1.1. In other words, without the javax.xml.transform package.</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Added: webservices/commons/trunk/util/LICENSE.txt URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/util/LICENSE.txt?rev=328717&view=auto ============================================================================== --- webservices/commons/trunk/util/LICENSE.txt (added) +++ webservices/commons/trunk/util/LICENSE.txt Wed Oct 26 12:42:00 2005 @@ -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. Modified: webservices/commons/trunk/util/build.xml URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/util/build.xml?rev=328717&r1=328716&r2=328717&view=diff ============================================================================== --- webservices/commons/trunk/util/build.xml (original) +++ webservices/commons/trunk/util/build.xml Wed Oct 26 12:42:00 2005 @@ -1,84 +1,156 @@ -<!-- - * Copyright 2002-2004 The Apache Software Foundation - * - * 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. ---> -<project name="ws-commons-util" default="all"> - <property name="debug" value="true"/> - <property name="optimize" value="true"/> - <property name="source.version" value="1.2"/> - <property name="target.version" value="1.2"/> - <property name="build" location="build"/> - <property name="build.classes" location="${build}/classes"/> - <property name="build.dist" location="${build}/dist"/> - <property name="build.test" location="${build}/test"/> - <property name="build.test.classes" location="${build.test}/classes"/> - <property name="build.test.reports" location="${build.test}/reports"/> - <property name="util.jar" location="${build.dist}/ws-commons-util.jar"/> - <property name="util-src.zip" location="${build.dist}/ws-commons-util-src.zip"/> +<?xml version="1.0" encoding="UTF-8"?> - <path id="class.path"> - <pathelement location="${java5.jar}"/> - <pathelement location="lib/junit-3.8.1.jar"/> - </path> +<!--build.xml generated by maven from project.xml version 1.0 + on date October 26 2005, time 2138--> - <path id="test.path"> - <path refid="class.path"/> - <pathelement location="${util.jar}"/> - </path> - - <target name="clean" description="Cleans the build directory"> - <mkdir dir="${build}"/> - </target> - - <target name="compile"> - <mkdir dir="${build.classes}"/> - <javac debug="${debug}" optimize="${optimize}" - source="${source.version}" target="${target.version}" - srcdir="src/java" destdir="${build.classes}" - classpathref="class.path"/> - </target> - - <target name="jar" depends="compile"> - <mkdir dir="${build.dist}"/> - <jar destfile="${util.jar}"> - <fileset dir="${build.classes}"/> - </jar> - <zip destfile="${util-src.zip}"> - <fileset dir="src/java"/> - </zip> - </target> - - <target name="all" depends="jar" description="Builds everything"/> - - <target name="test" depends="all" description="Runs the test suite"> - <mkdir dir="${build.test.classes}"/> - <javac debug="${debug}" optimize="${optimize}" - source="${source.version}" target="${target.version}" - srcdir="src/test" destdir="${build.test.classes}" - classpathref="test.path"/> - <mkdir dir="${build.test.reports}"/> - <junit printSummary="yes"> - <formatter type="plain"/> - <classpath> - <path refid="test.path"/> - <pathelement location="${build.test.classes}"/> - </classpath> - <batchtest todir="${build.test.reports}"> - <fileset dir="${build.test.classes}"> - <include name="**/*Test.class"/> - </fileset> - </batchtest> - </junit> - </target> -</project> +<project default="jar" name="ws-commons-util" basedir="."> + <property name="defaulttargetdir" value="target"> + </property> + <property name="libdir" value="target/lib"> + </property> + <property name="classesdir" value="target/classes"> + </property> + <property name="testclassesdir" value="target/test-classes"> + </property> + <property name="testclassesdir" value="target/test-classes"> + </property> + <property name="testreportdir" value="target/test-reports"> + </property> + <property name="distdir" value="dist"> + </property> + <property name="javadocdir" value="dist/docs/api"> + </property> + <property name="final.name" value="ws-commons-util-1.0"> + </property> + <path id="build.classpath"> + <fileset dir="${libdir}"> + <include name="**/*.jar"> + </include> + </fileset> + </path> + <target name="init" description="o Initializes some properties"> + <mkdir dir="${libdir}"> + </mkdir> + <condition property="noget"> + <equals arg2="only" arg1="${build.sysclasspath}"> + </equals> + </condition> + <!--Test if JUNIT is present in ANT classpath--> + + <available property="Junit.present" classname="junit.framework.Test"> + </available> + </target> + <target name="compile" description="o Compile the code" depends="get-deps"> + <mkdir dir="${classesdir}"> + </mkdir> + <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> + <src> + <pathelement location="src/java"> + </pathelement> + </src> + <classpath refid="build.classpath"> + </classpath> + </javac> + </target> + <target name="jar" description="o Create the jar" depends="compile,test"> + <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> + </jar> + </target> + <target name="clean" description="o Clean up the generated directories"> + <delete dir="${defaulttargetdir}"> + </delete> + <delete dir="${distdir}"> + </delete> + </target> + <target name="dist" description="o Create a distribution" depends="jar, javadoc"> + <mkdir dir="dist"> + </mkdir> + <copy todir="dist"> + <fileset dir="${defaulttargetdir}" includes="*.jar"> + </fileset> + <fileset dir="${basedir}" includes="LICENSE*, README*"> + </fileset> + </copy> + </target> + <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test"> + <fail message="There were test failures."> + </fail> + </target> + <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"> + <mkdir dir="${testreportdir}"> + </mkdir> + <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true"> + <sysproperty key="basedir" value="."> + </sysproperty> + <formatter type="xml"> + </formatter> + <formatter usefile="false" type="plain"> + </formatter> + <classpath> + <path refid="build.classpath"> + </path> + <pathelement path="${testclassesdir}"> + </pathelement> + <pathelement path="${classesdir}"> + </pathelement> + </classpath> + <batchtest todir="${testreportdir}"> + <fileset dir="src/test"> + </fileset> + </batchtest> + </junit> + </target> + <target name="junit-present" unless="Junit.present" depends="init"> + <echo>================================= WARNING ================================</echo> + <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo> + <echo>==========================================================================</echo> + </target> + <target name="compile-tests" if="Junit.present" depends="junit-present,compile"> + <mkdir dir="${testclassesdir}"> + </mkdir> + <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> + <src> + <pathelement location="src/test"> + </pathelement> + </src> + <classpath> + <path refid="build.classpath"> + </path> + <pathelement path="${classesdir}"> + </pathelement> + </classpath> + </javac> + </target> + <target name="javadoc" description="o Generate javadoc" depends="get-deps"> + <mkdir dir="${javadocdir}"> + </mkdir> + <tstamp> + <format pattern="2005-yyyy" property="year"> + </format> + </tstamp> + <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved."> + </property> + <property name="title" value="ws-commons-util 1.0 API"> + </property> + <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.ws.commons.util.*"> + <classpath> + <path refid="build.classpath"> + </path> + </classpath> + </javadoc> + </target> + <target name="get-deps" unless="noget" depends="init"> + <!--Proxy settings works only with a JDK 1.2 and higher.--> + + <setproxy> + </setproxy> + <get dest="${libdir}/xml-apis-1.3.02.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.3.02.jar"> + </get> + </target> + <target name="install-maven"> + <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"> + </get> + <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> + </unjar> + </target> +</project> \ No newline at end of file Added: webservices/commons/trunk/util/project.properties URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/util/project.properties?rev=328717&view=auto ============================================================================== --- webservices/commons/trunk/util/project.properties (added) +++ webservices/commons/trunk/util/project.properties Wed Oct 26 12:42:00 2005 @@ -0,0 +1,7 @@ +# Configuration of the Artifact plugin, for deploying the generated jar file +maven.repo.list=apache_dist +maven.repo.apache_dist=scp://people.apache.org +maven.repo.apache_dist.directory=/www/www.apache.org/dist/java-repository +maven.repo.apache_dist.username=jochen +maven.repo.apache_dist.privatekey=/home/jwi/.ssh/id_dsa +maven.repo.apache_dist.passphrase= Added: webservices/commons/trunk/util/project.xml URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/util/project.xml?rev=328717&view=auto ============================================================================== --- webservices/commons/trunk/util/project.xml (added) +++ webservices/commons/trunk/util/project.xml Wed Oct 26 12:42:00 2005 @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <pomVersion>3</pomVersion> + <artifactId>ws-commons-util</artifactId> + <name>ws-commons-util</name> + <groupId>ws-commons-util</groupId> + <currentVersion>1.0</currentVersion> + <organization> + <name>Apache Software Foundation</name> + <url>http://ws.apache.org/</url> + <logo>/images/project-logo.jpg</logo> + </organization> + <inceptionYear>2005</inceptionYear> + <package>org.apache.ws.commons.util</package> + <description>These classes are used for creating and reading XML with JAXP 1.1. In other words, without the javax.xml.transform package.</description> + <shortDescription>Utility classes for creating and reading XML.</shortDescription> + <url>http://ws.apache.org/commons/util</url> + <siteAddress>ws.apache.org</siteAddress> + <siteDirectory>/www/ws.apache.org/commons/util</siteDirectory> + <distributionSite>people.apache.org</distributionSite> + <distributionDirectory>/www/www.apache.org/dist/ws/commons/util</distributionDirectory> + <repository> + <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/util</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/util</developerConnection> + <url>http://svn.apache.org/viewcvs.cgi/webservices/commons/trunk/util/</url> + </repository> + <developers> + <developer> + <name>Jochen Wiedmann</name> + <id>jochen</id> + <email>[EMAIL PROTECTED]</email> + </developer> + </developers> + <dependencies> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.3.02</version> + <type>jar</type> + </dependency> + </dependencies> + <build> + <nagEmailAddress>general@ws.apache.org</nagEmailAddress> + <sourceDirectory>src/java</sourceDirectory> + <unitTestSourceDirectory>src/test</unitTestSourceDirectory> + </build> + <reports> + <report>maven-license-plugin</report> + <report>maven-javadoc-plugin</report> + </reports> +</project> + Modified: webservices/commons/trunk/util/src/test/org/apache/ws/commons/util/test/Base64Test.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/util/src/test/org/apache/ws/commons/util/test/Base64Test.java?rev=328717&r1=328716&r2=328717&view=diff ============================================================================== --- webservices/commons/trunk/util/src/test/org/apache/ws/commons/util/test/Base64Test.java (original) +++ webservices/commons/trunk/util/src/test/org/apache/ws/commons/util/test/Base64Test.java Wed Oct 26 12:42:00 2005 @@ -39,7 +39,6 @@ bytes[j] = (byte) j; } String s = Base64.encode(bytes); - System.out.println(s); byte[] result = Base64.decode(s); assertTrue(Arrays.equals(bytes, result)); }