Skip to content
Snippets Groups Projects
Commit ac6e54f3 authored by Rob Adams's avatar Rob Adams
Browse files

Move packetstreamer classes into main source directory. Make all generated... 

Move packetstreamer classes into main source directory.  Make all generated files in target directory
parent 93030da5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 59 additions and 189 deletions
.gitignore 0 → 100644
+ 6
− 0
View file @ ac6e54f3
*~
.classpath
.project
.settings
target
thrift
build.xml
+ 53
− 34
View file @ ac6e54f3
......@@ -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}"/>
......
packetstreamerd/java/JavaClient deleted 100755 → 0
+ 0
− 4
View file @ 93030da5
#!/bin/sh
set -ex
java -Dlog4j.debug -Dlog4j.configuration=log4j.properties -cp ../target/packetstreamer.jar net.floodlightcontroller.packetstreamer.PacketStreamerClient
packetstreamerd/java/JavaServer deleted 100755 → 0
+ 0
− 5
View file @ 93030da5
#!/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
packetstreamerd/java/build.xml deleted 100644 → 0
+ 0
− 92
View file @ 93030da5
<?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>
packetstreamerd/java/log4j.properties deleted 100644 → 0
+ 0
− 6
View file @ 93030da5
# 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
packetstreamerd/java/setup-eclipse.sh deleted 100755 → 0
+ 0
− 47
View file @ 93030da5
#!/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
packetstreamerd/lib/ch.qos.logback.classic_0.9.20.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
packetstreamerd/lib/ch.qos.logback.core_0.9.20.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
packetstreamerd/lib/jackson-core-asl_1.8.1.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
packetstreamerd/lib/jackson-mapper-asl_1.8.1.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
packetstreamerd/lib/junit-4.8.2.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
packetstreamerd/lib/org.easymock_2.5.2.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
packetstreamerd/lib/org.restlet-2.1m7.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
packetstreamerd/lib/org.restlet.ext.jackson-2.1m7.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
packetstreamerd/lib/org.restlet.ext.simple-2.1m7.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
packetstreamerd/lib/org.restlet.ext.slf4j-2.1m7.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
packetstreamerd/lib/simple-4.1.21.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
packetstreamerd/lib/slf4j.api_1.5.11.jar deleted 100644 → 0
+ 0
− 0
View file @ 93030da5
File deleted
setup-eclipse.sh
+ 0
− 1
View file @ ac6e54f3
......@@ -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=":"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment