svn commit: r584689 - in /ofbiz/branches/release4.0: ij.ofbiz rc.ofbiz startofbiz.sh stopofbiz.sh

Author: jleroux
Date: Sun Oct 14 23:26:21 2007
New Revision: 584689

URL: http://svn.apache.org/viewvc?rev=584689&view=rev
Log:
Applied fix from trunk for revision: 584688  

Modified:
    ofbiz/branches/release4.0/ij.ofbiz   (contents, props changed)
    ofbiz/branches/release4.0/rc.ofbiz   (contents, props changed)
    ofbiz/branches/release4.0/startofbiz.sh   (props changed)
    ofbiz/branches/release4.0/stopofbiz.sh   (props changed)

Modified: ofbiz/branches/release4.0/ij.ofbiz
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/ij.ofbiz?rev=584689&r1=584688&r2=584689&view=diff
==============================================================================
--- ofbiz/branches/release4.0/ij.ofbiz (original)
+++ ofbiz/branches/release4.0/ij.ofbiz Sun Oct 14 23:26:21 2007
@@ -1,34 +1,34 @@
-#!/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.
-#####################################################################
-
-# Properties
-HM='-Dderby.system.home=data/derby'
-PR='-Dij.protocol=jdbc:derby:'
-DB='-Dij.database=ofbiz;create=true'
-EE='framework/entity/lib/jdbc'
-CP="-cp $EE/derby.jar:$EE/derbytools.jar"
-
-# Command
-OPTIONS="$CP $HM $PR $DB"
-CLASS="org.apache.derby.tools.ij"
-JAVA="java"
-
-$JAVA $OPTIONS $CLASS
-
+#!/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.
+#####################################################################
+
+# Properties
+HM='-Dderby.system.home=data/derby'
+PR='-Dij.protocol=jdbc:derby:'
+DB='-Dij.database=ofbiz;create=true'
+EE='framework/entity/lib/jdbc'
+CP="-cp $EE/derby.jar:$EE/derbytools.jar"
+
+# Command
+OPTIONS="$CP $HM $PR $DB"
+CLASS="org.apache.derby.tools.ij"
+JAVA="java"
+
+$JAVA $OPTIONS $CLASS
+

Propchange: ofbiz/branches/release4.0/ij.ofbiz
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: ofbiz/branches/release4.0/rc.ofbiz
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/rc.ofbiz?rev=584689&r1=584688&r2=584689&view=diff
==============================================================================
--- ofbiz/branches/release4.0/rc.ofbiz (original)
+++ ofbiz/branches/release4.0/rc.ofbiz Sun Oct 14 23:26:21 2007
@@ -1,156 +1,156 @@
-#!/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.
-#####################################################################
-#
-# ofbiz        This shell script takes care of starting and stopping
-#              the OFBiz subsystem
-#
-# chkconfig: - 80 10
-# description: OFBiz server
-
-# Source function library
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration
-. /etc/sysconfig/network
-
-# Paths - Edit for your locations
-JAVA_BINARY=/usr/java/j2sdk1.4.2/bin/java
-OFBIZ_HOME=/home/ofbiz/ofbiz
-OFBIZ_LOG=$OFBIZ_HOME/logs/console.log
-
-# VM Options
-JAVA_VMOPTIONS=-Xmx128M
-
-# Java arguments
-JAVA_ARGS="-jar ofbiz.jar"
-
-# *nix user ofbiz should run as (you must create this user first)
-OFBIZ_USER=ofbiz
-
-# OFBiz processes running
-ofbizprocs() {
-    OFBIZ_PROCS=`/bin/ps h -o pid,args -C java | /bin/grep -e "$JAVA_ARGS" | /bin/egrep -o "^[[:space:]]*[[:digit:]]*"`
-}
-
-# Checking user...
-checkuser() {
-    if [ "$USER" != "$OFBIZ_USER" ]; then
-        echo_failure
-        echo
-        echo "Only users root or $OFBIZ_USER should start/stop the application"
-        exit 1
-    fi
-}
-
-# Start OFBiz
-start() {
-    echo -n "Starting OFBiz: "
-    checkuser
-    ofbizprocs
-    if [ "$OFBIZ_PROCS" != "" ]; then
-        echo_failure
-        echo
-        echo "OFBiz is already running..."
-        return 1
-    fi
-
-    # All clear
-    cd $OFBIZ_HOME
-    umask 007
-    /bin/rm -f $OFBIZ_LOG
-    $JAVA_BINARY $JAVA_VMOPTIONS $JAVA_ARGS >>$OFBIZ_LOG 2>>$OFBIZ_LOG&      
-    echo_success
-    return 0
-}
-
-# Stop OFBiz
-stop() {
-    echo -n "Stopping OFBiz: "
-    checkuser
-    ofbizprocs
-    if [ "$OFBIZ_PROCS" == "" ]; then
-        echo_failure
-        echo
-        echo "OFBiz is not running..."
-        return 1
-    fi
-
-    # All clear
-    cd $OFBIZ_HOME
-    umask 007    
-    $JAVA_BINARY $JAVA_VMOPTIONS $JAVA_ARGS -shutdown >>$OFBIZ_LOG
-    ofbizprocs
-    if [ "$OFBIZ_PROCS" != "" ]; then
-        # Let's try to -TERM
-        /bin/kill -TERM $OFBIZ_PROCS
-    fi
-    ofbizprocs
-    if [ "$OFBIZ_PROCS" != "" ]; then
-        # Let's try it the hard way!
-        /bin/kill -9 $OFBIZ_PROCS
-    fi
-    ofbizprocs
-    if [ "$OFBIZ_PROCS" != "" ]; then
-        echo_failure
-        echo
-        echo "Some processes could not be stopped:"
-        echo $OFBIZ_PROCS
-        echo "A possible solution is to try this command once more!"
-        return 1
-    else
-        echo_success
-        return 0
-    fi
-}
-
-# If root is running this script, su to $OFBIZ_USER first
-if [ "$UID" = "0" ]; then
-    exec su - $OFBIZ_USER -c "$0 $1"
-fi
-
-case "$1" in
-    'start')
-        start
-    ;;
-    'stop')
-        stop
-    ;;
-    'restart')
-        stop
-        start
-    ;;  
-    'status')
-        ofbizprocs
-        if [ "$OFBIZ_PROCS" == "" ]; then
-            echo "OFBiz is stopped"
-            exit 1
-        else
-            echo "OFBiz is running"
-            exit 0
-        fi
-    ;;
-    *)
-        echo "Usage: $0 {start|stop|kill|restart|status|help}"
-        exit 1
-    ;;
-esac
-echo
-exit $?
-
+#!/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.
+#####################################################################
+#
+# ofbiz        This shell script takes care of starting and stopping
+#              the OFBiz subsystem
+#
+# chkconfig: - 80 10
+# description: OFBiz server
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+# Source networking configuration
+. /etc/sysconfig/network
+
+# Paths - Edit for your locations
+JAVA_BINARY=/usr/java/j2sdk1.4.2/bin/java
+OFBIZ_HOME=/home/ofbiz/ofbiz
+OFBIZ_LOG=$OFBIZ_HOME/logs/console.log
+
+# VM Options
+JAVA_VMOPTIONS=-Xmx128M
+
+# Java arguments
+JAVA_ARGS="-jar ofbiz.jar"
+
+# *nix user ofbiz should run as (you must create this user first)
+OFBIZ_USER=ofbiz
+
+# OFBiz processes running
+ofbizprocs() {
+    OFBIZ_PROCS=`/bin/ps h -o pid,args -C java | /bin/grep -e "$JAVA_ARGS" | /bin/egrep -o "^[[:space:]]*[[:digit:]]*"`
+}
+
+# Checking user...
+checkuser() {
+    if [ "$USER" != "$OFBIZ_USER" ]; then
+        echo_failure
+        echo
+        echo "Only users root or $OFBIZ_USER should start/stop the application"
+        exit 1
+    fi
+}
+
+# Start OFBiz
+start() {
+    echo -n "Starting OFBiz: "
+    checkuser
+    ofbizprocs
+    if [ "$OFBIZ_PROCS" != "" ]; then
+        echo_failure
+        echo
+        echo "OFBiz is already running..."
+        return 1
+    fi
+
+    # All clear
+    cd $OFBIZ_HOME
+    umask 007
+    /bin/rm -f $OFBIZ_LOG
+    $JAVA_BINARY $JAVA_VMOPTIONS $JAVA_ARGS >>$OFBIZ_LOG 2>>$OFBIZ_LOG&      
+    echo_success
+    return 0
+}
+
+# Stop OFBiz
+stop() {
+    echo -n "Stopping OFBiz: "
+    checkuser
+    ofbizprocs
+    if [ "$OFBIZ_PROCS" == "" ]; then
+        echo_failure
+        echo
+        echo "OFBiz is not running..."
+        return 1
+    fi
+
+    # All clear
+    cd $OFBIZ_HOME
+    umask 007    
+    $JAVA_BINARY $JAVA_VMOPTIONS $JAVA_ARGS -shutdown >>$OFBIZ_LOG
+    ofbizprocs
+    if [ "$OFBIZ_PROCS" != "" ]; then
+        # Let's try to -TERM
+        /bin/kill -TERM $OFBIZ_PROCS
+    fi
+    ofbizprocs
+    if [ "$OFBIZ_PROCS" != "" ]; then
+        # Let's try it the hard way!
+        /bin/kill -9 $OFBIZ_PROCS
+    fi
+    ofbizprocs
+    if [ "$OFBIZ_PROCS" != "" ]; then
+        echo_failure
+        echo
+        echo "Some processes could not be stopped:"
+        echo $OFBIZ_PROCS
+        echo "A possible solution is to try this command once more!"
+        return 1
+    else
+        echo_success
+        return 0
+    fi
+}
+
+# If root is running this script, su to $OFBIZ_USER first
+if [ "$UID" = "0" ]; then
+    exec su - $OFBIZ_USER -c "$0 $1"
+fi
+
+case "$1" in
+    'start')
+        start
+    ;;
+    'stop')
+        stop
+    ;;
+    'restart')
+        stop
+        start
+    ;;  
+    'status')
+        ofbizprocs
+        if [ "$OFBIZ_PROCS" == "" ]; then
+            echo "OFBiz is stopped"
+            exit 1
+        else
+            echo "OFBiz is running"
+            exit 0
+        fi
+    ;;
+    *)
+        echo "Usage: $0 {start|stop|kill|restart|status|help}"
+        exit 1
+    ;;
+esac
+echo
+exit $?
+

Propchange: ofbiz/branches/release4.0/rc.ofbiz
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: ofbiz/branches/release4.0/startofbiz.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sun Oct 14 23:26:21 2007
@@ -1 +1 @@
-native
+LF

Propchange: ofbiz/branches/release4.0/stopofbiz.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sun Oct 14 23:26:21 2007
@@ -1 +1 @@
-native
+LF