Commit bc132e7c authored by Lukáš Marek's avatar Lukáš Marek

Package names cleanup

parent 8c7c5667
asm.path=lib/asm-debug-all-4.0.jar asm.path=lib/asm-debug-all-4.0.jar
jborat-runtime.path=lib/jborat-runtime.jar
jborat-interface.path=lib/jborat-interface.jar
instr.jar.name=dislinstr.jar instr.jar.name=dislinstr.jar
...@@ -5,27 +5,50 @@ ...@@ -5,27 +5,50 @@
<path id="buildpath"> <path id="buildpath">
<pathelement location="${asm.path}"/> <pathelement location="${asm.path}"/>
<pathelement location="${jborat-runtime.path}"/> <pathelement location="./bin"/>
<pathelement location="${jborat-interface.path}"/>
</path> </path>
<target name="package" depends="compile"> <target name="compileTLVInserter">
<mkdir dir="build"/> <mkdir dir="bin"/>
<jar basedir="bin" destfile="build/disl-${disl.version}.jar"> <javac srcdir="src-jborat" includes="ch/usi/dag/tlvinserter/" destdir="bin" debug="true" includeAntRuntime="false">
<manifest> <classpath refid="buildpath"/>
<attribute name="Class-Path" value="${instr.jar.name}"/> </javac>
</manifest>
</jar>
</target> </target>
<target name="extendThread"/>
<target name="compile"> <target name="compile-dynamicbypass">
<mkdir dir="bin"/> <mkdir dir="bin"/>
<javac srcdir="src-dynamicbypass" destdir="bin" debug="true" includeAntRuntime="false">
<classpath refid="buildpath"/>
</javac>
</target>
<target name="compile-jborat" depends="compile-dynamicbypass">
<javac srcdir="src-jborat" destdir="bin" debug="true" includeAntRuntime="false">
<classpath refid="buildpath"/>
</javac>
</target>
<target name="compile-disl" depends="compile-jborat">
<javac srcdir="src" destdir="bin" debug="true" includeAntRuntime="false"> <javac srcdir="src" destdir="bin" debug="true" includeAntRuntime="false">
<classpath refid="buildpath"/> <classpath refid="buildpath"/>
</javac> </javac>
</target> </target>
<target name="compile" depends="compile-disl"/>
<target name="prepare-dynamicbypass-afterbootstrap"/>
<target name="package" depends="compile,prepare-dynamicbypass-afterbootstrap">
<mkdir dir="build"/>
<jar basedir="bin" destfile="build/disl-${disl.version}.jar">
<manifest>
<attribute name="Class-Path" value="${instr.jar.name}"/>
</manifest>
</jar>
</target>
<target name="clean"> <target name="clean">
<delete dir="bin"/> <delete dir="bin"/>
<delete dir="build"/> <delete dir="build"/>
......
package ch.usi.dag.dynamicbypass; package ch.usi.dag.disl.dynamicbypass;
public class DynamicBypassCheck { public class DynamicBypassCheck {
......
package ch.usi.dag.dynamicbypass; package ch.usi.dag.disl.dynamicbypass;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
......
package ch.usi.dag.dynamicbypass; package ch.usi.dag.disl.dynamicbypass;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type; import org.objectweb.asm.Type;
......
package ch.usi.dag.dynamicbypass; package ch.usi.dag.disl.dynamicbypass;
public class DynamicBypass { public class DynamicBypass {
......
package ch.usi.dag.dynamicbypass; package ch.usi.dag.disl.dynamicbypass;
public class DynamicBypassCheck { public class DynamicBypassCheck {
......
package ch.usi.dag.jborat.agent; package ch.usi.dag.dislagent;
import java.lang.instrument.Instrumentation; import java.lang.instrument.Instrumentation;
import ch.usi.dag.dynamicbypass.Bootstrap; import ch.usi.dag.disl.dynamicbypass.Bootstrap;
public class JavaAgent { public class JavaAgent {
......
...@@ -20,6 +20,7 @@ import org.objectweb.asm.tree.MethodNode; ...@@ -20,6 +20,7 @@ import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.cbloader.ClassByteLoader; import ch.usi.dag.disl.cbloader.ClassByteLoader;
import ch.usi.dag.disl.classparser.ClassParser; import ch.usi.dag.disl.classparser.ClassParser;
import ch.usi.dag.disl.dynamicbypass.CodeMerger;
import ch.usi.dag.disl.exception.DiSLException; import ch.usi.dag.disl.exception.DiSLException;
import ch.usi.dag.disl.exception.DiSLFatalException; import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.exception.DiSLIOException; import ch.usi.dag.disl.exception.DiSLIOException;
...@@ -39,9 +40,8 @@ import ch.usi.dag.disl.processor.generator.ProcMethodInstance; ...@@ -39,9 +40,8 @@ import ch.usi.dag.disl.processor.generator.ProcMethodInstance;
import ch.usi.dag.disl.snippet.Shadow; import ch.usi.dag.disl.snippet.Shadow;
import ch.usi.dag.disl.snippet.Snippet; import ch.usi.dag.disl.snippet.Snippet;
import ch.usi.dag.disl.staticcontext.generator.SCGenerator; import ch.usi.dag.disl.staticcontext.generator.SCGenerator;
import ch.usi.dag.disl.tlvinserter.TLVInserter;
import ch.usi.dag.disl.weaver.Weaver; import ch.usi.dag.disl.weaver.Weaver;
import ch.usi.dag.dynamicbypass.CodeMerger;
import ch.usi.dag.tlvinserter.TLVInserter;
// TODO javadoc comment all // TODO javadoc comment all
public class DiSL { public class DiSL {
......
...@@ -20,6 +20,7 @@ import org.objectweb.asm.tree.TryCatchBlockNode; ...@@ -20,6 +20,7 @@ import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.coderep.Code; import ch.usi.dag.disl.coderep.Code;
import ch.usi.dag.disl.coderep.UnprocessedCode; import ch.usi.dag.disl.coderep.UnprocessedCode;
import ch.usi.dag.disl.dynamicbypass.DynamicBypass;
import ch.usi.dag.disl.exception.ProcessorException; import ch.usi.dag.disl.exception.ProcessorException;
import ch.usi.dag.disl.exception.ReflectionException; import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.exception.StaticContextGenException; import ch.usi.dag.disl.exception.StaticContextGenException;
...@@ -30,7 +31,6 @@ import ch.usi.dag.disl.processor.Proc; ...@@ -30,7 +31,6 @@ import ch.usi.dag.disl.processor.Proc;
import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext; import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode; import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
import ch.usi.dag.disl.util.AsmHelper; import ch.usi.dag.disl.util.AsmHelper;
import ch.usi.dag.dynamicbypass.DynamicBypass;
public class SnippetUnprocessedCode extends UnprocessedCode { public class SnippetUnprocessedCode extends UnprocessedCode {
......
package ch.usi.dag.tlvinserter; package ch.usi.dag.disl.tlvinserter;
import java.util.Set; import java.util.Set;
......
package ch.usi.dag.jborat.server; package ch.usi.dag.dislserver;
public class ClassAsBytes { public class ClassAsBytes {
......
package ch.usi.dag.jborat.server; package ch.usi.dag.dislserver;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
......
package ch.usi.dag.jborat.server; package ch.usi.dag.dislserver;
public class JboratException extends Exception { public class JboratException extends Exception {
......
package ch.usi.dag.jborat.server; package ch.usi.dag.dislserver;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
......
package ch.usi.dag.jborat.server; package ch.usi.dag.dislserver;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
......
Markdown is supported
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