development/nexus: Updated for version 2.0.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

7 files changed, 185 insertions, 269 deletions

diff --git a/development/nexus/doinst.sh b/development/nexus/doinst.sh
index 2b7b1560a0..05a631d076 100644
--- a/development/nexus/doinst.sh
+++ b/development/nexus/doinst.sh
@@ -23,5 +23,5 @@ preserve_perms() {
 }
 
 preserve_perms  etc/rc.d/rc.nexus.new
-config etc/nexus/plexus.properties.new
+config etc/nexus/nexus.properties.new
 config etc/nexus/wrapper.conf.new
diff --git a/development/nexus/files/nexus.properties b/development/nexus/files/nexus.properties
new file mode 100644
index 0000000000..49dcebef1a
--- /dev/null
+++ b/development/nexus/files/nexus.properties
@@ -0,0 +1,14 @@
+# Sonatype Nexus
+# ==============
+# This is the most basic configuration of Nexus.
+
+# Jetty section
+application-port=8081
+application-host=0.0.0.0
+nexus-webapp=${bundleBasedir}/nexus
+nexus-webapp-context-path=/nexus
+
+# Nexus section
+nexus-work=/var/lib/nexus
+runtime=${bundleBasedir}/nexus/WEB-INF
+ 
diff --git a/development/nexus/rc.nexus b/development/nexus/files/rc.nexus
index 776017e9be..5eb81d8feb 100644
--- a/development/nexus/rc.nexus
+++ b/development/nexus/files/rc.nexus
@@ -7,31 +7,25 @@
 #  wrapped Java applications on UNIX platforms.
 #
 
-# Copyright 2011  Giorgio Peron Campodarsego, PD, Italy giorgio.peron@gmail.com
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#-----------------------------------------------------------------------------
+# These settings can be modified to fit the needs of your application
+
+# If specified, the Wrapper will be run as the specified user.
+
+# IMPORTANT - Make sure that the user has the required privileges to write into the Nexus installation directory.
+
+# NOTE - This will set the user which is used to run the Wrapper as well as
+#  the JVM and is not useful in situations where a privileged resource or
+#  port needs to be allocated prior to the user being changed.
+RUN_AS_USER=nexus
 
+# Application
 APP_NAME="nexus"
 APP_LONG_NAME="Nexus OSS"
 
-WRAPPER_CMD="/usr/lib@LIBDIRSUFFIX@/nexus/bin/jsw/@NEXUS_ARCH@/wrapper"
-WRAPPER_CONF="/usr/lib@LIBDIRSUFFIX@/nexus/bin/jsw/conf/wrapper.conf"
+# Wrapper
+WRAPPER_CMD="/usr/share/nexus/bin/jsw/@NEXUS_ARCH@/wrapper"
+WRAPPER_CONF="/usr/share/nexus/bin/jsw/conf/wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
 #  nice is only used if a priority is specified.
@@ -45,16 +39,6 @@ PIDDIR="/var/run/nexus"
 #  TERM signals.
 #IGNORE_SIGNALS=true
 
-# If specified, the Wrapper will be run as the specified user.
-# IMPORTANT - Make sure that the user has the required privileges to write
-#  the PID file and wrapper.log files.  Failure to be able to write the log
-#  file will cause the Wrapper to exit without any way to write out an error
-#  message.
-# NOTE - This will set the user which is used to run the Wrapper as well as
-#  the JVM and is not useful in situations where a privileged resource or
-#  port needs to be allocated prior to the user being changed.
-RUN_AS_USER=nexus
-
 # The following two lines are used by the chkconfig command. Change as is
 #  appropriate for your application.  They should remain commented.
 # chkconfig: 2345 20 80
@@ -113,33 +97,6 @@ done
 cd "`dirname "$REALPATH"`"
 REALDIR=`pwd`
 
-# If the PIDDIR is relative, set its value relative to the full REALPATH to avoid problems if
-#  the working directory is later changed.
-FIRST_CHAR=`echo $PIDDIR | cut -c1,1`
-if [ "$FIRST_CHAR" != "/" ]
-then
-    PIDDIR=$REALDIR/$PIDDIR
-fi
-# Same test for WRAPPER_CMD
-FIRST_CHAR=`echo $WRAPPER_CMD | cut -c1,1`
-if [ "$FIRST_CHAR" != "/" ]
-then
-    WRAPPER_CMD=$REALDIR/$WRAPPER_CMD
-fi
-# Same test for WRAPPER_CONF
-FIRST_CHAR=`echo $WRAPPER_CONF | cut -c1,1`
-if [ "$FIRST_CHAR" != "/" ]
-then
-    WRAPPER_CONF=$REALDIR/$WRAPPER_CONF
-fi
-
-# Process ID
-ANCHORFILE="$PIDDIR/$APP_NAME.anchor"
-PIDFILE="$PIDDIR/$APP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="$LOCKDIR/$APP_NAME"
-pid=""
-
 # Resolve the location of the 'ps' command
 PSEXE="/usr/bin/ps"
 if [ ! -x "$PSEXE" ]
@@ -206,62 +163,42 @@ outputFile() {
     fi
 }
 
-# Decide on the wrapper binary to use.
-# If a 32-bit wrapper binary exists then it will work on 32 or 64 bit
-#  platforms, if the 64-bit binary exists then the distribution most
-#  likely wants to use long names.  Otherwise, look for the default.
-# For macosx, we also want to look for universal binaries.
-WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
-if [ -x "$WRAPPER_TEST_CMD" ]
+# Default PIDDIR to current directory
+if [ "X$PIDDIR" = "X" ]
 then
-    WRAPPER_CMD="$WRAPPER_TEST_CMD"
-else
-    if [ "$DIST_OS" = "macosx" ]
-    then
-        WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-universal-32"
-        if [ -x "$WRAPPER_TEST_CMD" ]
-        then
-            WRAPPER_CMD="$WRAPPER_TEST_CMD"
-        else
-            WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
-            if [ -x "$WRAPPER_TEST_CMD" ]
-            then
-                WRAPPER_CMD="$WRAPPER_TEST_CMD"
-            else
-                WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-universal-64"
-                if [ -x "$WRAPPER_TEST_CMD" ]
-                then
-                    WRAPPER_CMD="$WRAPPER_TEST_CMD"
-                else
-                    if [ ! -x "$WRAPPER_CMD" ]
-                    then
-                        echo "Unable to locate any of the following binaries:"
-                        outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
-                        outputFile "$WRAPPER_CMD-$DIST_OS-universal-32"
-                        outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
-                        outputFile "$WRAPPER_CMD-$DIST_OS-universal-64"
-                        outputFile "$WRAPPER_CMD"
-                        exit 1
-                    fi
-                fi
-            fi
-        fi
-    else
-        WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
-        if [ -x "$WRAPPER_TEST_CMD" ]
-        then
-            WRAPPER_CMD="$WRAPPER_TEST_CMD"
-        else
-            if [ ! -x "$WRAPPER_CMD" ]
-            then
-                echo "Unable to locate any of the following binaries:"
-                outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
-                outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
-                outputFile "$WRAPPER_CMD"
-                exit 1
-            fi
-        fi
-    fi
+    PIDDIR="."
+fi
+
+# If the PIDDIR is relative, set its value relative to the full REALPATH to avoid problems if
+#  the working directory is later changed.
+FIRST_CHAR=`echo $PIDDIR | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+    PIDDIR=$REALDIR/$PIDDIR
+fi
+# Same test for WRAPPER_CMD
+FIRST_CHAR=`echo $WRAPPER_CMD | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+    WRAPPER_CMD=$REALDIR/$WRAPPER_CMD
+fi
+# Same test for WRAPPER_CONF
+FIRST_CHAR=`echo $WRAPPER_CONF | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+    WRAPPER_CONF=$REALDIR/$WRAPPER_CONF
+fi
+
+# Process ID
+ANCHORFILE="$PIDDIR/$APP_NAME.anchor"
+PIDFILE="$PIDDIR/$APP_NAME.pid"
+LOCKDIR="/var/lock/subsys"
+LOCKFILE="$LOCKDIR/$APP_NAME"
+pid=""
+
+if [ ! -x "$WRAPPER_CMD" ]; then
+    echo "Missing platform binary: $WRAPPER_CMD"
+    exit 1
 fi
 
 # Build the nice clause
@@ -296,68 +233,77 @@ checkUser() {
     # $1 touchLock flag
     # $2 command
 
-    # Check the configured user.  If necessary rerun this script as the desired user.
-    if [ "X$RUN_AS_USER" != "X" ]
+    # Resolve the location of the 'id' command
+    IDEXE="/usr/xpg4/bin/id"
+    if [ ! -x "$IDEXE" ]
     then
-        # Resolve the location of the 'id' command
-        IDEXE="/usr/xpg4/bin/id"
+        IDEXE="/usr/bin/id"
         if [ ! -x "$IDEXE" ]
         then
-            IDEXE="/usr/bin/id"
-            if [ ! -x "$IDEXE" ]
-            then
-                echo "Unable to locate 'id'."
-                echo "Please report this message along with the location of the command on your system."
-                exit 1
-            fi
-        fi
-    
-        if [ "`$IDEXE -u -n`" = "$RUN_AS_USER" ]
-        then
-            # Already running as the configured user.  Avoid password prompts by not calling su.
-            RUN_AS_USER=""
+            echo "Unable to locate 'id'."
+            echo "Please report this message along with the location of the command on your system."
+            exit 1
         fi
     fi
+
+    # Check the configured user.  If necessary rerun this script as the desired user.
     if [ "X$RUN_AS_USER" != "X" ]
     then
-        # If LOCKPROP and $RUN_AS_USER are defined then the new user will most likely not be
-        # able to create the lock file.  The Wrapper will be able to update this file once it
-        # is created but will not be able to delete it on shutdown.  If $2 is defined then
-        # the lock file should be created for the current command
-        if [ "X$LOCKPROP" != "X" ]
+        if [ "`$IDEXE -u -n`" != "$RUN_AS_USER" ]
         then
-            if [ "X$1" != "X" ]
+            # If LOCKPROP and $RUN_AS_USER are defined then the new user will most likely not be
+            # able to create the lock file.  The Wrapper will be able to update this file once it
+            # is created but will not be able to delete it on shutdown.  If $2 is defined then
+            # the lock file should be created for the current command
+            if [ "X$LOCKPROP" != "X" ]
             then
-                # Resolve the primary group 
-                RUN_AS_GROUP=`groups $RUN_AS_USER | awk '{print $3}' | tail -1`
-                if [ "X$RUN_AS_GROUP" = "X" ]
+                if [ "X$1" != "X" ]
                 then
-                    RUN_AS_GROUP=$RUN_AS_USER
+                    # Resolve the primary group 
+                    RUN_AS_GROUP=`groups $RUN_AS_USER | awk '{print $3}' | tail -1`
+                    if [ "X$RUN_AS_GROUP" = "X" ]
+                    then
+                        RUN_AS_GROUP=$RUN_AS_USER
+                    fi
+                    touch $LOCKFILE
+                    chown $RUN_AS_USER:$RUN_AS_GROUP $LOCKFILE
                 fi
-                touch $LOCKFILE
-                chown $RUN_AS_USER:$RUN_AS_GROUP $LOCKFILE
             fi
-        fi
-
-        # Still want to change users, recurse.  This means that the user will only be
-        #  prompted for a password once. Variables shifted by 1
-        su -m $RUN_AS_USER -c "\"$REALPATH\" $2"
-
-        # Now that we are the original user again, we may need to clean up the lock file.
-        if [ "X$LOCKPROP" != "X" ]
-        then
-            getpid
-            if [ "X$pid" = "X" ]
+    
+            # Still want to change users, recurse.  This means that the user will only be
+            #  prompted for a password once. Variables shifted by 1
+            su -m $RUN_AS_USER -c "\"$REALPATH\" $2"
+    
+            # Now that we are the original user again, we may need to clean up the lock file.
+            if [ "X$LOCKPROP" != "X" ]
             then
-                # Wrapper is not running so make sure the lock file is deleted.
-                if [ -f "$LOCKFILE" ]
+                getpid
+                if [ "X$pid" = "X" ]
                 then
-                    rm "$LOCKFILE"
+                    # Wrapper is not running so make sure the lock file is deleted.
+                    if [ -f "$LOCKFILE" ]
+                    then
+                        rm "$LOCKFILE"
+                    fi
                 fi
             fi
+    
+            exit 0
         fi
+    fi
 
-        exit 0
+    # Check that script is not run as root
+    LUID=`$IDEXE -u`
+    if [ $LUID -eq 0 ]
+    then
+        echo "****************************************"
+        echo "WARNING - NOT RECOMMENDED TO RUN AS ROOT"
+        echo "****************************************"
+        if [ ! "`$IDEXE -u -n`" = "$RUN_AS_USER" ]
+        then
+            echo "If you insist running as root, then set the environment variable RUN_AS_USER=root before running this script."
+            exit 1
+        fi
     fi
 }
 
@@ -374,7 +320,7 @@ getpid() {
                 #  common is during system startup after an unclean shutdown.
                 # The ps statement below looks for the specific wrapper command running as
                 #  the pid.  If it is not found then the pid file is considered to be stale.
-                pidtest=`$PSEXE -p $pid -o args | grep "$WRAPPER_CMD" | tail -1`
+                pidtest=`$PSEXE -p $pid -o args | grep "wrapper.pidfile" | tail -1`
                 if [ "X$pidtest" = "X" ]
                 then
                     # This is a stale pid file.
diff --git a/development/nexus/wrapper.conf b/development/nexus/files/wrapper.conf
index b570ea1eae..2fe62598a6 100644
--- a/development/nexus/wrapper.conf
+++ b/development/nexus/files/wrapper.conf
@@ -7,12 +7,8 @@
 # to be used as a "guideline". They are NOT the complete list of
 # keywords.
 
-
-# Include the platform specific path of JSW configuration
-include ./platform.conf
-
 # Set the JSW working directory (used as base for resolving relative paths)
-wrapper.working.dir=../../..
+wrapper.working.dir=/usr/share/nexus
 
 # Set the JVM executable 
 # (modify this to absolute path if you need a Java that is not on the OS path)
@@ -23,20 +19,26 @@ wrapper.java.mainclass=org.codehaus.plexus.classworlds.launcher.Launcher
 
 # The JVM classpath
 wrapper.java.classpath.1=bin/jsw/lib/wrapper-3.2.3.jar
-wrapper.java.classpath.2=./runtime/apps/nexus/lib/plexus-classworlds-*.jar
+wrapper.java.classpath.2=./lib/plexus-classworlds-*.jar
 wrapper.java.classpath.3=./conf/
 
+# The library path
+wrapper.java.library.path.1=bin/jsw/lib
+
 # Additional JVM parameters (tune if needed, but match the sequence of numbers!)
 wrapper.java.additional.1=-Dsun.net.inetaddr.ttl=3600
-wrapper.java.additional.2=-Dbasedir=.
-#wrapper.java.additional.3=-Djava.io.tmpdir=./runtime/tmp
-wrapper.java.additional.3=-Djava.io.tmpdir=/var/tmp/nexus
-#wrapper.java.additional.4=-Xdebug
-#wrapper.java.additional.5=-Xnoagent
-#wrapper.java.additional.6=-Djava.compiler=NONE
-#wrapper.java.additional.7=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#wrapper.java.additional.8=-XX:+HeapDumpOnOutOfMemoryError
-
+wrapper.java.additional.2=-DbundleBasedir=.
+wrapper.java.additional.3=-Djava.io.tmpdir=./tmp
+wrapper.java.additional.4=-DjettyContext=nexus.properties
+wrapper.java.additional.5=-DjettyContextIncludeKeys=bundleBasedir
+wrapper.java.additional.6=-DjettyPlexusCompatibility=true
+#wrapper.java.additional.7=-Xdebug
+#wrapper.java.additional.8=-Xnoagent
+#wrapper.java.additional.9=-Djava.compiler=NONE
+#wrapper.java.additional.10=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#wrapper.java.additional.11=-XX:+HeapDumpOnOutOfMemoryError
+
+wrapper.app.parameter.1=./conf/jetty.xml
 
 # Size Java memory, in MB (-Xms)
 #wrapper.java.initmemory=128
@@ -54,8 +56,7 @@ wrapper.restart.reload_configuration=TRUE
 wrapper.on_exit.12=RESTART
 
 # Set up JSW logging
-#wrapper.logfile=logs/wrapper.log
-wrapper.logfile=/var/log/nexus/wrapper.log
+wrapper.logfile=logs/wrapper.log
 wrapper.logfile.format=PM
 wrapper.logfile.loglevel=INFO
 wrapper.logfile.maxsize=10m
@@ -154,29 +155,3 @@ wrapper.console.flush=true
 
 # Title to use when running as a console
 #wrapper.console.title=@app.long.name@
-
-# ********************************************************************
-# Wrapper Windows NT/2000/XP Service Properties
-# ********************************************************************
-# WARNING - Do not modify any of these properties when an application
-#  using this configuration file has been installed as a service.
-#  Please uninstall the service before modifying this section.  The
-#  service can then be reinstalled.
-
-# Name of the service
-#wrapper.name=@app.name@
-
-# Display name of the service
-#wrapper.displayname=@app.long.name@
-
-# Description of the service
-#wrapper.description=@app.description@
-
-# Service dependencies.  Add dependencies as needed starting from 1
-#wrapper.ntservice.dependency.1=
-
-# Mode in which the service is installed.  AUTO_START, DELAY_START or DEMAND_START
-#wrapper.ntservice.starttype=AUTO_START
-
-# Allow the service to interact with the desktop.
-#wrapper.ntservice.interactive=false
diff --git a/development/nexus/nexus.SlackBuild b/development/nexus/nexus.SlackBuild
index 8ace4750d3..e49a3c17aa 100644
--- a/development/nexus/nexus.SlackBuild
+++ b/development/nexus/nexus.SlackBuild
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-# Copyright 2008-2011  Giorgio Peron Campodarsego Italy
+# Slackware build script for Sonatype Nexus
+
+# Copyright 2012  Giorgio Peron Campodarsego, PD, Italy giorgio.peron@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -9,19 +11,19 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nexus
-VERSION=${VERSION:-1.9.2}
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,9 +67,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-oss-webapp-$VERSION
-tar xvf $CWD/$PRGNAM-oss-webapp-$VERSION-bundle.tar.gz
-cd $PRGNAM-oss-webapp-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-bundle.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -75,42 +77,44 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-DIR=$PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $PKG/var/{lib,log,run}/$PRGNAM
+mkdir -p $PKG/var/{lib,log,run,tmp}/$PRGNAM
 mkdir -p $PKG/etc/rc.d
 mkdir -p $PKG/etc/$PRGNAM
-
-cp -r bin/jsw/conf/* $PKG/etc/nexus/
-mkdir -p $DIR/bin/jsw/lib
-cp -r bin/jsw/lib $DIR/bin/jsw
-cp -r bin/jsw/license $PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $DIR/bin/jsw/$NEXUS_ARCH
-cp -r bin/jsw/$NEXUS_ARCH $DIR/bin/jsw
-cp -r runtime $DIR
-cp -r conf/* $PKG/etc/nexus/
-mkdir -p $PKG/var/tmp/$PRGNAM
-cp *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/share/$PRGNAM/bin/jsw/lib
+
+mv *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mv lib $PKG/usr/share/$PRGNAM
+mv $PRGNAM $PKG/usr/share/$PRGNAM/
+mv conf/* $PKG/etc/$PRGNAM
+mv bin/$PRGNAM $PKG/usr/share/$PRGNAM/bin
+mv bin/jsw/conf/* $PKG/etc/$PRGNAM
+mv bin/jsw/license $PKG/usr/share/$PRGNAM/bin/jsw
+mv bin/jsw/lib/*.jar $PKG/usr/share/$PRGNAM/bin/jsw/lib
+mv bin/jsw/lib/libwrapper-$NEXUS_ARCH.so $PKG/usr/share/$PRGNAM/bin/jsw/lib
+mv bin/jsw/$NEXUS_ARCH $PKG/usr/share/$PRGNAM/bin/jsw
+
+cd $PKG/usr/share/$PRGNAM
+ln -sf ../../../etc/$PRGNAM conf 
+ln -sf ../../../var/tmp/$PRGNAM tmp
+ln -sf ../../../var/log/$PRGNAM logs
+cd -
+cd $PKG/usr/share/$PRGNAM/bin/jsw
+  ln -sf ../../../../../etc/nexus conf
+cd -
 
 #Put startup script in place and set correct location
-cat $CWD/rc.$PRGNAM | \
+cat $CWD/files/rc.$PRGNAM | \
   sed -e "s/@NEXUS_ARCH@/$NEXUS_ARCH/g" \
       -e "s/@LIBDIRSUFFIX@/$LIBDIRSUFFIX/g" \
   > $PKG/etc/rc.d/rc.$PRGNAM.new
 
-#Create links to configurarion files
-cd $DIR
-  ln -sf ../../../etc/nexus conf
-cd -
-cd $DIR/bin/jsw
-  ln -sf ../../../../../etc/nexus conf
-cd -
-
 #Replace two configuration files
-rm $PKG/etc/nexus/plexus.properties
-cat $CWD/plexus.properties > $PKG/etc/nexus/plexus.properties.new
+rm $PKG/etc/nexus/nexus.properties
+cat $CWD/files/nexus.properties > $PKG/etc/nexus/nexus.properties.new
 rm $PKG/etc/nexus/wrapper.conf
-cat $CWD/wrapper.conf > $PKG/etc/nexus/wrapper.conf.new
+cat $CWD/files/wrapper.conf > $PKG/etc/nexus/wrapper.conf.new
 
 #Fix ownership of some dirs
 chown -R nexus:nexus $PKG/var/{lib,log,run,tmp}/nexus
diff --git a/development/nexus/nexus.info b/development/nexus/nexus.info
index 468e1c6559..1cd6f3dd61 100644
--- a/development/nexus/nexus.info
+++ b/development/nexus/nexus.info
@@ -1,10 +1,10 @@
 PRGNAM="nexus"
-VERSION="1.9.2"
+VERSION="2.0"
 HOMEPAGE="http://nexus.sonatype.org"
-DOWNLOAD="http://nexus.sonatype.org/downloads/older/nexus-oss-webapp-1.9.2-bundle.tar.gz"
-MD5SUM="adfe4d0fb4f177a78bce6494d4d5d627"
+DOWNLOAD="http://www.sonatype.org/downloads/nexus-2.0-bundle.tar.gz"
+MD5SUM="e63dc8a99d75d2afdcbf51d86ba74745"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Giorgio Peron"
 EMAIL="giorgio.peron@gmail.com"
-APPROVED="Niels Horn"
+APPROVED="dsomero"
diff --git a/development/nexus/plexus.properties b/development/nexus/plexus.properties
deleted file mode 100644
index b4efc21d37..0000000000
--- a/development/nexus/plexus.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-application-port=8081
-application-host=0.0.0.0
-runtime=${basedir}/runtime
-apps=${runtime}/apps
-#nexus-work=${basedir}/../sonatype-work/nexus
-nexus-work=/var/lib/nexus
-nexus-app=${runtime}/apps/nexus
-webapp=${runtime}/apps/nexus/webapp
-webapp-context-path=/nexus
-security-xml-file=${nexus-work}/conf/security.xml
-application-conf=${nexus-work}/conf
-#runtime-tmp=${runtime}/tmp
-runtime-tmp=/var/tmp/nexus
-
-# If this file is present, it will be used to configure Jetty.
-jetty.xml=${basedir}/conf/jetty.xml
-
-# Uncomment this to use the debug js files
-#index.template.file=templates/index-debug.vm
-
-
-
-