commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1240960 - in /commons/proper/daemon/branches/1.0.x: build.xml pom.xml src/samples/AloneDaemon.sh src/samples/Native.sh src/site/xdoc/download_daemon.xml src/site/xdoc/procrun.xml
Date Mon, 06 Feb 2012 10:14:14 GMT
Author: mturk
Date: Mon Feb  6 10:14:14 2012
New Revision: 1240960

URL: http://svn.apache.org/viewvc?rev=1240960&view=rev
Log:
Update versions and backport some minor diffs from trunk

Modified:
    commons/proper/daemon/branches/1.0.x/build.xml
    commons/proper/daemon/branches/1.0.x/pom.xml
    commons/proper/daemon/branches/1.0.x/src/samples/AloneDaemon.sh
    commons/proper/daemon/branches/1.0.x/src/samples/Native.sh
    commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml
    commons/proper/daemon/branches/1.0.x/src/site/xdoc/procrun.xml

Modified: commons/proper/daemon/branches/1.0.x/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/build.xml?rev=1240960&r1=1240959&r2=1240960&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/build.xml (original)
+++ commons/proper/daemon/branches/1.0.x/build.xml Mon Feb  6 10:14:14 2012
@@ -59,7 +59,7 @@
   <property name="component.title"         value="Java Daemons"/>
 
   <!-- The current version number of this component -->
-  <property name="component.version"       value="1.0.8"/>
+  <property name="component.version"       value="1.0.9"/>
 
   <!-- The base directory for compilation targets -->
   <property name="build.home"              value="target"/>
@@ -214,7 +214,7 @@
                 version="true"
                doctitle="&lt;h1&gt;${component.title}&lt;/h1&gt;"
             windowtitle="${component.title} (Version ${component.version})"
-                 bottom="Copyright (c) 2002-2011 - Apache Software Foundation">
+                 bottom="Copyright (c) 2002-2012 - Apache Software Foundation">
       <classpath refid="compile.classpath"/>
       <classpath location="${ant.lib}/ant.jar"/>
     </javadoc>

Modified: commons/proper/daemon/branches/1.0.x/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/pom.xml?rev=1240960&r1=1240959&r2=1240960&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/pom.xml (original)
+++ commons/proper/daemon/branches/1.0.x/pom.xml Mon Feb  6 10:14:14 2012
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>21</version>
+    <version>23</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-daemon</groupId>

Modified: commons/proper/daemon/branches/1.0.x/src/samples/AloneDaemon.sh
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/samples/AloneDaemon.sh?rev=1240960&r1=1240959&r2=1240960&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/samples/AloneDaemon.sh (original)
+++ commons/proper/daemon/branches/1.0.x/src/samples/AloneDaemon.sh Mon Feb  6 10:14:14 2012
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: commons/proper/daemon/branches/1.0.x/src/samples/Native.sh
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/samples/Native.sh?rev=1240960&r1=1240959&r2=1240960&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/samples/Native.sh (original)
+++ commons/proper/daemon/branches/1.0.x/src/samples/Native.sh Mon Feb  6 10:14:14 2012
@@ -1,18 +1,20 @@
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You 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.
-##
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
 # for linux ;-) and Mac OS X
 case `uname -s` in
   Darwin)

Modified: commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml?rev=1240960&r1=1240959&r2=1240960&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml (original)
+++ commons/proper/daemon/branches/1.0.x/src/site/xdoc/download_daemon.xml Mon Feb  6 10:14:14
2012
@@ -95,18 +95,18 @@ limitations under the License.
       </p>
     </subsection>
     </section>
-    <section name="Commons Daemon 1.0.8">
+    <section name="Commons Daemon 1.0.9">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/daemon/binaries/commons-daemon-1.0.8-bin.tar.gz">commons-daemon-1.0.8-bin.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.8-bin.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.8-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/daemon/binaries/commons-daemon-1.0.9-bin.tar.gz">commons-daemon-1.0.9-bin.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.9-bin.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.9-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/daemon/binaries/commons-daemon-1.0.8-bin.zip">commons-daemon-1.0.8-bin.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.8-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.8-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/daemon/binaries/commons-daemon-1.0.9-bin.zip">commons-daemon-1.0.9-bin.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.9-bin.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.9-bin.zip.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/daemon/binaries/">Browse native
binaries download area...</a></td>
@@ -118,24 +118,24 @@ limitations under the License.
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.0.8-src.tar.gz">commons-daemon-1.0.8-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.8-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.8-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.0.9-src.tar.gz">commons-daemon-1.0.9-src.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.9-src.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.9-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.0.8-src.zip">commons-daemon-1.0.8-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.8-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.8-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.0.9-src.zip">commons-daemon-1.0.9-src.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.9-src.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.9-src.zip.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.0.8-native-src.tar.gz">commons-daemon-1.0.8-native-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.8-native-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.8-native-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.0.9-native-src.tar.gz">commons-daemon-1.0.9-native-src.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.9-native-src.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.9-native-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.0.8-native-src.zip">commons-daemon-1.0.8-native-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.8-native-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.8-native-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.0.9-native-src.zip">commons-daemon-1.0.9-native-src.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.9-native-src.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.9-native-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>

Modified: commons/proper/daemon/branches/1.0.x/src/site/xdoc/procrun.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/site/xdoc/procrun.xml?rev=1240960&r1=1240959&r2=1240960&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/site/xdoc/procrun.xml (original)
+++ commons/proper/daemon/branches/1.0.x/src/site/xdoc/procrun.xml Mon Feb  6 10:14:14 2012
@@ -113,6 +113,10 @@
         <td>Run the service</td>
         <td>Called only from ServiceManager</td>
     </tr>
+    <tr><th>//ES</th>
+        <td>Start (execute) the service</td>
+        <td></td>
+    </tr>
     <tr><th>//SS</th>
         <td>Stop the service</td>
         <td></td>
@@ -158,6 +162,10 @@
         <td>Run the service</td>
         <td>Called only from ServiceManager</td>
     </tr>
+    <tr><th>start</th>
+        <td>Start the service</td>
+        <td>Synonym for <b>//ES</b></td>
+    </tr>
     <tr><th>stop</th>
         <td>Stop the service</td>
         <td>Synonym for <b>//SS</b></td>



Mime
View raw message