diff --git a/build.xml b/build.xml
index 19e6d34afd8c0067b77901e65187d754dace4e12..c94be94c1475fafe689bd3811b2e9fbfade75047 100644
--- a/build.xml
+++ b/build.xml
@@ -35,8 +35,6 @@
<property name="packetstreamer-gen" location="lib/gen-java" />
<property name="packetstreamer-gen-build" location="lib/gen-java-bin"/>
<property name="packetstreamer-thrift-jar" value="packetstreamer-thrift.jar"/>
- <property name="floodlight-nodeps-jar" location="${target}/floodlight-nodeps.jar"/>
- <property name="floodlight-debian-jar" location="${target}/floodlight-debian.jar"/>
<property name="floodlight-jar" location="${target}/floodlight.jar"/>
<property name="floodlight-test-jar" location="${target}/floodlight-test.jar"/>
@@ -58,15 +56,6 @@
<include name="jython-2.5.2.jar"/>
<include name="libthrift-0.7.0.jar"/>
</patternset>
- <!-- Dependencies we can't get from Debian/Ubuntu. -->
- <patternset id="debian-lib">
- <include name="org.restlet-2.1-RC1.jar"/>
- <include name="org.restlet.ext.jackson-2.1-RC1.jar"/>
- <include name="org.restlet.ext.simple-2.1-RC1.jar"/>
- <include name="org.restlet.ext.slf4j-2.1-RC1.jar"/>
- <include name="libthrift-0.7.0.jar"/>
- <include name="simple-4.1.21.jar"/>
- </patternset>
<patternset id="genlib">
<include name="${packetstreamer-thrift-jar}"/>
</patternset>
@@ -212,7 +201,7 @@
<target name="coverage" depends="instrument,test,coverage-report"/>
<target name="dist" depends="compile,compile-test">
- <jar destfile="${floodlight-nodeps-jar}" filesetmanifest="mergewithoutmain">
+ <jar destfile="${floodlight-jar}" filesetmanifest="mergewithoutmain">
<manifest>
<attribute name="Main-Class" value="${main-class}"/>
<attribute name="Class-Path" value="."/>
@@ -222,30 +211,12 @@
<fileset dir="${python-src}">
<include name="**/*.py"/>
</fileset>
- <zipgroupfileset dir="${target}/lib">
- <patternset refid="genlib"/>
- </zipgroupfileset>
- </jar>
- <jar destfile="${floodlight-jar}">
- <manifest>
- <attribute name="Main-Class" value="${main-class}"/>
- <attribute name="Class-Path" value="."/>
- </manifest>
<zipgroupfileset dir="lib">
<patternset refid="lib"/>
</zipgroupfileset>
- <zipfileset src="${floodlight-nodeps-jar}"/>
- </jar>
- <jar destfile="${floodlight-debian-jar}">
- <manifest>
- <attribute name="Main-Class" value="${main-class}"/>
- <!-- JARs under /usr/share/java on Debian/Ubuntu -->
- <attribute name="Class-Path" value="args4j.jar slf4j-api.jar logback-core.jar logback-classic.jar jackson-core-asl.jar jackson-mapper-asl.jar easymock.jar netty.jar concurrentlinkedhashmap-lru.jar jython.jar antlr3-runtime.jar asm3.jar asm3-tree.jar ."/>
- </manifest>
- <zipgroupfileset dir="lib">
- <patternset refid="debian-lib"/>
+ <zipgroupfileset dir="${target}/lib">
+ <patternset refid="genlib"/>
</zipgroupfileset>
- <zipfileset src="${floodlight-nodeps-jar}"/>
</jar>
<jar destfile="${floodlight-test-jar}" filesetmanifest="mergewithoutmain">
<manifest>
diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644
index 972bbfe651b922d9d33bcc9051a37ab33236252c..0000000000000000000000000000000000000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/files
-/floodlight.debhelper.log
-/floodlight.substvars
-/floodlight
-
diff --git a/debian/README b/debian/README
deleted file mode 100644
index 8583ef341267838fcc1ac25c84ab1a88a603aa3c..0000000000000000000000000000000000000000
--- a/debian/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package floodlight
-----------------------------
-
-Comments regarding the Package
-
- -- Rich Lane <rlane@bigswitch.com> Thu, 10 May 2012 23:02:25 -0700
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index b3f5ace5775966ac692d3fb2c5de48e2c21963b5..0000000000000000000000000000000000000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-floodlight (0.82) unstable; urgency=low
-
- * Initial Release.
-
- -- Rich Lane <rlane@bigswitch.com> Thu, 10 May 2012 23:02:25 -0700
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 45a4fb75db864000d01701c0f7a51864bd4daabf..0000000000000000000000000000000000000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/debian/control b/debian/control
deleted file mode 100644
index b11688589e622c7655c5fc613f7a18f52f8bb2e3..0000000000000000000000000000000000000000
--- a/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: floodlight
-Section: net
-Priority: extra
-Maintainer: Rich Lane <rlane@bigswitch.com>
-Build-Depends: debhelper (>= 8.0.0), javahelper (>= 0.40ubuntu1), liblogback-java (>= 1.0.0-1), libjackson-json-java (>= 1.9.2-1), libeasymock-java (>= 2.4+ds1-6), libslf4j-java (>= 1.6.4-1), libnetty-java (>= 1:3.2.6.Final-2), libargs4j-java (>= 2.0.16-2), libconcurrentlinkedhashmap-java (>= 1.1~jdk5-1), jython (>= 2.5.1-2ubuntu2)
-Standards-Version: 3.9.2
-Homepage: http://floodlight.openflowhub.org/
-Vcs-Git: git://github.com/floodlight/floodlight.git
-Vcs-Browser: https://github.com/floodlight/floodlight
-
-Package: floodlight
-Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Description: Java based OpenFlow controller
- Floodlight is a Java based OpenFlow controller originally written by David
- Erickson at Stanford University.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index e139e18b52babbe34fc4fcef6b260f1e501844c2..0000000000000000000000000000000000000000
--- a/debian/copyright
+++ /dev/null
@@ -1,27 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: floodlight
-Source: https://github.com/floodlight/floodlight
-
-Files: *
-Copyright: 2011 Big Switch Networks <rlane@bigswitch.com>
-License: Apache-2.0
-
-Files: debian/*
-Copyright: 2012 Big Switch Networks <rlane@bigswitch.com>
-License: Apache-2.0
-
-License: Apache-2.0
- 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.
- .
- On Debian systems, the complete text of the Apache version 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 588b138a5aceaf1ecbaf91a1d08172598891cc11..0000000000000000000000000000000000000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-NOTICE.txt
-README.txt
diff --git a/debian/floodlight.1 b/debian/floodlight.1
deleted file mode 100644
index 80635073d7d13a860e182ac53853246ddeb9e188..0000000000000000000000000000000000000000
--- a/debian/floodlight.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FLOODLIGHT 1 "May 14, 2012"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-floodlight \- An Apache licensed, Java based OpenFlow controller
-.SH SYNOPSIS
-.B floodlight
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B floodlight
-command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-\fBfloodlight\fP is an Apache licensed, Java based OpenFlow controller.
-.SH OPTIONS
-.TP
-.B \-cf, \-\-configFile FILE
-Floodlight configuration file.
-.SH AUTHOR
-floodlight was written by David Erickson and Big Switch Networks.
-.PP
-This manual page was written by Rich Lane <rlane@bigswitch.com>,
-for the Debian project (and may be used by others).
diff --git a/debian/floodlight.install b/debian/floodlight.install
deleted file mode 100644
index f21b0d6c1f05b46f0c81f2c497c5c56e84fac247..0000000000000000000000000000000000000000
--- a/debian/floodlight.install
+++ /dev/null
@@ -1,2 +0,0 @@
-target/floodlight-debian.jar usr/share/java
-debian/misc/floodlight usr/bin
diff --git a/debian/floodlight.manpages b/debian/floodlight.manpages
deleted file mode 100644
index bec775d2741b6ae5db26abc89c80c7f41cd13f97..0000000000000000000000000000000000000000
--- a/debian/floodlight.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/floodlight.1
diff --git a/debian/init.d b/debian/init.d
deleted file mode 100644
index ecb447884107bb4a9fb40d5b0ff73b1c44f12329..0000000000000000000000000000000000000000
--- a/debian/init.d
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: floodlight
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: An Apache licensed, Java based OpenFlow controller
-# Description: An Apache licensed, Java based OpenFlow controller
-### END INIT INFO
-
-# Author: Rich Lane <rlane@bigswitch.com>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC=floodlight # Introduce a short description here
-NAME=floodlight # Introduce the short server's name here
-DAEMON=/usr/bin/floodlight # Introduce the server's location here
-DAEMON_ARGS="" # Arguments to run the daemon with
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
- start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
- || return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON -b -m -- \
- $DAEMON_ARGS \
- || return 2
- # Wait for the server to start.
- while ! nc -z localhost 6633; do sleep 1; done
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
- RETVAL="$?"
- [ "$RETVAL" = 2 ] && return 2
- # Many daemons don't delete their pidfiles when they exit.
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
- #
- # If the daemon can reload its configuration without
- # restarting (for example, when it is sent a SIGHUP),
- # then implement that here.
- #
- start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE
- return 0
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
- #log_end_msg $?
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
diff --git a/debian/misc/floodlight b/debian/misc/floodlight
deleted file mode 100755
index b98a261ac74afb002e4ee8649d5240e76a0114db..0000000000000000000000000000000000000000
--- a/debian/misc/floodlight
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec java -jar /usr/share/java/floodlight-debian.jar "$@"
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index f35bb0c395caa40b3538262f854a0c49fce71652..0000000000000000000000000000000000000000
--- a/debian/rules
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export JAVA_HOME=/usr/lib/jvm/default-java
-
-%:
- dh $@ --with javahelper
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 89ae9db8f88b823b6a7eabf55e203658739da122..0000000000000000000000000000000000000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (native)