[pkg-java] r12827 - in trunk/commons-daemon: . debian debian/patches debian/source
Damien Raude-Morvan
drazzib at alioth.debian.org
Tue Jul 27 19:40:04 UTC 2010
Author: drazzib
Date: 2010-07-27 19:40:01 +0000 (Tue, 27 Jul 2010)
New Revision: 12827
Added:
trunk/commons-daemon/debian/patches/
trunk/commons-daemon/debian/patches/series
trunk/commons-daemon/debian/patches/sh4-support.diff
trunk/commons-daemon/debian/source/
trunk/commons-daemon/debian/source/format
Removed:
trunk/commons-daemon/KEYS
trunk/commons-daemon/LICENSE.txt
trunk/commons-daemon/NOTICE.txt
trunk/commons-daemon/PROPOSAL.html
trunk/commons-daemon/README
trunk/commons-daemon/RELEASE-NOTES.txt
trunk/commons-daemon/STATUS.html
trunk/commons-daemon/build-maven.xml
trunk/commons-daemon/build.properties.sample
trunk/commons-daemon/build.xml
trunk/commons-daemon/debian/jsvc.dirs
trunk/commons-daemon/debian/libcommons-daemon-java.dirs
trunk/commons-daemon/doap_daemon.rdf
trunk/commons-daemon/maven.xml
trunk/commons-daemon/project.properties
trunk/commons-daemon/project.xml
trunk/commons-daemon/src/
trunk/commons-daemon/xdocs/
Modified:
trunk/commons-daemon/debian/
trunk/commons-daemon/debian/changelog
trunk/commons-daemon/debian/control
trunk/commons-daemon/debian/libcommons-daemon-java.doc-base
trunk/commons-daemon/debian/libcommons-daemon-java.docs
trunk/commons-daemon/debian/rules
trunk/commons-daemon/debian/watch
Log:
* New upstream stable release (Closes: #578661).
- d/watch: Update URL for new upstream release.
* d/patches/sh4-support.diff: Add support for sh4 arch (Closes: #564166).
* d/control: Remove Arnaud and add myself from Uploaders.
* Updated to Standards-Version 3.9.1:
- d/control: Add recommended get-orig-source target.
* d/control: Add ${misc:Depends} to Depends.
* Switch to 3.0 (quilt) format.
* Use Debhelper 7:
- d/rules: Use dh 7 and cleanup our rules file.
- d/*.dirs: Removed not needed anymore.
* d/libcommons-daemon-java.doc-base and d/rules: Install API Javadoc to
/usr/share/doc/libcommons-daemon-java/api.
Deleted: trunk/commons-daemon/KEYS
===================================================================
--- trunk/commons-daemon/KEYS 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/KEYS 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,51 +0,0 @@
-This file contains the PGP&GPG keys of various Apache developers.
-Please don't use them for email unless you have to. Their main
-purpose is code signing.
-
-Apache users: pgp < KEYS
-Apache developers:
- (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
- or
- (gpg --fingerprint --list-sigs <your name>
- && gpg --armor --export <your name>) >> this file.
-
-Apache developers: please ensure that your key is also available via the
-PGP keyservers (such as pgpkeys.mit.edu).
-
-Type Bits/KeyID Date User ID
-pub 1024D/86867BA6 2001-11-22 Jean-Frederic Clere (jfclere) <JFrederic.Clere at fujitsu-siemens.com>
-
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.3.3 (GNU/Linux)
-
-mQGiBDv9Gx8RBADclmKwDLcibNVipQnhYW+bFIpuQjQnRrqRwn3gXM+/luzzJYJ4
-bbWpw13zjX0EkrAJ8qH2A/d0EIU1eZ0zHrLgRvMUfLGFUX7FFFw18JKFLTVGhG4/
-8sSl3ydHSA2Kd1PF6xjBP7iM7sg5dJfEkyMzvK5H4F0ZpTqy3087wsg1wwCgitRy
-Zg4x3lWZSkOwBj472qaO9GkD/2q6kyWfAK6XFe3GuB5AAs3poMfN1eqW+duM4TA8
-zUiWK0Wxx4JXJbL7n0i4d+JdXJsrjSjF++KKfelcxsrSxoUIBegez25MUSvHe09D
-R3nqkY8CVO+viEtzRBqkSgCMbUjAtfkQ+vp2jDnWSmmkNfY0OYAzt+KRyJKcjUSJ
-gvOOA/45+DN9wuTELoFTvsXh1JgOL/QvW1fmQ2HrcQk94BkzIsfVGWClCiig5gNw
-LCxTbfgA5htpI8U7vPR9/5gH7U8Wy3HR6xQUZxcbttMeYit2VbDEJzF5r5S0pJvD
-vyk3n1kiKU7r49sjhxGgE8J/VvDpO6YcIsDs8LoULwuJTg0DTrRDSmVhbi1GcmVk
-ZXJpYyBDbGVyZSAoamZjbGVyZSkgPEpGcmVkZXJpYy5DbGVyZUBmdWppdHN1LXNp
-ZW1lbnMuY29tPohGBBARAgAGBQJAEVHcAAoJEFd7hHVGA0DQsUsAoK2SuAnTybek
-AJkFmei/kbv59fA+AJ4/smxUz6EGuNmWOYwnHTxPz09c4IhXBBMRAgAXBQI7/Rsf
-BQsHCgMEAxUDAgMWAgECF4AACgkQ0+/mtoaGe6amGQCeJU5VZ8QCi8+PY0QJHPA6
-3e5uPyoAmgOWIwFm8A/xmW8qjEvVAWtbTjZxiJwEEwECAAYFAj/F+7gACgkQN+P0
-X+5l4yHDEwQAwp2yr9mwHIti5D2tvgNDQjOw9K/qbGbQ1IH3f/BLF0J5EHxYxUSt
-E0glh8GPJOi1U+0Jv999W/8xnOs5Tf16d0DmhscXvylxWYGis1PcoqA2zemaWuVM
-nBoJaA89gPiwconEEvdxym7vBGK1Lodz+ote2doiuCsWSjcfl74LFxeInAQTAQIA
-BgUCP8dbpwAKCRArAsNF4kSQGcqYA/9ZkL7Uwy1xZ8EPAQT6eXVCmS743C3Mc2kr
-Cv8CEnsVNQrsQMYzkU2OjsJ09semmIHnvpx14i8cGlLRoKpfNn7V+O6wmMEHr2zn
-HlMtDsgvk8FK12cDGGxUlHr9sz6wOTQyZG3bNLA9iQPUlHAjTTZlISx55i3/opKQ
-yI5LzOMaSrkBDQQ7/RsjEAQAgmxZUhfrnVv0M9qJJw3p/B6KpeENUOwlEE2z46EA
-HGIGYC67EeoXPWgiH9yreKmQYENTnvTPwHpjhYVNOFDad3YB5PdRGEb8fNEbmvfd
-qf/Fe0DocCAVW9lxPGrOZy9o/MOic+3krP24r8Zvcg9AB/yOR9NUQCYr0Wzk7FIE
-pA8AAwUD+QEZVtjanNFNe2rELJjGL09VDIjosgcFA/wyBBtl8tYZRL3ZY4PFlNuo
-3I6RqjK0+vU+GfnmdqFcokUE1uKjFASnNDW8/PYS9Kr/SuNRMccR/iYBNXLEVb5s
-AE/CMpZ4aH+0yS0Qbb2p9/qdtSsZdbkOzG5i0/O+bvr3PidPfHyIiEYEGBECAAYF
-Ajv9GyMACgkQ0+/mtoaGe6Z/VACfX9EytEEDrY0Ab8QIrLKKWIQyhxgAnj2YNJPb
-I+vcsJ1VqwUvX7xQvY3A
-=6E4I
------END PGP PUBLIC KEY BLOCK-----
Deleted: trunk/commons-daemon/LICENSE.txt
===================================================================
--- trunk/commons-daemon/LICENSE.txt 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/LICENSE.txt 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,202 +0,0 @@
-
- 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.
Deleted: trunk/commons-daemon/NOTICE.txt
===================================================================
--- trunk/commons-daemon/NOTICE.txt 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/NOTICE.txt 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,2 +0,0 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
Deleted: trunk/commons-daemon/PROPOSAL.html
===================================================================
--- trunk/commons-daemon/PROPOSAL.html 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/PROPOSAL.html 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,140 +0,0 @@
-<html>
-<head>
-<title>Proposal for Daemon Package</title>
-</head>
-<body bgcolor="white">
-
-<div align="center">
-<h1>Proposal for <em>Daemon</em> Package</h1>
-</div>
-
-<h3>(0) Rationale</h3>
-
- <P>
- Since 1994, the Java™ programming language evolved and became a
- valid tool to develop, other than applets and client applications,
- reliable and performant server applications. The major disadvantage of
- the Java™ platform is that still today the only portable way to
- start a Java™ applcation relies on a single point of entry: the
- <CODE><EM CLASS="key">public static void</EM> main(<EM CLASS="ref">String</EM>[])</CODE>
- method.
- </P>
- <P>
- Having a single-point of entry is a valid solution for client
- applications, where interactively a user can command to the application
- to quit (which can terminate the Virtual Machine process at calling the
- <CODE><EM CLASS="ref">System</EM>.exit(<EM CLASS="key">int</EM>)</CODE>
- method), but in those cases where the application is not interactive
- (server applications) there is currently no portable way to notify
- the Virtual Machine of its imminent shutdown.
- </P>
- <P>
- A server application written in Java might have to perform several tasks
- before being able to shutdown the Virtual Machine process. For example
- in the case of a Servlet container, before the VM process is shut down,
- sessions might need to be serialized to disk, and web applications need
- to be destroyed.
- </P>
- <P>
- One common solution to this problem is to create (for example) a
- <CODE><EM CLASS="ref">ServerSocket</EM></CODE> and wait for a particular
- message to be issued. When the message is received, all operations
- required to shut down the server applications are performed and at the
- end the <CODE><EM CLASS="ref">System</EM>.exit</CODE> method is called
- to terminate the Virtual Machine process. This method, however, implies
- several disadvantages and risks: for example in case of a system-wide
- shutdown, it might happen that the Virtual Machine process will be shut
- down directly by the operating system, without notifying the running
- server application. Or, for example, if an attacker finds out what is
- the required message to send to the server, and discovers a way to send
- this message to the running server application, he can easily interrupt
- the operation of a server, bypassing all the security restrictions
- implemented in the operating system.
- </P>
- <P>
- Most multi-user operating systems already have a way in which server
- applications are started and stopped, under Unix based operating systems
- non interactive server applications are called <em>daemons</em> and are
- controlled by the operating system with a set of specified
- <em>signals</em>. Under Windows such programs are called <em>services</em>
- and are controlled by appropriate calls to specific functions defined in
- the application binary, but although the ways of dealing with the problem
- are different, in both cases the operating system can notify a server
- application of its imminent shutdown, and the application has the
- ability to perform certain tasks before its process of execution is
- destroyed.
- </P>
-
-<h3>(1) Scope of the Package</h3>
-
- <P>
- The scope of this specification is to define an API in line with the
- current Java™ Platform APIs to support an alternative invocation
- mechanism which could be used instead of the above mentioned
- <CODE><EM CLASS="key">public static void</EM> main(<EM CLASS="ref">String</EM>[])</CODE>
- method. This specification cover the behavior and life cycle of what
- we define as "Java ™ daemons", or, in other words,
- non interactive Java™ applications.
- </P>
- <P>
- This specification does not cover how the container of a Java™
- daemon must be implemented, or how to build a native liaison between
- the operating system and the <CODE><EM CLASS="ref">Daemon</EM></CODE>
- interface, but defines the relation between the an operating system
- process and the <CODE><EM CLASS="ref">Daemon</EM></CODE> implementation
- life cycle. It should be trivial for implementors to build a native
- liaison and container for Java™ daemons.
- </P>
- <P>
- This specification, together with the related API documentation, can be
- used by software deveopers to build portable non interactive applications
- based on the Java™ platform.
- </P>
-
-<h3>(1.5) Interaction With Other Packages</h3>
-
-<p><em>Daemon</em> relies only on standard JDK 1.2 (or later) APIs for
-production deployment. It utilizes the JUnit unit testing framework for
-developing and executing unit tests, but this is of interest only to
-developers of the component. Daemon will be a dependency for
-several existing components in the open source world.</p>
-
-<p>No external configuration files are utilized.</p>
-
-
-<h3>(2) Initial Source of the Package</h3>
-
-<p>The original Java classes come from the Jakarta Tomcat 4.0 project.</p>
-
-<p>The proposed package name for the new component is
-<code>org.apache.commons.daemon</code>.</p>
-
-
-<h3>(3) Required Jakarta-Commons Resources</h3>
-
-<ul>
-<li>CVS Repository - New directory <code>daemon</code> in the
- <code>jakarta-commons</code> CVS repository.</li>
-<li>Mailing List - Discussions will take place on the general
- <em>commons-dev at jakarta.apache.org</em> mailing list. To help
- list subscribers identify messages of interest, it is suggested that
- the message subject of messages about this component be prefixed with
- [Daemon].</li>
-<li>Bugzilla - New component "Daemon" under the "Commons" product
- category, with appropriate version identifiers as needed.</li>
-<li>Jyve FAQ - New category "commons-daemon" (when available).</li>
-</ul>
-
-
-<h3>(4) Initial Committers</h3>
-
-<p>The initial committers on the Daemon component shall be:</p>
-<ul>
-<li>Jean-Frederic Clere</li>
-<li>Pier Fumagalli</li>
-<li>Remy Maucherat</li>
-
-
-
-</body>
-</html>
Deleted: trunk/commons-daemon/README
===================================================================
--- trunk/commons-daemon/README 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/README 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,26 +0,0 @@
-To build the JAVA part:
-ant dist
-
-To build the native part:
-1 - jsvc:
- cd src/native/unix; configure; make
- You need a gnu make.
- The jsvc executable could be found in dist.
- There is a INSTALL.txt src/native/unix please have a look to it.
-
- On windoze the additional step is needed:
- cd src/native/nt; make
- There is a README in src/native/nt please have a look to it.
- The exe files are created in dist.
-2 - procrun:
- procrun is only for windows
- cd src/native/nt/procrun; make
- (It is also possible to use the m$ developement tools).
-
-To build the documentation: (See http://jakarta.apache.org/commons/building.html).
-maven site:generate
-(Do not forget to get ../commons-build: (cd ..; svn co http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-build/trunk/ commons-build))
-
-To deploy the documentation to apache site:
-maven -Dmaven.username=${user.name} site:deploy
-(Check <siteAddress/> in project.xml).
Deleted: trunk/commons-daemon/RELEASE-NOTES.txt
===================================================================
--- trunk/commons-daemon/RELEASE-NOTES.txt 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/RELEASE-NOTES.txt 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,31 +0,0 @@
-$Id: RELEASE-NOTES.txt 170552 2005-05-17 09:02:03Z jfclere $
-
- Commons Daemon Package
- Version 1.0.1
- Release Notes
-
-
-INTRODUCTION:
-
-This document contains the release notes for this version of the Commons
-Daemon package, and highlights changes since the previous version. The
-current release adds new features and bug fixes, and is being done now to
-follow the release early/release often mentality.
-
-
-NEW FEATURES:
-
-* Initial import to Commons, including the daemon Java API, and jsvc
- for Unix and Windows NT/2K/XP, which allows running a Java program
- as a native operating system daemon
-
-* Add -wait and -stop parameters. (1.0.1).
- The -wait parameter is experimental: that a is loop testing for a file in /tmp
- and waiting n/10 seconds.
-
-* Allow to run as normal user for testing. (1.0.1).
-
-
-BUG FIXES:
-
-1.0.1: 304310, 30177, 27523, 29465, 31614, 33580, 31613, 34851.
Deleted: trunk/commons-daemon/STATUS.html
===================================================================
--- trunk/commons-daemon/STATUS.html 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/STATUS.html 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,74 +0,0 @@
-<html>
-<head>
-<title>Status File for Jakarta Commons "Daemon" Component</title>
-</head>
-<body bgcolor="white">
-
-
-<div align="center">
-<h1>The Jakarta Commons <em>Daemon</em> Component</h1>
-$Id: STATUS.html 155409 2005-02-26 12:57:06Z dirkv $<br />
-<a href="#Introduction">[Introduction]</a>
-<a href="#Dependencies">[Dependencies]</a>
-<a href="#Release Info">[Release Info]</a>
-<a href="#Committers">[Committers]</a>
-<br /><br />
-</div>
-
-
-<a name="Introduction"></a>
-<h3>1. INTRODUCTION</h3>
-
-<p>The <em>Daemon</em> Component contains a set of Java and native code,
-including:</p>
-<ul>
-<li>A set of Java interfaces applications must implement</li>
-<li>Unix native code to control a Java daemon from a Unix operating system</li>
-<li>Win32 code to control a Java daemon from a NT based Windows operating
-system</li>
-</ul>
-<p>This code was originally developped as part of the Tomcat project.</p>
-
-
-<a name="Dependencies"></a>
-<h3>2. DEPENDENCIES</h3>
-
-<p>The <em>Daemon</em> component is dependent upon the following external
-components for development and use:</p>
-<ul>
-<li><a href="http://java.sun.com/j2se">Java Development Kit</a>
- (Version 1.2 or later)</li>
-<li><a href="http://www.junit.org">JUnit Testing Framework</a>
- (Version 3.7 or later) - for unit tests only, not required
- for deployment</li>
-</ul>
-
-
-<a name="Release Info"></a>
-<h3>3. RELEASE INFO</h3>
-
-<p>Current Release: Daemon is yet to be released. We hope it will be RSN.</p>
-
-<p></p>
-
-
-<a name="Committers"></a>
-<h3>4. COMMITTERS</h3>
-
-<p>The following individuals are the primary developers and maintainers of this
-component. Developers who plan to use <em>Daemon</em> in their own
-projects are encouraged to collaborate on the future development of this
-component to ensure that it continues to meet a variety of needs.</p>
-<ul>
-<li>Jean-Frederic Clere</li>
-<li>Pier Fumagalli</li>
-<li>Patrick Luby</li>
-<li>Costin Manolache</li>
-<li>Remy Maucherat</li>
-<li>Yoav Shapira</li>
-<li>Bill Barker</li>
-</ul>
-
-
-</body>
-</html>
Deleted: trunk/commons-daemon/build-maven.xml
===================================================================
--- trunk/commons-daemon/build-maven.xml 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/build-maven.xml 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,204 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="maven" default="maven:jar" basedir=".">
-
- <!-- Give user a chance to override without editing this file
- (and without typing -D each time they invoke a target) -->
-
- <!-- Allow any user specific values to override the defaults -->
- <property file="${user.home}/build.properties" />
- <!-- Allow user defaults for this build -->
- <property file="build.properties" />
- <!-- Set default values for the project -->
- <property file="project.properties" />
-
- <!-- maven:start -->
-
- <!-- ================================================================== -->
- <!-- D E L E G A T O R S -->
- <!-- ================================================================== -->
-
-
- <target name="maven:site">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="site"/>
- </target>
-
-
- <target name="maven:dist">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="dist"/>
- </target>
-
-
- <target name="maven:env">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="env"/>
- </target>
-
-
- <target name="maven:test">
- <ant antfile="${maven.home}/plugins/test/build.xml" target="test"/>
- </target>
-
-
- <target name="maven:announce">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="announce"/>
- </target>
-
-
- <target name="maven:activity-log">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="activity-log"/>
- </target>
-
-
- <target name="maven:compile">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/>
- </target>
-
-
- <target name="maven:validate-war">
- <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="validate-war"/>
- </target>
-
-
- <target name="maven:pdf">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="pdf"/>
- </target>
-
-
- <target name="maven:iutest">
- <ant antfile="${maven.home}/plugins/iutest/build.xml" target="iutest"/>
- </target>
-
-
- <target name="maven:deploy-site">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="deploy-site"/>
- </target>
-
-
- <target name="maven:deploy-dist">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="deploy-dist"/>
- </target>
-
-
- <target name="maven:war">
- <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="war"/>
- </target>
-
-
- <target name="maven:verify-project">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="verify-project"/>
- </target>
-
-
- <target name="maven:cvs-change-log">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="cvs-change-log"/>
- </target>
-
-
- <target name="maven:ear">
- <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ear"/>
- </target>
-
-
- <target name="maven:cross-ref">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="cross-ref"/>
- </target>
-
-
- <target name="maven:update-jars">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="update-jars"/>
- </target>
-
-
- <target name="maven:validate-pom">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="validate-pom"/>
- </target>
-
-
- <target name="maven:install-jar">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="install-jar"/>
- </target>
-
-
- <target name="maven:fo">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="fo"/>
- </target>
-
-
- <target name="maven:javadocs">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="javadocs"/>
- </target>
-
-
- <target name="maven:validate-struts-war">
- <ant antfile="${maven.home}/plugins/struts/build.xml" target="validate-struts-war"/>
- </target>
-
-
- <target name="maven:task-list">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="task-list"/>
- </target>
-
-
- <target name="maven:ejb">
- <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ejb"/>
- </target>
-
-
- <target name="maven:docs">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs"/>
- </target>
-
-
- <target name="maven:clean">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="clean"/>
- </target>
-
-
- <target name="maven:dist-build">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="dist-build"/>
- </target>
-
-
- <target name="maven:metrics">
- <ant antfile="${maven.home}/plugins/metrics/build.xml" target="metrics"/>
- </target>
-
-
- <target name="maven:docs-quick">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs-quick"/>
- </target>
-
-
- <target name="maven:run-singletest">
- <ant antfile="${maven.home}/plugins/test/build.xml" target="run-singletest"/>
- </target>
-
-
- <target name="maven:check-source">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="check-source"/>
- </target>
-
-
- <target name="maven:generate-reactor">
- <ant antfile="${maven.home}/plugins/reactor/build.xml" target="generate-reactor"/>
- </target>
-
-
- <target name="maven:jar">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="jar"/>
- </target>
-
-
- <target name="maven:maven-update">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="maven-update"/>
- </target>
-
-
- <target name="maven:gump-descriptor">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="gump-descriptor"/>
- </target>
-
-
- <!-- maven:end -->
-
-</project>
Deleted: trunk/commons-daemon/build.properties.sample
===================================================================
--- trunk/commons-daemon/build.properties.sample 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/build.properties.sample 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,11 +0,0 @@
-# The directory containing your binary distribution of JUnit,
-# version 3.7 or later
-junit.home = /usr/local/junit3.7
-
-# The pathname of the "junit.jar" JAR file
-junit.jar = ${junit.home}/junit.jar
-
-# Proxy
-# proxy
-maven.proxy.host = proxy.domain
-maven.proxy.port = 80
Deleted: trunk/commons-daemon/build.xml
===================================================================
--- trunk/commons-daemon/build.xml 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/build.xml 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,260 +0,0 @@
-<project name="Daemon" default="dist" basedir=".">
-
-
-<!--
- "Daemon" component of the Jakarta Commons Subproject
- $Id: build.xml 469698 2006-10-31 23:10:36Z bayard $
--->
-
-
-<!-- ========== Initialize Properties ===================================== -->
-
-
- <property file="build.properties"/> <!-- Component local -->
- <property file="../build.properties"/> <!-- Commons local -->
- <property file="${user.home}/build.properties"/> <!-- User local -->
-
-
-<!-- ========== External Dependencies ===================================== -->
-
-
- <!-- The directory containing your binary distribution of JUnit,
- version 3.7 or later -->
- <property name="junit.home" value="/usr/local/junit3.7"/>
-
-
-<!-- ========== Derived Values ============================================ -->
-
-
- <!-- The pathname of the "junit.jar" JAR file -->
- <property name="junit.jar" value="${junit.home}/junit.jar"/>
-
-
-<!-- ========== Component Declarations ==================================== -->
-
-
- <!-- The name of this component -->
- <property name="component.name" value="daemon"/>
-
- <!-- The primary package name of this component -->
- <property name="component.package" value="org.apache.commons.daemon"/>
-
- <!-- The title of this component -->
- <property name="component.title" value="Java Daemons"/>
-
- <!-- The current version number of this component -->
- <property name="component.version" value="1.0.1"/>
-
- <!-- The base directory for compilation targets -->
- <property name="build.home" value="target"/>
-
- <!-- The base directory for component executable files -->
- <property name="bin.home" value="src/bin"/>
-
- <!-- The base directory for component configuration files -->
- <property name="conf.home" value="src/conf"/>
-
- <!-- The base directory for distribution targets -->
- <property name="dist.home" value="dist"/>
-
- <!-- The base directory for component sources -->
- <property name="source.home" value="src/java"/>
-
- <!-- The base directory for unit test sources -->
- <property name="test.home" value="src/test"/>
-
- <!-- The ant dir (usefull for non standard layout) -->
- <property name="ant.lib" value="${ant.home}/lib"/>
-
- <!-- The pattern to be used to grab ant jars (usefull for non standard layout) -->
- <property name="ant.jars.pattern" value="*.jar"/>
-
-
-<!-- ========== Compiler Defaults ========================================= -->
-
-
- <!-- Should Java compilations set the 'debug' compiler option? -->
- <property name="compile.debug" value="true"/>
-
- <!-- Should Java compilations set the 'deprecation' compiler option? -->
- <property name="compile.deprecation" value="true"/>
-
- <!-- Should Java compilations set the 'optimize' compiler option? -->
- <property name="compile.optimize" value="true"/>
-
- <!-- Construct compile classpath -->
- <path id="compile.classpath">
- <pathelement location="${build.home}/classes"/>
- </path>
-
-
-<!-- ========== Test Execution Defaults =================================== -->
-
-
- <!-- Construct unit test classpath -->
- <path id="test.classpath">
- <pathelement location="${build.home}/classes"/>
- <pathelement location="${build.home}/tests"/>
- <pathelement location="${junit.jar}"/>
- </path>
-
- <!-- Should all tests fail if one does? -->
- <property name="test.failonerror" value="true"/>
-
- <!-- The test runner to execute -->
- <property name="test.runner" value="junit.textui.TestRunner"/>
-
-
-<!-- ========== Executable Targets ======================================== -->
-
-
- <target name="init"
- description="Initialize and evaluate conditionals">
- <echo message="-------- ${component.name} ${component.version} --------"/>
- <filter token="name" value="${component.name}"/>
- <filter token="package" value="${component.package}"/>
- <filter token="version" value="${component.version}"/>
- </target>
-
-
- <target name="prepare" depends="init"
- description="Prepare build directory">
- <mkdir dir="${build.home}"/>
- <mkdir dir="${build.home}/classes"/>
- <mkdir dir="${build.home}/conf"/>
- <mkdir dir="${build.home}/tests"/>
- </target>
-
-
- <target name="static" depends="prepare"
- description="Copy static files to build directory">
- <tstamp/>
- <copy todir="${build.home}/conf" filtering="on">
- <fileset dir="${conf.home}" includes="*.MF"/>
- </copy>
- </target>
-
-
- <target name="compile" depends="static"
- description="Compile shareable components">
- <javac srcdir="${source.home}"
- destdir="${build.home}/classes"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="compile.classpath"/>
- </javac>
- <!-- Copy all of the resource files -->
- <copy todir="${build.home}/classes" filtering="on">
- <fileset dir="${source.home}" excludes="**/*.java"/>
- </copy>
- <!-- Make the English resource files the default resource -->
- <copy todir="${build.home}/classes" filtering="on">
- <fileset dir="${source.home}" includes="**/*_en.properties"/>
- <mapper type="glob" from="*_en.properties" to="*.properties"/>
- </copy>
- </target>
-
-
- <target name="compile.tests" depends="compile"
- description="Compile unit test cases">
- <javac srcdir="${test.home}"
- destdir="${build.home}/tests"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="test.classpath"/>
- </javac>
- <copy todir="${build.home}/tests" filtering="on">
- <fileset dir="${test.home}" excludes="**/*.java"/>
- </copy>
- </target>
-
-
- <target name="clean"
- description="Clean build and distribution directories">
- <delete dir="${build.home}"/>
- <delete dir="${dist.home}"/>
- </target>
-
-
- <target name="all" depends="clean,compile"
- description="Clean and compile all components"/>
-
-
- <target name="javadoc" depends="compile"
- description="Create component Javadoc documentation">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${dist.home}/docs"/>
- <mkdir dir="${dist.home}/docs/api"/>
- <javadoc sourcepath="${source.home}"
- destdir="${dist.home}/docs/api"
- packagenames="org.apache.commons.*"
- author="true"
- version="true"
- doctitle="<h1>${component.title}</h1>"
- windowtitle="${component.title} (Version ${component.version})"
- bottom="Copyright (c) 2001-2002 - Apache Software Foundation">
- <classpath refid="compile.classpath"/>
- <classpath location="${ant.lib}/ant.jar"/>
- </javadoc>
- </target>
-
-
- <target name="dist" depends="compile,javadoc"
- description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${dist.home}/lib"/>
- <mkdir dir="${dist.home}/logs"/>
- <copy file="LICENSE.txt"
- todir="${dist.home}"/>
- <copy file="NOTICE.txt"
- todir="${dist.home}"/>
- <copy file="RELEASE-NOTES.txt"
- todir="${dist.home}"/>
- <copy todir="${dist.home}/bin/unix/jsvc-src">
- <fileset dir="src/native/unix" />
- </copy>
- <fixcrlf srcdir="${dist.home}/bin/unix" eol="lf" />
- <tar compression="gzip" destfile="${dist.home}/bin/jsvc.tar.gz"
- basedir="${dist.home}/bin/unix" />
- <delete dir="${dist.home}/bin/unix" />
- <antcall target="jar"/>
- </target>
-
-
- <target name="jar" depends="compile"
- description="Create jar">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${dist.home}/bin"/>
- <mkdir dir="${build.home}/classes/META-INF"/>
- <copy file="LICENSE.txt"
- tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <copy file="NOTICE.txt"
- tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
- <jar jarfile="${dist.home}/commons-${component.name}.jar"
- basedir="${build.home}/classes"
- manifest="${build.home}/conf/MANIFEST.MF"
- includes="org/apache/commons/daemon/**"/>
- </target>
-
-
- <target name="install-jar" depends="jar"
- description="--> Installs jar file in ${lib.repo}">
- <copy todir="${lib.repo}" filtering="off">
- <fileset dir="${dist.home}">
- <include name="commons-${component.name}.jar"/>
- </fileset>
- </copy>
- </target>
-
-
-<!-- ========== Unit Test Targets ========================================= -->
-
-
- <target name="test" depends="compile.tests"
- description="Run all unit test cases">
- </target>
-
-
-</project>
Property changes on: trunk/commons-daemon/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/commons-daemon/debian/changelog
===================================================================
--- trunk/commons-daemon/debian/changelog 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/debian/changelog 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,4 +1,4 @@
-commons-daemon (1.0.2~svn20061127-11) UNRELEASED; urgency=low
+commons-daemon (1.0.2-1) unstable; urgency=low
[ Thierry Carrez ]
* debian/control, debian/rules: Build with default-jdk
@@ -10,8 +10,23 @@
- Update of the URLs
- Rename Jakarta Commons to Apache Commons
- -- Torsten Werner <twerner at debian.org> Wed, 14 Jul 2010 07:25:56 +0200
+ [ Damien Raude-Morvan ]
+ * New upstream stable release (Closes: #578661).
+ - d/watch: Update URL for new upstream release.
+ * d/patches/sh4-support.diff: Add support for sh4 arch (Closes: #564166).
+ * d/control: Remove Arnaud and add myself from Uploaders.
+ * Updated to Standards-Version 3.9.1:
+ - d/control: Add recommended get-orig-source target.
+ * d/control: Add ${misc:Depends} to Depends.
+ * Switch to 3.0 (quilt) format.
+ * Use Debhelper 7:
+ - d/rules: Use dh 7 and cleanup our rules file.
+ - d/*.dirs: Removed not needed anymore.
+ * d/libcommons-daemon-java.doc-base and d/rules: Install API Javadoc to
+ /usr/share/doc/libcommons-daemon-java/api.
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 27 Jul 2010 21:39:41 +0200
+
commons-daemon (1.0.2~svn20061127-10) unstable; urgency=low
* Build-Depends on libcap2-dev (Closes: #506548).
Modified: trunk/commons-daemon/debian/control
===================================================================
--- trunk/commons-daemon/debian/control 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/debian/control 2010-07-27 19:40:01 UTC (rev 12827)
@@ -2,17 +2,18 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Marcus Better <marcus at better.se>
-Build-Depends: debhelper (>= 7), autoconf, autotools-dev, default-jdk, xsltproc, docbook-xsl, ant
+Uploaders: Michael Koch <konqueror at gmx.de>, Marcus Better <marcus at better.se>,
+ Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), autoconf, autotools-dev, default-jdk, xsltproc, docbook-xsl, ant
Build-Conflicts: autoconf2.13
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
Homepage: http://commons.apache.org/daemon/
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/commons-daemon
+Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/commons-daemon/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-daemon/
Package: libcommons-daemon-java
Architecture: all
-Depends: default-jre-headless | java2-runtime-headless
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
Suggests: java-virtual-machine
Recommends: jsvc
Description: library to launch Java applications as daemons
@@ -28,7 +29,7 @@
Package: jsvc
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, libcommons-daemon-java
+Depends: ${misc:Depends}, ${shlibs:Depends}, libcommons-daemon-java
Description: wrapper to launch Java applications as daemons
This is the native application for launching Java applications
implementing certain interfaces from the libcommons-daemon-java
Deleted: trunk/commons-daemon/debian/jsvc.dirs
===================================================================
--- trunk/commons-daemon/debian/jsvc.dirs 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/debian/jsvc.dirs 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1 +0,0 @@
-usr/bin
Deleted: trunk/commons-daemon/debian/libcommons-daemon-java.dirs
===================================================================
--- trunk/commons-daemon/debian/libcommons-daemon-java.dirs 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/debian/libcommons-daemon-java.dirs 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1 +0,0 @@
-usr/share/java
Modified: trunk/commons-daemon/debian/libcommons-daemon-java.doc-base
===================================================================
--- trunk/commons-daemon/debian/libcommons-daemon-java.doc-base 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/debian/libcommons-daemon-java.doc-base 2010-07-27 19:40:01 UTC (rev 12827)
@@ -5,5 +5,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libcommons-daemon-java/apidocs/index.html
-Files: /usr/share/doc/libcommons-daemon-java/apidocs/*
+Index: /usr/share/doc/libcommons-daemon-java/api/index.html
+Files: /usr/share/doc/libcommons-daemon-java/api/*
Modified: trunk/commons-daemon/debian/libcommons-daemon-java.docs
===================================================================
--- trunk/commons-daemon/debian/libcommons-daemon-java.docs 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/debian/libcommons-daemon-java.docs 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,4 +1,4 @@
PROPOSAL.html
-STATUS.html
+RELEASE-NOTES.txt
src/docs/daemon.html
dist/docs/api
Added: trunk/commons-daemon/debian/patches/series
===================================================================
--- trunk/commons-daemon/debian/patches/series (rev 0)
+++ trunk/commons-daemon/debian/patches/series 2010-07-27 19:40:01 UTC (rev 12827)
@@ -0,0 +1 @@
+sh4-support.diff
Added: trunk/commons-daemon/debian/patches/sh4-support.diff
===================================================================
--- trunk/commons-daemon/debian/patches/sh4-support.diff (rev 0)
+++ trunk/commons-daemon/debian/patches/sh4-support.diff 2010-07-27 19:40:01 UTC (rev 12827)
@@ -0,0 +1,18 @@
+Description: support Renesas SH4
+Bug: http://bugs.debian.org/564166
+Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-07-27
+Forwarded: no
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -122,6 +122,9 @@
+ CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+ supported_os="s390"
+ HOST_CPU=s390;;
++ sh*)
++ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
++ HOST_CPU=$host_cpu;;
+ *)
+ AC_MSG_RESULT([failed])
+ AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
Modified: trunk/commons-daemon/debian/rules
===================================================================
--- trunk/commons-daemon/debian/rules 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/debian/rules 2010-07-27 19:40:01 UTC (rev 12827)
@@ -8,122 +8,46 @@
endif
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS_BASE := /usr/share/java
-JAVACMD := $(JAVA_HOME)/bin/java
ANT_ARGS := -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
-DEB_JARS := ant ant-launcher
-
-DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
- if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
- if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
- if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
- if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
- done; \
- if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
-
-ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
- org.apache.tools.ant.Main $(ANT_ARGS)
-
MAN_STYLESHEET := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
XSLTPROC := xsltproc --nonet
PKGNAME := commons-daemon
-INSTALLDIR := $(CURDIR)/debian/lib$(PKGNAME)-java
-JAVALIBDIR := $(INSTALLDIR)/usr/share/java
-DOCDIR := $(INSTALLDIR)/usr/share/doc/lib$(PKGNAME)-java
-VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | cut -f1 -d\~)
+JAVALIBDIR := /usr/share/java
+VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
NATIVE_SRC := src/native/unix
+# Keep that here as dh7 doesn't handle a configure script inside a subdirectory
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build $(DEB_HOST_GNU_TYPE)
+ confflags += --build $(DEB_HOST_GNU_TYPE)
else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-$(NATIVE_SRC)/configure: $(NATIVE_SRC)/configure.in
- cd $(NATIVE_SRC); autoconf
+%:
+ dh $@ --sourcedirectory=$(NATIVE_SRC) --buildsystem=autoconf --with autotools_dev
-config-stamp: $(NATIVE_SRC)/configure
- dh_testdir
- cd $(NATIVE_SRC); touch install-sh; \
- ./configure $(confflags) CFLAGS="$(CFLAGS)" --with-java=$(JAVA_HOME)
- touch config-stamp
+override_dh_auto_configure:
+ (cd $(NATIVE_SRC); autoconf; ./configure $(confflags) CFLAGS="$(CFLAGS)" --with-java=$(JAVA_HOME))
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: config-stamp
- dh_testdir
- $(MAKE) -C $(NATIVE_SRC)
+override_dh_auto_build:
+ JAVA_HOME=$(JAVA_HOME) ant $(ANT_ARGS)
+ dh_auto_build --sourcedirectory=$(NATIVE_SRC)
$(XSLTPROC) $(MAN_STYLESHEET) $(NATIVE_SRC)/man/jsvc.1.xml
- touch build-arch-stamp
-build-indep: build-indep-stamp
-build-indep-stamp:
- dh_testdir
- $(ANT_INVOKE)
- touch build-indep-stamp
+override_dh_auto_clean:
+ JAVA_HOME=$(JAVA_HOME) ant $(ANT_ARGS) clean
+ dh_auto_clean
+ rm -f jsvc.1
-clean:
- dh_testdir
- dh_testroot
- rm -f *-stamp jsvc.1
- rm -rf target dist
- -(cd src/native/unix ; make clean)
- -rm -f src/native/unix/config.log src/native/unix/config.status src/native/unix/configure
- -rm -f src/native/unix/Makefile src/native/unix/Makedefs src/native/unix/native/Makefile src/native/unix/install-sh
- cp -f /usr/share/misc/config.sub $(NATIVE_SRC)/config.sub
- cp -f /usr/share/misc/config.guess $(NATIVE_SRC)/config.guess
- dh_clean
+override_dh_auto_install:
+ dh_auto_install
+ dh_install -plib$(PKGNAME)-java dist/$(PKGNAME)-$(VERSION).jar $(JAVALIBDIR)
+ dh_link -plib$(PKGNAME)-java $(JAVALIBDIR)/$(PKGNAME)-$(VERSION).jar $(JAVALIBDIR)/$(PKGNAME).jar
-install: install-arch install-indep
-
-install-indep: build-indep
- dh_testdir
- dh_testroot
- dh_prep -i
- dh_installdirs -i
- dh_install -i
- install -m 644 dist/$(PKGNAME).jar $(JAVALIBDIR)/$(PKGNAME)-$(VERSION).jar
- ln -s $(PKGNAME)-$(VERSION).jar $(JAVALIBDIR)/$(PKGNAME).jar
- dh_installdocs -i
- mv $(DOCDIR)/api $(DOCDIR)/apidocs
-
-install-arch: build-arch
- dh_testdir
- dh_testroot
- dh_prep -a
- dh_installdirs -a
- dh_install -a
- dh_installdocs -a
- dh_installman -a
-
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
-
-binary-arch: install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary-indep: install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install install-arch install-indep
+get-orig-source:
+ uscan --force-download --rename
Added: trunk/commons-daemon/debian/source/format
===================================================================
--- trunk/commons-daemon/debian/source/format (rev 0)
+++ trunk/commons-daemon/debian/source/format 2010-07-27 19:40:01 UTC (rev 12827)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: trunk/commons-daemon/debian/watch
===================================================================
--- trunk/commons-daemon/debian/watch 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/debian/watch 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,3 +1,2 @@
version=3
-opts="dversionmangle=s/1.0.2\~svn.*$/1.0.1/" \
-http://www.apache.org/dist/commons/daemon/source/daemon-(.*)\.tar\.gz
+http://www.apache.org/dist/commons/daemon/source/commons-daemon-([\d\.]+)-src\.tar\.gz
Deleted: trunk/commons-daemon/doap_daemon.rdf
===================================================================
--- trunk/commons-daemon/doap_daemon.rdf 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/doap_daemon.rdf 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<rdf:RDF xmlns="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:asfext="http://projects.apache.org/ns/asfext#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:doap="http://usefulinc.com/ns/doap#" xml:lang="en">
- <Project rdf:about="http://jakarta.apache.org/commons/daemon/">
- <name>Apache Jakarta Commons Daemon</name>
- <homepage rdf:resource="http://jakarta.apache.org/commons/daemon/"/>
- <programming-language>Java</programming-language>
- <category rdf:resource="http://projects.apache.org/category/library"/>
- <license rdf:resource="http://usefulinc.com/doap/licenses/asl20"/>
- <bug-database rdf:resource="http://issues.apache.org/jira/browse/DAEMON"/>
- <download-page rdf:resource="http://jakarta.apache.org/site/downloads/downloads_commons-daemon.cgi"/>
- <asfext:pmc rdf:resource="http://jakarta.apache.org/"/>
- <shortdesc xml:lang="en">Commons Daemon</shortdesc>
- <description xml:lang="en">Commons Daemon</description>
- <repository>
- <SVNRepository>
- <browse rdf:resource="http://svn.apache.org/repos/asf/jakarta/commons/proper/daemon/trunk"/>
- <location rdf:resource="http://svn.apache.org/repos/asf/jakarta/commons/proper/daemon"/>
- </SVNRepository>
- </repository>
- <release>
- <revision>
- <name>commons-daemon</name>
- <created>2005-05-17</created>
- <version>1.0.1</version>
- </revision>
- </release>
- <mailing-list rdf:resource="http://jakarta.apache.org/site/mail2.html#Commons"/>
- </Project>
-</rdf:RDF>
Deleted: trunk/commons-daemon/maven.xml
===================================================================
--- trunk/commons-daemon/maven.xml 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/maven.xml 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,36 +0,0 @@
-<!--
- Copyright 2001-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 default="java:jar"
- xmlns:j="jelly:core">
-
- <!-- ================================================================== -->
- <!-- START : C O M M O N S - B U I L D -->
- <!-- ================================================================== -->
- <!-- Required: Look and Feel for documentation within distributions -->
- <!-- ================================================================== -->
- <postGoal name="xdoc:copy-resources">
- <copy todir="${basedir}/target/docs/style/" failonerror="false">
- <fileset dir="${basedir}/../commons-build/xdocs/style">
- <include name='**/*'/>
- <exclude name='**/CVS/**'/>
- </fileset>
- </copy>
- </postGoal>
- <!-- ================================================================== -->
- <!-- END: C O M M O N S - B U I L D -->
- <!-- ================================================================== -->
-
-</project>
Deleted: trunk/commons-daemon/project.properties
===================================================================
--- trunk/commons-daemon/project.properties 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/project.properties 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,24 +0,0 @@
-##
-# Properties that override Maven build defaults
-##
-
-maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
-
-# Jar Manifest Additional Attributes
-maven.jar.manifest.attributes.list=Implementation-Vendor-Id,X-Compile-Source-JDK,X-Compile-Target-JDK
-maven.jar.manifest.attribute.Implementation-Vendor-Id=org.apache
-maven.jar.manifest.attribute.X-Compile-Source-JDK=${maven.compile.source}
-maven.jar.manifest.attribute.X-Compile-Target-JDK=${maven.compile.target}
-
-#maven.checkstyle.properties=${basedir}/checkstyle.xml
-maven.test.failure = false
-maven.junit.fork=true
-maven.linkcheck.enable=false
-
-maven.xdoc.jsl=../commons-build/commons-site.jsl
-maven.xdoc.date=left
-maven.xdoc.version=${pom.currentVersion}
-maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
-maven.xdoc.poweredby.image=maven-feather.png
-
-
Deleted: trunk/commons-daemon/project.xml
===================================================================
--- trunk/commons-daemon/project.xml 2010-07-27 13:59:52 UTC (rev 12826)
+++ trunk/commons-daemon/project.xml 2010-07-27 19:40:01 UTC (rev 12827)
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2001-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>
- <pomVersion>3</pomVersion>
-
- <groupId>commons-daemon</groupId>
- <artifactId>commons-daemon</artifactId>
- <currentVersion>1.0.2-SNAPSHOT</currentVersion>
- <inceptionYear>2003</inceptionYear>
- <name>Daemon</name>
- <shortDescription>Commons Daemon</shortDescription>
- <description>Commons Daemon</description>
- <logo>/images/logo.png</logo>
- <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
- <package>org.apache.commons.${pom.artifactId.substring(8)}</package>
-
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://jakarta.apache.org</url>
- <logo>http://jakarta.apache.org/images/jakarta-logo.gif</logo>
- </organization>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>/LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <gumpRepositoryId>jakarta</gumpRepositoryId>
- <issueTrackingUrl>http://issues.apache.org/jira/</issueTrackingUrl>
- <siteAddress>people.apache.org</siteAddress>
- <siteDirectory>/www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</siteDirectory>
- <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</distributionDirectory>
-
- <repository>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
- <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
- </repository>
-
- <mailingLists>
- <mailingList>
- <name>Commons Dev List</name>
- <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
- <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
- </mailingList>
- <mailingList>
- <name>Commons User List</name>
- <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
- <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
- </mailingList>
- </mailingLists>
-
- <developers>
- <developer>
- <name>Jean-Frederic Clere</name>
- <id>jfclere</id>
- <email>jfclere at apache.org</email>
- <organization>Apache</organization>
- </developer>
-
- <developer>
- <name>Remy Maucherat</name>
- <id>remm</id>
- <email>remm at apache.org</email>
- <organization>Apache</organization>
- </developer>
-
- <developer>
- <name>Yoav Shapira</name>
- <id>yoavs</id>
- <email>yoavs at apache.org</email>
- <organization>Apache</organization>
- </developer>
-
- <developer>
- <name>Bill Barker</name>
- <id>billbarker</id>
- <email>billbarker at apache.org</email>
- <organization>Apache</organization>
- </developer>
- </developers>
-
- <build>
- <nagEmailAddress>commons-dev at jakarta.apache.org</nagEmailAddress>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <integrationUnitTestSourceDirectory/>
- <aspectSourceDirectory/>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/*AbstractTest.java</exclude>
- </excludes>
- <resources>
- <resource>
- <directory>${pom.build.unitTestSourceDirectory}</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
- </build>
-
- <reports>
- <report>maven-changelog-plugin</report>
- <report>maven-changes-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jdepend-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-license-plugin</report>
- <report>maven-tasklist-plugin</report>
- </reports>
-</project>
More information about the pkg-java-commits
mailing list