diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..d1d52f8fdd0b6e56e105a58d47829cb621af8dc1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*~
+.classpath
+.project
+.settings
+target
+thrift
diff --git a/build.xml b/build.xml
index ed18a7d072fe3878664e1f094b494af222a123f3..4a2e080c914814a2a61378a39a8ff4465cb647bf 100644
--- a/build.xml
+++ b/build.xml
@@ -22,20 +22,17 @@
<project default="dist" name="Floodlight">
- <property name="target" location="target/"/>
- <property name="build" location="${target}/bin/"/>
- <property name="build-test" location="${target}/bin-test/"/>
- <property name="test-output" location="${target}/test/"/>
- <property name="source" location="src/main/java/"/>
- <property name="source-test" location="src/test/java/"/>
+ <property name="target" location="target"/>
+ <property name="build" location="${target}/bin"/>
+ <property name="build-test" location="${target}/bin-test"/>
+ <property name="test-output" location="${target}/test"/>
+ <property name="source" location="src/main/java"/>
+ <property name="source-test" location="src/test/java"/>
<property name="docs" location="${target}/docs"/>
<property name="main-class" value="net.floodlightcontroller.core.internal.Controller"/>
- <property name="packagelib" location="lib" />
- <property name="packetstreamer-gen" location="packetstreamerd/gen-java" />
- <property name="packetstreamer-gen-build" location="packetstreamerd/gen-java/bin" />
- <property name="packetstreamer-src" location="packetstreamerd/java/src/main/java" />
- <property name="packetstreamer-src-build" location="packetstreamerd/java/bin" />
- <property name="packetstreamer-thrift-jar" location="${packagelib}/packetstreamer-thrift.jar" />
+ <property name="packetstreamer-gen" location="${target}/gen-java" />
+ <property name="packetstreamer-gen-build" location="${target}/gen-java-bin"/>
+ <property name="packetstreamer-thrift-jar" location="${target}/lib/packetstreamer-thrift.jar"/>
<property name="floodlight-jar" location="${target}/floodlight.jar"/>
<property name="floodlight-test-jar" location="${target}/floodlight-test.jar"/>
@@ -52,6 +49,8 @@
<include name="org.restlet.ext.slf4j-2.1-RC1.jar"/>
<include name="simple-4.1.21.jar"/>
<include name="netty-3.2.6.Final.jar"/>
+ </patternset>
+ <patternset id="genlib">
<include name="libthrift-0.7.0.jar"/>
<include name="packetstreamer-thrift.jar"/>
</patternset>
@@ -60,6 +59,9 @@
<fileset dir="lib">
<patternset refid="lib"/>
</fileset>
+ <fileset dir="${target}/lib">
+ <patternset refid="genlib"/>
+ </fileset>
</path>
<patternset id="lib-test">
@@ -76,32 +78,51 @@
<target name="init">
<exec executable="${basedir}/setup.sh" failonerror="true"/>
<mkdir dir="${build}"/>
- <mkdir dir="${packetstreamer-gen-build}"/>
- <mkdir dir="${packetstreamer-src-build}"/>
<mkdir dir="${build-test}"/>
+ <mkdir dir="${target}/lib"/>
+ <mkdir dir="${packetstreamer-gen-build}"/>
<mkdir dir="${test-output}"/>
</target>
<target name="compile" depends="init,packetstreamer-thrift">
- <javac includeAntRuntime="false" classpathref="classpath" debug="true" srcdir="${source}" destdir="${build}"/>
+ <javac includeAntRuntime="false"
+ classpathref="classpath"
+ debug="true"
+ srcdir="${source}:${packetstreamer-gen}"
+ destdir="${build}">
+ </javac>
</target>
<target name="compile-tests" depends="compile-test"/>
<target name="compile-test" depends="compile">
- <javac includeAntRuntime="false" debug="true" srcdir="${source-test}" classpath="${build}" classpathref="classpath-test" destdir="${build-test}"/>
+ <javac includeAntRuntime="false" debug="true"
+ srcdir="${source-test}"
+ classpath="${build}"
+ classpathref="classpath-test"
+ destdir="${build-test}"/>
+ </target>
+
+ <target name="compile-thrift" depends="init">
+ <javac srcdir="${packetstreamer-gen}"
+ includeantruntime="false"
+ destdir="${packetstreamer-gen-build}"
+ debug="true" debuglevel="lines,vars,source"
+ classpathref="classpath" />
+ </target>
+ <target name="packetstreamer-thrift" depends="compile-thrift">
+ <jar jarfile="${packetstreamer-thrift-jar}"
+ basedir="${packetstreamer-gen-build}"/>
</target>
<target name="clean">
<delete dir="${target}"/>
- <delete dir="${packetstreamer-src-build}"/>
- <delete dir="${packetstreamer-gen-build}"/>
</target>
<target name="run" depends="dist">
<java fork="true" jar="${floodlight-jar}" classpath="${jar}" classpathref="classpath">
<jvmarg value="-server"/>
- <jvmarg value="-Xms512M"/>
- <jvmarg value="-Xmx512M"/>
+ <jvmarg value="-Xms1024M"/>
+ <jvmarg value="-Xmx1024M"/>
</java>
</target>
@@ -124,28 +145,20 @@
<fail if="junit.failure" message="Unit test(s) failed. See reports!"/>
</target>
- <target name="compile-thrift" depends="init">
- <javac srcdir="${packetstreamer-gen}" includeantruntime="false" destdir="${packetstreamer-gen-build}" debug="true" debuglevel="lines,vars,source" classpathref="classpath" />
- </target>
-
- <target name="packetstreamer-thrift" depends="compile-thrift">
- <jar jarfile="${packetstreamer-thrift-jar}" basedir="${packetstreamer-gen-build}"/>
- </target>
-
- <target name="compile-packetstreamer" depends="packetstreamer-thrift">
- <javac srcdir="${packetstreamer-src}" includeantruntime="false" destdir="${build}" debug="true" debuglevel="lines,vars,source" classpathref="classpath" />
- </target>
-
- <target name="dist" depends="compile,compile-packetstreamer,compile-tests">
+ <target name="dist" depends="compile,compile-tests">
<jar destfile="${floodlight-jar}" filesetmanifest="mergewithoutmain">
<manifest>
<attribute name="Main-Class" value="${main-class}"/>
<attribute name="Class-Path" value="."/>
</manifest>
<fileset dir="${build}"/>
+ <fileset dir="${packetstreamer-gen-build}"/>
<zipgroupfileset dir="lib">
<patternset refid="lib"/>
</zipgroupfileset>
+ <zipgroupfileset dir="${target}/lib">
+ <patternset refid="genlib"/>
+ </zipgroupfileset>
</jar>
<jar destfile="${floodlight-test-jar}" filesetmanifest="mergewithoutmain">
<manifest>
@@ -155,6 +168,9 @@
<zipgroupfileset dir="lib">
<patternset refid="lib-test"/>
</zipgroupfileset>
+ <zipgroupfileset dir="${target}/lib">
+ <patternset refid="genlib"/>
+ </zipgroupfileset>
</jar>
</target>
@@ -176,13 +192,16 @@
version="true"/>
</target>
- <target name="eclipse" depends="packetstreamer-thrift">
+ <target name="eclipse" depends="init">
<pathconvert property="lib">
<map from="${basedir}/" to=""/>
<fileset dir="lib">
<patternset refid="lib"/>
<patternset refid="lib-test"/>
</fileset>
+ <fileset dir="${target}/lib">
+ <patternset refid="genlib"/>
+ </fileset>
</pathconvert>
<exec executable="${basedir}/setup-eclipse.sh">
<arg value="${main-class}"/>
diff --git a/packetstreamerd/java/JavaClient b/packetstreamerd/java/JavaClient
deleted file mode 100755
index 92180532c4a3e2f9e0be8c3dc8ad8d2d0259d418..0000000000000000000000000000000000000000
--- a/packetstreamerd/java/JavaClient
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -ex
-
-java -Dlog4j.debug -Dlog4j.configuration=log4j.properties -cp ../target/packetstreamer.jar net.floodlightcontroller.packetstreamer.PacketStreamerClient
diff --git a/packetstreamerd/java/JavaServer b/packetstreamerd/java/JavaServer
deleted file mode 100755
index fc21df4265ca328d06f1261713da812cc09e0ffc..0000000000000000000000000000000000000000
--- a/packetstreamerd/java/JavaServer
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -xe
-
-java -Dlog4j.debug -Dlog4j.configuration=./log4j.properties -cp ../target/packetstreamer.jar net.floodlightcontroller.packetstreamer.PacketStreamerServer
-#java -cp ../target/packetstreamer.jar net.floodlightcontroller.packetstreamer.PacketStreamerServer
diff --git a/packetstreamerd/java/build.xml b/packetstreamerd/java/build.xml
deleted file mode 100644
index 0f1f35bbf42da1bb1de3d6238d8873bdadc885d9..0000000000000000000000000000000000000000
--- a/packetstreamerd/java/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<project name="packetstreamer" default="dist" basedir=".">
-
- <description>Thrift PacketStreamer</description>
-
- <property name="target" location="../target/"/>
- <property name="src" location="src/main/java" />
- <property name="gen" location="../gen-java" />
- <property name="gen-build" location="../gen-java/build" />
- <property name="src-build" location="build" />
- <property name="packagelib" location="../lib" />
- <property name="packetstreamer-thrift-jar" location="${packagelib}/packetstreamer-thrift.jar" />
- <property name="packetstreamer-jar" location="${target}/packetstreamer.jar" />
- <property name="main-class" value="PacketStreamerServer" />
-
- <patternset id="dep-lib">
- <include name="ch.qos.logback.classic_0.9.20.jar"/>
- <include name="ch.qos.logback.core_0.9.20.jar"/>
- <include name="jackson-core-asl_1.8.1.jar"/>
- <include name="jackson-mapper-asl_1.8.1.jar"/>
- <include name="org.easymock_2.5.2.jar"/>
- <include name="slf4j.api_1.5.11.jar"/>
- <include name="org.restlet-2.1m7.jar"/>
- <include name="org.restlet.ext.jackson-2.1m7.jar"/>
- <include name="org.restlet.ext.simple-2.1m7.jar"/>
- <include name="org.restlet.ext.slf4j-2.1m7.jar"/>
- <include name="simple-4.1.21.jar"/>
- <include name="libthrift-0.7.0.jar"/>
- </patternset>
-
- <path id="classpath">
- <fileset dir="${packagelib}">
- <patternset refid="dep-lib"/>
- </fileset>
- </path>
-
- <path id="build.classpath">
- <path refid="classpath" />
- <pathelement path="${gen}" />
- <pathelement location="${packetstreamer-thrift-jar}"/>
- </path>
-
- <target name="init">
- <tstamp />
- <mkdir dir="${target}"/>
- <mkdir dir="${gen-build}"/>
- <mkdir dir="${src-build}"/>
- </target>
-
- <target name="compile-thrift" depends="init">
- <javac srcdir="${gen}" includeantruntime="false" destdir="${gen-build}" debug="true" debuglevel="lines,vars,source" classpathref="classpath" />
- </target>
-
- <target name="packetstreamer-thrift" depends="compile-thrift">
- <jar jarfile="${packetstreamer-thrift-jar}" basedir="${gen-build}"/>
- </target>
-
- <target name="compile-server" depends="packetstreamer-thrift">
- <javac srcdir="${src}" includeantruntime="false" destdir="${src-build}" debug="true" debuglevel="lines,vars,source" classpathref="build.classpath" />
- </target>
-
- <target name="dist" depends="compile-server">
- <jar jarfile="${packetstreamer-jar}">
- <fileset dir="${src-build}"/>
- <zipgroupfileset dir="${packagelib}">
- <patternset refid="dep-lib"/>
- </zipgroupfileset>
- <zipfileset src="${packetstreamer-thrift-jar}"/>
- </jar>
- </target>
-
- <target name="clean">
- <delete dir="${gen-build}" />
- <delete dir="${src-build}" />
- <delete file="${packetstreamer-jar}" />
- <delete file="${packetstreamer-thrift-jar}" />
- <delete file=".project" />
- <delete file=".classpath" />
- </target>
-
- <target name="eclipse">
- <pathconvert property="lib" refid="build.classpath">
- <map from="${basedir}/" to=""/>
- </pathconvert>
- <exec executable="${basedir}/setup-eclipse.sh">
- <arg value="${main-class}"/>
- <arg value="${lib}"/>
- </exec>
- </target>
-
-</project>
diff --git a/packetstreamerd/java/log4j.properties b/packetstreamerd/java/log4j.properties
deleted file mode 100644
index 878b2fc13725d116b511a97c123ba51b2985380e..0000000000000000000000000000000000000000
--- a/packetstreamerd/java/log4j.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# log4j configuration used during build and unit tests
-log4j.rootLogger=debug,stdout
-log4j.threshhold=ALL
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
diff --git a/packetstreamerd/java/setup-eclipse.sh b/packetstreamerd/java/setup-eclipse.sh
deleted file mode 100755
index e55fec5c51c1da74efd2c22f3ee7c8601fe424ca..0000000000000000000000000000000000000000
--- a/packetstreamerd/java/setup-eclipse.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-d=$(dirname $0)
-MAIN_CLASS=$1
-LIBRARIES=$2
-[ "${MAIN_CLASS}" ] || { echo "Run 'ant eclipse' to generate Eclipse project files"; exit 1; }
-
-
-cat >$d/.project <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>PacketStreamer</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
-EOF
-
-
-cat >$d/.classpath <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java" output="target/bin"/>
-EOF
-(
-IFS=":"
-for l in ${LIBRARIES}; do
-cat >>$d/.classpath <<EOF
- <classpathentry exported="true" kind="lib" path="$l"/>
-EOF
-done
-)
-cat >>$d/.classpath <<EOF
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/bin"/>
-</classpath>
-EOF
diff --git a/packetstreamerd/lib/ch.qos.logback.classic_0.9.20.jar b/packetstreamerd/lib/ch.qos.logback.classic_0.9.20.jar
deleted file mode 100644
index ab5e9cb9bf79c971a55b63ebc288fdcb6174ce4b..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/ch.qos.logback.classic_0.9.20.jar and /dev/null differ
diff --git a/packetstreamerd/lib/ch.qos.logback.core_0.9.20.jar b/packetstreamerd/lib/ch.qos.logback.core_0.9.20.jar
deleted file mode 100644
index ef6e6cf500ccd7b1c4077d99537dbcef8ab4ebe7..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/ch.qos.logback.core_0.9.20.jar and /dev/null differ
diff --git a/packetstreamerd/lib/jackson-core-asl_1.8.1.jar b/packetstreamerd/lib/jackson-core-asl_1.8.1.jar
deleted file mode 100644
index 13574a4ed9efa73ffb050dfb9594bd2663bc75ca..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/jackson-core-asl_1.8.1.jar and /dev/null differ
diff --git a/packetstreamerd/lib/jackson-mapper-asl_1.8.1.jar b/packetstreamerd/lib/jackson-mapper-asl_1.8.1.jar
deleted file mode 100644
index 83b684038b67272bc4e5a3effdf061079e8f6ac9..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/jackson-mapper-asl_1.8.1.jar and /dev/null differ
diff --git a/packetstreamerd/lib/junit-4.8.2.jar b/packetstreamerd/lib/junit-4.8.2.jar
deleted file mode 100644
index 5b4bb849af9583fec1ea0a0ccc0d571ef49aa8ba..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/junit-4.8.2.jar and /dev/null differ
diff --git a/packetstreamerd/lib/org.easymock_2.5.2.jar b/packetstreamerd/lib/org.easymock_2.5.2.jar
deleted file mode 100644
index 97c8bf0acbb56bfc38845a25ca03f5d98037169e..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/org.easymock_2.5.2.jar and /dev/null differ
diff --git a/packetstreamerd/lib/org.restlet-2.1m7.jar b/packetstreamerd/lib/org.restlet-2.1m7.jar
deleted file mode 100644
index 77f5b85183787bed681ad5ae402de13394b09082..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/org.restlet-2.1m7.jar and /dev/null differ
diff --git a/packetstreamerd/lib/org.restlet.ext.jackson-2.1m7.jar b/packetstreamerd/lib/org.restlet.ext.jackson-2.1m7.jar
deleted file mode 100644
index bc6f77e5f3c73014ebefe5ce16684b023d47c27b..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/org.restlet.ext.jackson-2.1m7.jar and /dev/null differ
diff --git a/packetstreamerd/lib/org.restlet.ext.simple-2.1m7.jar b/packetstreamerd/lib/org.restlet.ext.simple-2.1m7.jar
deleted file mode 100644
index e416fb0c922342ee356a0bdfa8bd3ab6bf0795bc..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/org.restlet.ext.simple-2.1m7.jar and /dev/null differ
diff --git a/packetstreamerd/lib/org.restlet.ext.slf4j-2.1m7.jar b/packetstreamerd/lib/org.restlet.ext.slf4j-2.1m7.jar
deleted file mode 100644
index 547d9fc2c81cdaae6d28cb78f9ee779d5801a5fe..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/org.restlet.ext.slf4j-2.1m7.jar and /dev/null differ
diff --git a/packetstreamerd/lib/simple-4.1.21.jar b/packetstreamerd/lib/simple-4.1.21.jar
deleted file mode 100644
index b7fb53c756d88910cbd149b416a419391b3d77f4..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/simple-4.1.21.jar and /dev/null differ
diff --git a/packetstreamerd/lib/slf4j.api_1.5.11.jar b/packetstreamerd/lib/slf4j.api_1.5.11.jar
deleted file mode 100644
index 1948d19f75f596a83b58f2e1cd5ce20228441dce..0000000000000000000000000000000000000000
Binary files a/packetstreamerd/lib/slf4j.api_1.5.11.jar and /dev/null differ
diff --git a/setup-eclipse.sh b/setup-eclipse.sh
index c79dcbb5cf08aa97449845cee1a5a313cff72fbc..d7e9a06fb126b99ffe22cc670926f34d28a3bc9d 100755
--- a/setup-eclipse.sh
+++ b/setup-eclipse.sh
@@ -32,7 +32,6 @@ cat >$d/.classpath <<EOF
<classpath>
<classpathentry kind="src" path="src/main/java" output="target/bin"/>
<classpathentry kind="src" path="src/test/java" output="target/bin-test"/>
- <classpathentry kind="src" path="packetstreamerd/java/src/main/java" output="target/bin-test"/>
EOF
(
IFS=":"
diff --git a/setup.sh b/setup.sh
index 5a75dc8d2fca005d605ca911638ea88ba89133ce..6448a2f32fc23107b2f02ad4da546c016bc254a3 100755
--- a/setup.sh
+++ b/setup.sh
@@ -4,6 +4,8 @@ set -ex
DOWNLOADS=${DOWNLOADS:-${HOME}/Downloads}
mkdir -p ${DOWNLOADS}
+TARGET=target
+PACKAGELIB=${TARGET}/lib
THRIFT_VERSION=0.7.0
THRIFT_PKG=thrift-${THRIFT_VERSION}.tar.gz
@@ -23,7 +25,7 @@ if [ ! -d thrift ]; then
mv thrift-${THRIFT_VERSION} thrift
fi
-if [ ! -f lib/libthrift-${THRIFT_VERSION}.jar -o ! -f thrift/compiler/cpp/thrift ]; then
+if [ ! -f ${PACKAGELIB}/libthrift-${THRIFT_VERSION}.jar -o ! -f thrift/compiler/cpp/thrift ]; then
(
cd thrift
chmod +x ./configure
@@ -32,13 +34,9 @@ if [ ! -f lib/libthrift-${THRIFT_VERSION}.jar -o ! -f thrift/compiler/cpp/thrift
cd lib/java
ant
)
- mkdir -p lib
- cp thrift/lib/java/build/libthrift-${THRIFT_VERSION}.jar lib/
+ mkdir -p ${PACKAGELIB}
+ cp thrift/lib/java/build/libthrift-${THRIFT_VERSION}.jar ${PACKAGELIB}
fi
-cp lib/libthrift-${THRIFT_VERSION}.jar packetstreamerd/lib/
-(
- cd packetstreamerd
- ../thrift/compiler/cpp/thrift --gen py --gen java packetstreamer.thrift
- cd java; ant
-)
+./thrift/compiler/cpp/thrift --gen py --gen java -o ${TARGET} src/main/thrift/packetstreamer.thrift
+
diff --git a/packetstreamerd/java/src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerClient.java b/src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerClient.java
similarity index 100%
rename from packetstreamerd/java/src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerClient.java
rename to src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerClient.java
diff --git a/packetstreamerd/java/src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerHandler.java b/src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerHandler.java
similarity index 100%
rename from packetstreamerd/java/src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerHandler.java
rename to src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerHandler.java
diff --git a/packetstreamerd/java/src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerServer.java b/src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerServer.java
similarity index 100%
rename from packetstreamerd/java/src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerServer.java
rename to src/main/java/net/floodlightcontroller/packetstreamer/PacketStreamerServer.java
diff --git a/packetstreamerd/py/PythonClient.py b/src/main/python/PythonClient.py
similarity index 96%
rename from packetstreamerd/py/PythonClient.py
rename to src/main/python/PythonClient.py
index 722056bde1edd0ef22ba9f10e5730b07c5a4e049..5c9890e80a988df4dd6b62702d00674db61c3541 100644
--- a/packetstreamerd/py/PythonClient.py
+++ b/src/main/python/PythonClient.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import sys
-sys.path.append('../gen-py')
+sys.path.append('../../../target/gen-py')
from packetstreamer import PacketStreamer
from packetstreamer.ttypes import *
diff --git a/packetstreamerd/py/PythonServer.py b/src/main/python/PythonServer.py
similarity index 97%
rename from packetstreamerd/py/PythonServer.py
rename to src/main/python/PythonServer.py
index be3c529f695f09a951f6b3fad65c55ba4a3993d7..86f7d8be232f56b97cc33295ecee856d9aa9c9c7 100644
--- a/packetstreamerd/py/PythonServer.py
+++ b/src/main/python/PythonServer.py
@@ -2,7 +2,7 @@
import sys
import logging
-sys.path.append('../gen-py')
+sys.path.append('../../../target/gen-py')
from packetstreamer import PacketStreamer
from packetstreamer.ttypes import *
diff --git a/packetstreamerd/packetstreamer.thrift b/src/main/thrift/packetstreamer.thrift
similarity index 100%
rename from packetstreamerd/packetstreamer.thrift
rename to src/main/thrift/packetstreamer.thrift