[pkg-java] r3027 - in trunk/axis/debian: . patches

Michael Koch mkoch at alioth.debian.org
Sat Mar 3 11:44:54 CET 2007


Author: mkoch
Date: 2007-03-03 10:44:54 +0000 (Sat, 03 Mar 2007)
New Revision: 3027

Added:
   trunk/axis/debian/libaxis-java.install
   trunk/axis/debian/patches/01-libaxis-java-build.patch
   trunk/axis/debian/patches/axis-bz152255.patch
Removed:
   trunk/axis/debian/ant.properties
   trunk/axis/debian/dirs
   trunk/axis/debian/docs
   trunk/axis/debian/patches/01axis-bz152255.patch
   trunk/axis/debian/patches/02axis-imageio.patch
   trunk/axis/debian/patches/03axis-objectweb.patch
Modified:
   trunk/axis/debian/
   trunk/axis/debian/changelog
   trunk/axis/debian/compat
   trunk/axis/debian/control
   trunk/axis/debian/copyright
   trunk/axis/debian/libaxis-java-doc.docs
   trunk/axis/debian/patches/
   trunk/axis/debian/rules
Log:
axis (1.4-1) experimental; urgency=low

  * Merged from Ubuntu.
  * Upload to experimental.

 -- Michael Koch <konqueror at gmx.de>  Sat,  3 Mar 2007 10:48:11 +0100

axis (1.4-0ubuntu5) feisty; urgency=low

  * Fix build failure for binary arch builds.

 -- Matthias Klose <doko at ubuntu.com>  Wed, 28 Feb 2007 17:10:36 +0100

axis (1.4-0ubuntu4) feisty; urgency=low

  * Recommend ant, instead of depending on it.
  * Install axis-ant.jar into usr/share/ant/lib.

 -- Matthias Klose <doko at ubuntu.com>  Wed, 28 Feb 2007 12:22:49 +0100

axis (1.4-0ubuntu3) feisty; urgency=low

  * Build a libaxis-java-gcj package.
  * Set Ubuntu maintainer address.

 -- Matthias Klose <doko at ubuntu.com>  Wed, 28 Feb 2007 01:06:05 +0100

axis (1.4-0ubuntu2) feisty; urgency=low

  * Added axis-ant.jar to the binary package

 -- Vladim?\195?\131?\194?\173r Lap?\195?\131?\194?\161?\195?\132?\194?\141ek <vladimir.lapacek at gmail.com>  Sat, 20 Jan 2007 11:09:48 +0100

axis (1.4-0ubuntu1) edgy; urgency=low

  * New upstream release.

 -- Vladim?\195?\131?\194?\173r Lap?\195?\131?\194?\161?\195?\132?\194?\141ek <vladimir.lapacek at gmail.com>  Wed,  6 Sep 2006 22:31:39 +0200




Property changes on: trunk/axis/debian
___________________________________________________________________
Name: svn:ignore
   + files
libaxis-java
libaxis-java-doc
libaxis-java-gcj
libaxis-java-gcj.substvars
stamp-*
*.debhelper


Deleted: trunk/axis/debian/ant.properties
===================================================================
--- trunk/axis/debian/ant.properties	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/ant.properties	2007-03-03 10:44:54 UTC (rev 3027)
@@ -1,9 +0,0 @@
-#build.sysclasspath=only
-build.sysclasspath=first
-xercesImpl.jar=/usr/share/java/xercesImpl.jar
-xmlParserAPIs.jar=/usr/share/java/xmlParserAPIs.jar
-xalan-unbundled.jar=/usr/share/java/xalan2.jar
-xml-apis.jar=/usr/share/java/xml-apis.jar
-xerces.jar=/usr/share/java/xerces.jar
-servlet.jar=/usr/share/java/servlet-2.4.jar
-j2ee.jar=/usr/share/java/servlet-2.4.jar

Modified: trunk/axis/debian/changelog
===================================================================
--- trunk/axis/debian/changelog	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/changelog	2007-03-03 10:44:54 UTC (rev 3027)
@@ -1,3 +1,42 @@
+axis (1.4-1) experimental; urgency=low
+
+  * Merged from Ubuntu.
+  * Upload to experimental.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat,  3 Mar 2007 10:48:11 +0100
+
+axis (1.4-0ubuntu5) feisty; urgency=low
+
+  * Fix build failure for binary arch builds.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 28 Feb 2007 17:10:36 +0100
+
+axis (1.4-0ubuntu4) feisty; urgency=low
+
+  * Recommend ant, instead of depending on it.
+  * Install axis-ant.jar into usr/share/ant/lib.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 28 Feb 2007 12:22:49 +0100
+
+axis (1.4-0ubuntu3) feisty; urgency=low
+
+  * Build a libaxis-java-gcj package.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 28 Feb 2007 01:06:05 +0100
+
+axis (1.4-0ubuntu2) feisty; urgency=low
+
+  * Added axis-ant.jar to the binary package
+
+ -- Vladimír Lapáček <vladimir.lapacek at gmail.com>  Sat, 20 Jan 2007 11:09:48 +0100
+
+axis (1.4-0ubuntu1) edgy; urgency=low
+
+  * New upstream release.
+
+ -- Vladimír Lapáček <vladimir.lapacek at gmail.com>  Wed,  6 Sep 2006 22:31:39 +0200
+
 axis (1.2.1-1) unstable; urgency=low
 
   * Initial version based of the work of the Fedora packagers.

Modified: trunk/axis/debian/compat
===================================================================
--- trunk/axis/debian/compat	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/compat	2007-03-03 10:44:54 UTC (rev 3027)
@@ -1 +1 @@
-4
+5

Modified: trunk/axis/debian/control
===================================================================
--- trunk/axis/debian/control	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/control	2007-03-03 10:44:54 UTC (rev 3027)
@@ -2,16 +2,16 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stephan Michels <stephan at apache.org>
-Priority: optional
-Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, cacao, ant, junit (>= 3.8.1), libservlet2.4-java, libgnumail-java, liboro-java, liblog4j1.2-java, libcommons-logging-java, libgnujaf-java, libcommons-httpclient3-java, libcommons-net-java, libcommons-discovery-java, libbsf-java
-Standards-Version: 3.6.1
+Uploaders: Stephan Michels <stephan at apache.org>, Vladimír Lapáček <vladimir.lapacek at gmail.com>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional, java-gcj-compat-dev, libwsdl4j-java, libcommons-logging-java, libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.4-java
+Standards-Version: 3.7.2
 
 Package: libaxis-java
 Architecture: all
 Section: libs
+Recommends: ant, libaxis-java-gcj
 Suggests: libaxis-java-doc
-Depends:  kaffe (>= 2:1.1.5) | java1-runtime | java2-runtime, libservlet2.4-java, ant
+Depends: java-gcj-compat | java1-runtime | java2-runtime, libservlet2.4-java
 Description: A SOAP implementation in Java
  Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
  submission to W3C.
@@ -27,11 +27,21 @@
  .
  This project is a follow-on to the Apache SOAP project.
 
+Package: libaxis-java-gcj
+Architecture: any
+Section: libs
+Depends: libaxis-java (>= ${source:Version}), libservlet2.4-java-gcj, ${misc:Depends}, ${shlibs:Depends}
+Description: A SOAP implementation in Java (native code)
+ Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
+ submission to W3C.
+ .
+ This package contains the natively compiled code for use by gij.
+
 Package: libaxis-java-doc
 Architecture: all
 Section: doc
 Suggests: libaxis-java
-Description: Documentation for libaxis-java
+Description: A SOAP implementation in Java
  Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
  submission to W3C.
  .
@@ -46,4 +56,4 @@
  .
  This project is a follow-on to the Apache SOAP project.
  .
- This package contains the documentation for libaxis-java.
+ This package contains the Javadoc API documentation.

Modified: trunk/axis/debian/copyright
===================================================================
--- trunk/axis/debian/copyright	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/copyright	2007-03-03 10:44:54 UTC (rev 3027)
@@ -1,215 +1,216 @@
-This package was debianized by Stephan Michels <stephan at apache.org> on
-Thu,  11 Jan 2006 17:04:27 +0200.
-
-It was downloaded from http://ws.apache.org/axis/
-
-
-Copyright:
-
-
-                                 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.
-
-
-
-
-
+This package was debianized by Vladimír Lapáček <vladimir.lapacek at gmail.com> on
+Wed,  6 Sep 2006 22:31:39 +0200.
+
+It was downloaded from http://ws.apache.org/axis/
+
+Copyright Holder: Apache Software Foundation
+
+License:
+
+
+                                 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.
+
+
+
+The Debian packaging is (C) 2006, Vladimír Lapáček <vladimir.lapacek at gmail.com> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Deleted: trunk/axis/debian/dirs
===================================================================
--- trunk/axis/debian/dirs	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/dirs	2007-03-03 10:44:54 UTC (rev 3027)
@@ -1,2 +0,0 @@
-usr/share/java
-usr/share/ant/lib

Deleted: trunk/axis/debian/docs
===================================================================
--- trunk/axis/debian/docs	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/docs	2007-03-03 10:44:54 UTC (rev 3027)
@@ -1,4 +0,0 @@
-changelog.html
-LICENSE
-README
-release-notes.html

Modified: trunk/axis/debian/libaxis-java-doc.docs
===================================================================
--- trunk/axis/debian/libaxis-java-doc.docs	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/libaxis-java-doc.docs	2007-03-03 10:44:54 UTC (rev 3027)
@@ -1,2 +1 @@
-docs/*
-build/apiDocs
+build/javadocs

Added: trunk/axis/debian/libaxis-java.install
===================================================================
--- trunk/axis/debian/libaxis-java.install	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/libaxis-java.install	2007-03-03 10:44:54 UTC (rev 3027)
@@ -0,0 +1,4 @@
+build/lib/axis.jar usr/share/java
+build/lib/jaxrpc.jar usr/share/java
+build/lib/saaj.jar usr/share/java
+build/lib/axis-ant.jar usr/share/ant/lib


Property changes on: trunk/axis/debian/patches
___________________________________________________________________
Name: svn:ignore
   + *.log


Added: trunk/axis/debian/patches/01-libaxis-java-build.patch
===================================================================
--- trunk/axis/debian/patches/01-libaxis-java-build.patch	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/patches/01-libaxis-java-build.patch	2007-03-03 10:44:54 UTC (rev 3027)
@@ -0,0 +1,17 @@
+--- build.xml.orig	2006-09-07 20:35:59.000000000 +0000
++++ build.xml	2006-09-07 20:36:24.000000000 +0000
+@@ -223,12 +223,12 @@
+         </section>
+       </manifest>
+     </jar>
+-    <copy file="${wsdl4j.jar}" toDir="${build.lib}"/>
++<!--    <copy file="${wsdl4j.jar}" toDir="${build.lib}"/>
+     <copy file="${commons-logging.jar}" toDir="${build.lib}"/>
+     <copy file="${commons-discovery.jar}" toDir="${build.lib}"/>
+     <copy file="${log4j-core.jar}" toDir="${build.lib}"/>
+     <copy file="${src.dir}/log4j.properties"
+-          toDir="${build.lib}"/>
++          toDir="${build.lib}"/>-->
+ 
+      <!--  Build the new org.apache.axis.tools.ant stuff -->
+      <mkdir dir="${axis.home}/tools/lib" />

Deleted: trunk/axis/debian/patches/01axis-bz152255.patch
===================================================================
--- trunk/axis/debian/patches/01axis-bz152255.patch	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/patches/01axis-bz152255.patch	2007-03-03 10:44:54 UTC (rev 3027)
@@ -1,361 +0,0 @@
---- axis-1_2/src/org/apache/axis/SOAPPart.java~	2005-05-03 20:29:14.000000000 +0100
-+++ axis-1_2/src/org/apache/axis/SOAPPart.java	2005-06-07 11:28:33.000000000 +0100
-@@ -33,6 +33,7 @@
- import org.w3c.dom.Attr;
- import org.w3c.dom.CDATASection;
- import org.w3c.dom.Comment;
-+import org.w3c.dom.DOMConfiguration;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.DOMImplementation;
- import org.w3c.dom.Document;
-@@ -45,6 +46,7 @@
- import org.w3c.dom.NodeList;
- import org.w3c.dom.ProcessingInstruction;
- import org.w3c.dom.Text;
-+import org.w3c.dom.UserDataHandler;
- import org.xml.sax.InputSource;
- import org.xml.sax.SAXException;
- 
-@@ -1273,5 +1275,102 @@
-     public boolean isBodyStream() {
-         return (currentForm == SOAPPart.FORM_INPUTSTREAM || currentForm == SOAPPart.FORM_BODYINSTREAM);        
-     }
-+
-+    /**
-+     *  DOM Level 3 stubs
-+     */
-+
-+    public String getBaseURI() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public boolean getXmlStandalone() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public Object setUserData(
-+        String key, Object data, UserDataHandler handler) {
-+        throw new RuntimeException("not implemented");
-+    }
-+    
-+    public void setDocumentURI(String documentURI) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public void setXmlStandalone(boolean xmlStandalone) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public Node renameNode(Node n, String namespaceURI, String qualifiedName) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public String getInputEncoding() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public String getXmlEncoding() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public void setTextContent(String textContent) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public boolean isSameNode(Node other) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public String getDocumentURI() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public Object getFeature(String feature, String version) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public boolean isDefaultNamespace(String namespaceURI) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public String lookupPrefix(String namespaceURI) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public boolean isEqualNode(Node arg) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public void setXmlVersion(String xmlVersion) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public String getXmlVersion() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public Object getUserData(String key) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public String getTextContent() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public void normalizeDocument() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public String lookupNamespaceURI(String prefix) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public DOMConfiguration getDomConfig() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public short compareDocumentPosition(Node other) {
-+        throw new RuntimeException("not implemented");
-+    }
- }
- 
---- axis-1_2/src/org/apache/axis/message/NodeImpl.java~	2005-05-03 20:28:58.000000000 +0100
-+++ axis-1_2/src/org/apache/axis/message/NodeImpl.java	2005-06-07 12:22:15.000000000 +0100
-@@ -30,6 +30,8 @@
- import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
- import org.w3c.dom.Text;
-+import org.w3c.dom.TypeInfo;
-+import org.w3c.dom.UserDataHandler;
- import org.xml.sax.Attributes;
- import org.xml.sax.helpers.AttributesImpl;
- 
-@@ -834,4 +836,74 @@
-             ((NodeImpl) parent).setDirty(true);
-         }
-     }
-+
-+    /**
-+     *  DOM Level 3 stubs
-+     */
-+
-+    public void setIdAttributeNS(
-+        String namespaceURI, String localName, boolean isId) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public void setIdAttribute(String name, boolean isId) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public void setIdAttributeNode(Attr idAttr, boolean isId) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public TypeInfo getSchemaTypeInfo() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public Object setUserData(
-+        String key, Object data, UserDataHandler handler) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public String getBaseURI() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public String getTextContent() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public boolean isSameNode(Node other) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public void setTextContent(String textContent) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public Object getUserData(String key) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public boolean isDefaultNamespace(String namespaceURI) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public Object getFeature(String feature, String version) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public boolean isEqualNode(Node arg) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public short compareDocumentPosition(Node other) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public String lookupNamespaceURI(String prefix) {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public String lookupPrefix(String namespaceURI) {
-+        throw new RuntimeException("not implemented");
-+    }
- }
---- axis-1_2/src/org/apache/axis/message/SOAPDocumentImpl.java~	2005-05-03 20:29:08.000000000 +0100
-+++ axis-1_2/src/org/apache/axis/message/SOAPDocumentImpl.java	2005-06-07 12:31:30.000000000 +0100
-@@ -25,6 +25,7 @@
- import org.w3c.dom.Attr;
- import org.w3c.dom.CDATASection;
- import org.w3c.dom.Comment;
-+import org.w3c.dom.DOMConfiguration;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.DOMImplementation;
- import org.w3c.dom.Document;
-@@ -36,6 +37,7 @@
- import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
- import org.w3c.dom.ProcessingInstruction;
-+import org.w3c.dom.UserDataHandler;
- 
- import javax.xml.parsers.ParserConfigurationException;
- import javax.xml.soap.SOAPException;
-@@ -680,4 +682,113 @@
-     public boolean hasAttributes() {
-         throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-     }
-+
-+    /**
-+     *  DOM Level 3 stubs
-+     */
-+
-+    public String getBaseURI() {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public boolean getXmlStandalone() {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public boolean getStrictErrorChecking() {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public void setXmlStandalone(boolean xmlStandalone) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public Node renameNode(Node n, String namespaceURI, String qualifiedName) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public void setStrictErrorChecking(boolean strictErrorChecking) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public Object setUserData(
-+        String key, Object data, UserDataHandler handler) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+    
-+    public String getInputEncoding() {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+    
-+    public String getXmlEncoding() {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public void setTextContent(String textContent) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public boolean isSameNode(Node other) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public String getDocumentURI() {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public void setDocumentURI(String documentURI) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public Object getFeature(String feature, String version) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public Node adoptNode(Node source) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public boolean isDefaultNamespace(String namespaceURI) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public boolean isEqualNode(Node arg) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public void setXmlVersion(String xmlVersion) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public String getXmlVersion() {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public String lookupPrefix(String namespaceURI) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public Object getUserData(String key) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public String getTextContent() {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public void normalizeDocument() {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public String lookupNamespaceURI(String prefix) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public DOMConfiguration getDomConfig() {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
-+
-+    public short compareDocumentPosition(Node other) {
-+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
-+    }
- }
---- axis-1_2/src/org/apache/axis/message/Text.java~	2005-05-03 20:29:21.000000000 +0100
-+++ axis-1_2/src/org/apache/axis/message/Text.java	2005-06-07 12:34:19.000000000 +0100
-@@ -213,4 +213,19 @@
-         return ( textRep.getData() != null ? textRep.getData().hashCode() : 0 );
-     }
- 
-+    /**
-+     *  DOM Level 3 stubs
-+     */
-+
-+    public String getWholeText() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public boolean isElementContentWhitespace() {
-+        throw new RuntimeException("not implemented");
-+    }
-+
-+    public org.w3c.dom.Text replaceWholeText(String content) {
-+        throw new RuntimeException("not implemented");
-+    }
- }

Deleted: trunk/axis/debian/patches/02axis-imageio.patch
===================================================================
--- trunk/axis/debian/patches/02axis-imageio.patch	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/patches/02axis-imageio.patch	2007-03-03 10:44:54 UTC (rev 3027)
@@ -1,25 +0,0 @@
---- axis-1_2/src/org/apache/axis/components/image/MerlinIO.java.orig	2005-05-03 20:28:43.000000000 +0100
-+++ axis-1_2/src/org/apache/axis/components/image/MerlinIO.java	2005-06-07 12:00:01.000000000 +0100
-@@ -42,12 +42,6 @@
-      */
-     public void saveImage(String mimeType, Image image, OutputStream os)
-             throws Exception {
--        ImageWriter writer = null;
--        Iterator iter = javax.imageio.ImageIO.getImageWritersByMIMEType(mimeType);
--        if (iter.hasNext()) {
--            writer = (ImageWriter) iter.next();
--        }
--        writer.setOutput(javax.imageio.ImageIO.createImageOutputStream(os));
-         BufferedImage rendImage = null;
-         if (image instanceof BufferedImage) {
-             rendImage = (BufferedImage) image;
-@@ -59,8 +53,7 @@
-             Graphics g = rendImage.createGraphics();
-             g.drawImage(image, 0, 0, null);
-         }
--        writer.write(new IIOImage(rendImage, null, null));
--        writer.dispose();
-+        javax.imageio.ImageIO.write(rendImage, mimeType, os);
-     }
- 
-     /**

Deleted: trunk/axis/debian/patches/03axis-objectweb.patch
===================================================================
--- trunk/axis/debian/patches/03axis-objectweb.patch	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/patches/03axis-objectweb.patch	2007-03-03 10:44:54 UTC (rev 3027)
@@ -1,114 +0,0 @@
---- axis-1_2/src/org/apache/axis/handlers/ServiceInvocation.java	1970-01-01 01:00:00.000000000 +0100
-+++ jonas-axis/src/org/apache/axis/handlers/ServiceInvocation.java	2005-01-25 15:02:00.000000000 +0000
-@@ -0,0 +1,111 @@
-+
-+package org.apache.axis.handlers;
-+
-+import java.util.Iterator;
-+
-+import javax.xml.soap.SOAPBody;
-+import javax.xml.soap.SOAPElement;
-+import javax.xml.soap.SOAPEnvelope;
-+import javax.xml.soap.SOAPException;
-+import javax.xml.soap.SOAPMessage;
-+
-+import org.apache.axis.MessageContext;
-+
-+
-+
-+/**
-+ * Keep here the invocation info:
-+ * operation + arguments.
-+ * TODO This class should be in the jonas code.
-+ * @author Ph Durieux
-+ */
-+public class ServiceInvocation {
-+
-+    /**
-+     * @return Returns the argNames.
-+     */
-+    public String getArgNames() {
-+        return argNames;
-+    }
-+    /**
-+     * @param argNames The argNames to set.
-+     */
-+    public void setArgNames(String argNames) {
-+        this.argNames = argNames;
-+    }
-+    /**
-+     * @return Returns the methodName.
-+     */
-+    public String getMethodName() {
-+        return methodName;
-+    }
-+    /**
-+     * @param methodName The methodName to set.
-+     */
-+    public void setMethodName(String methodName) {
-+        this.methodName = methodName;
-+    }
-+    /**
-+     * @return Returns the numArgs.
-+     */
-+    public int getNumArgs() {
-+        return numArgs;
-+    }
-+    /**
-+     * @param numArgs The numArgs to set.
-+     */
-+    public void setNumArgs(int numArgs) {
-+        this.numArgs = numArgs;
-+    }
-+    private String methodName = "";
-+    private String argNames = "";
-+    private int numArgs = -1;
-+    
-+    public ServiceInvocation(MessageContext msgContext) {
-+
-+        SOAPMessage  reqMsg  = msgContext.getMessage();
-+        SOAPEnvelope reqEnv;
-+        try {
-+            reqEnv = reqMsg.getSOAPPart().getEnvelope();
-+        } catch (SOAPException e1) {
-+            e1.printStackTrace();
-+            return;
-+        }
-+        SOAPBody body;
-+        try {
-+            body = reqEnv.getBody();
-+        } catch (SOAPException e) {
-+            e.printStackTrace();
-+            return;
-+        }
-+        if (body == null) {
-+            return;
-+        }
-+        Iterator it = body.getChildElements();
-+        SOAPElement operation = (SOAPElement) it.next();
-+        methodName = operation.getNodeName();
-+        numArgs = 0;
-+        for (Iterator i = operation.getChildElements(); i.hasNext();) {
-+            SOAPElement elt = (SOAPElement) i.next();
-+            numArgs++;
-+            argNames += elt.getNodeName();
-+        }
-+    }
-+
-+    public boolean equals(Object obj) {
-+       if (obj == null) {
-+           return false;
-+       }
-+       return toString().equals(obj.toString());
-+    }
-+
-+    public int hashCode() {
-+       return numArgs;
-+    }
-+
-+    public String toString() {
-+       return "[method=" + methodName + ",Args=" + argNames + "]";
-+    }
-+
-+}
-+

Added: trunk/axis/debian/patches/axis-bz152255.patch
===================================================================
--- trunk/axis/debian/patches/axis-bz152255.patch	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/patches/axis-bz152255.patch	2007-03-03 10:44:54 UTC (rev 3027)
@@ -0,0 +1,361 @@
+--- axis-1_2/src/org/apache/axis/SOAPPart.java~	2005-05-03 20:29:14.000000000 +0100
++++ axis-1_2/src/org/apache/axis/SOAPPart.java	2005-06-07 11:28:33.000000000 +0100
+@@ -33,6 +33,7 @@
+ import org.w3c.dom.Attr;
+ import org.w3c.dom.CDATASection;
+ import org.w3c.dom.Comment;
++import org.w3c.dom.DOMConfiguration;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.DOMImplementation;
+ import org.w3c.dom.Document;
+@@ -45,6 +46,7 @@
+ import org.w3c.dom.NodeList;
+ import org.w3c.dom.ProcessingInstruction;
+ import org.w3c.dom.Text;
++import org.w3c.dom.UserDataHandler;
+ import org.xml.sax.InputSource;
+ import org.xml.sax.SAXException;
+ 
+@@ -1273,5 +1275,102 @@
+     public boolean isBodyStream() {
+         return (currentForm == SOAPPart.FORM_INPUTSTREAM || currentForm == SOAPPart.FORM_BODYINSTREAM);        
+     }
++
++    /**
++     *  DOM Level 3 stubs
++     */
++
++    public String getBaseURI() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public boolean getXmlStandalone() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public Object setUserData(
++        String key, Object data, UserDataHandler handler) {
++        throw new RuntimeException("not implemented");
++    }
++    
++    public void setDocumentURI(String documentURI) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public void setXmlStandalone(boolean xmlStandalone) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public Node renameNode(Node n, String namespaceURI, String qualifiedName) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public String getInputEncoding() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public String getXmlEncoding() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public void setTextContent(String textContent) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public boolean isSameNode(Node other) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public String getDocumentURI() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public Object getFeature(String feature, String version) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public boolean isDefaultNamespace(String namespaceURI) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public String lookupPrefix(String namespaceURI) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public boolean isEqualNode(Node arg) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public void setXmlVersion(String xmlVersion) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public String getXmlVersion() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public Object getUserData(String key) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public String getTextContent() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public void normalizeDocument() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public String lookupNamespaceURI(String prefix) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public DOMConfiguration getDomConfig() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public short compareDocumentPosition(Node other) {
++        throw new RuntimeException("not implemented");
++    }
+ }
+ 
+--- axis-1_2/src/org/apache/axis/message/NodeImpl.java~	2005-05-03 20:28:58.000000000 +0100
++++ axis-1_2/src/org/apache/axis/message/NodeImpl.java	2005-06-07 12:22:15.000000000 +0100
+@@ -30,6 +30,8 @@
+ import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
+ import org.w3c.dom.Text;
++import org.w3c.dom.TypeInfo;
++import org.w3c.dom.UserDataHandler;
+ import org.xml.sax.Attributes;
+ import org.xml.sax.helpers.AttributesImpl;
+ 
+@@ -834,4 +836,74 @@
+             ((NodeImpl) parent).setDirty(true);
+         }
+     }
++
++    /**
++     *  DOM Level 3 stubs
++     */
++
++    public void setIdAttributeNS(
++        String namespaceURI, String localName, boolean isId) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public void setIdAttribute(String name, boolean isId) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public void setIdAttributeNode(Attr idAttr, boolean isId) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public TypeInfo getSchemaTypeInfo() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public Object setUserData(
++        String key, Object data, UserDataHandler handler) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public String getBaseURI() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public String getTextContent() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public boolean isSameNode(Node other) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public void setTextContent(String textContent) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public Object getUserData(String key) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public boolean isDefaultNamespace(String namespaceURI) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public Object getFeature(String feature, String version) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public boolean isEqualNode(Node arg) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public short compareDocumentPosition(Node other) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public String lookupNamespaceURI(String prefix) {
++        throw new RuntimeException("not implemented");
++    }
++
++    public String lookupPrefix(String namespaceURI) {
++        throw new RuntimeException("not implemented");
++    }
+ }
+--- axis-1_2/src/org/apache/axis/message/SOAPDocumentImpl.java~	2005-05-03 20:29:08.000000000 +0100
++++ axis-1_2/src/org/apache/axis/message/SOAPDocumentImpl.java	2005-06-07 12:31:30.000000000 +0100
+@@ -25,6 +25,7 @@
+ import org.w3c.dom.Attr;
+ import org.w3c.dom.CDATASection;
+ import org.w3c.dom.Comment;
++import org.w3c.dom.DOMConfiguration;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.DOMImplementation;
+ import org.w3c.dom.Document;
+@@ -36,6 +37,7 @@
+ import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
+ import org.w3c.dom.ProcessingInstruction;
++import org.w3c.dom.UserDataHandler;
+ 
+ import javax.xml.parsers.ParserConfigurationException;
+ import javax.xml.soap.SOAPException;
+@@ -680,4 +682,113 @@
+     public boolean hasAttributes() {
+         throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+     }
++
++    /**
++     *  DOM Level 3 stubs
++     */
++
++    public String getBaseURI() {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public boolean getXmlStandalone() {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public boolean getStrictErrorChecking() {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public void setXmlStandalone(boolean xmlStandalone) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public Node renameNode(Node n, String namespaceURI, String qualifiedName) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public void setStrictErrorChecking(boolean strictErrorChecking) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public Object setUserData(
++        String key, Object data, UserDataHandler handler) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++    
++    public String getInputEncoding() {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++    
++    public String getXmlEncoding() {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public void setTextContent(String textContent) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public boolean isSameNode(Node other) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public String getDocumentURI() {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public void setDocumentURI(String documentURI) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public Object getFeature(String feature, String version) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public Node adoptNode(Node source) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public boolean isDefaultNamespace(String namespaceURI) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public boolean isEqualNode(Node arg) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public void setXmlVersion(String xmlVersion) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public String getXmlVersion() {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public String lookupPrefix(String namespaceURI) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public Object getUserData(String key) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public String getTextContent() {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public void normalizeDocument() {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public String lookupNamespaceURI(String prefix) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public DOMConfiguration getDomConfig() {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
++
++    public short compareDocumentPosition(Node other) {
++        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
++    }
+ }
+--- axis-1_2/src/org/apache/axis/message/Text.java~	2005-05-03 20:29:21.000000000 +0100
++++ axis-1_2/src/org/apache/axis/message/Text.java	2005-06-07 12:34:19.000000000 +0100
+@@ -213,4 +213,19 @@
+         return ( textRep.getData() != null ? textRep.getData().hashCode() : 0 );
+     }
+ 
++    /**
++     *  DOM Level 3 stubs
++     */
++
++    public String getWholeText() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public boolean isElementContentWhitespace() {
++        throw new RuntimeException("not implemented");
++    }
++
++    public org.w3c.dom.Text replaceWholeText(String content) {
++        throw new RuntimeException("not implemented");
++    }
+ }

Modified: trunk/axis/debian/rules
===================================================================
--- trunk/axis/debian/rules	2007-03-03 10:30:07 UTC (rev 3026)
+++ trunk/axis/debian/rules	2007-03-03 10:44:54 UTC (rev 3027)
@@ -1,56 +1,26 @@
 #!/usr/bin/make -f
 
+export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVACMD := /usr/bin/cacao
-ANT_OPTS := -Xmx256m
+include /usr/share/gcj/debian_defaults
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+  with_gcj_native := yes
+endif
+
+JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
-DEB_JARS := \
-	/usr/share/classpath/glibj.zip \
-	ant-nodeps \
-	jdepend \
-	servlet-api \
-	jsp-api \
-	junit \
-	gnumail \
-	oro \
-	log4j-1.2 \
-	commons-logging \
-	activation \
-	commons-httpclient333 \
-	commons-net \
-	commons-discovery \
-	bsf \
-	wsdl4j \
-	qname 
 
-DEB_ANT_COMPILER := jikes
-DEB_ANT_BUILD_TARGET := clean compile javadocs
+DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar wsdl4j commons-logging commons-discovery activation gnumail servlet-api
 
-# Additional command-line arguments for Ant
-#ANT_ARGS := -verbose -debug
+DEB_ANT_BUILD_TARGET := compile javadocs
+DEB_ANT_INSTALL_TARGET := 
 
-LIBRARY_PACKAGE := axis
-API_VERSION     := 1.2.1
-
-#build/lib$(LIBRARY_PACKAGE)-java-doc::
-common-post-build-indep::
-	# Rename javadoc directory to ensure that the links 
-        # of the documentation works
-	mv build/javadocs build/apiDocs
-
-install/lib$(LIBRARY_PACKAGE)-java:: 
-	install -m 644 build/lib/$(LIBRARY_PACKAGE).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
-	ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar
-
-	install -m 644 build/lib/axis-ant.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/axis-ant-$(API_VERSION).jar
-	ln -s axis-ant-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/axis-ant.jar
-	ln -s axis-ant-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/ant/lib/axis-ant.jar
-
-	install -m 644 build/lib/jaxrpc.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/jaxrpc-$(API_VERSION).jar
-	ln -s jaxrpc-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/jaxrpc.jar
-
-	install -m 644 build/lib/saaj.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/saaj-$(API_VERSION).jar
-	ln -s saaj-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/saaj.jar
+ifeq ($(with_gcj_native),yes)
+install/libaxis-java-gcj:: install/libaxis-java
+	[ -d debian/libaxis-ava/usr/share/java ] || dh_install -plibaxis-java
+	dh_nativejava -plibaxis-java-gcj
+endif




More information about the pkg-java-commits mailing list