Reorganizing repo

jnonino-research · Jun 27, 2016 · c59f9c8 · c59f9c8
1 parent d477221
commit c59f9c8
Show file tree

Hide file tree

Showing 53 changed files with 1 addition and 1 deletion.
diff --git a/trabajo/codigo/docker/README.md → trabajo/docker_images/README.md b/trabajo/codigo/docker/README.md → trabajo/docker_images/README.md
diff --git a/trabajo/codigo/docker/cluster-alpine.yml → trabajo/docker_images/cluster-alpine.yml b/trabajo/codigo/docker/cluster-alpine.yml → trabajo/docker_images/cluster-alpine.yml
diff --git a/trabajo/codigo/docker/cluster.yml → trabajo/docker_images/cluster.yml b/trabajo/codigo/docker/cluster.yml → trabajo/docker_images/cluster.yml
diff --git a/trabajo/codigo/docker/comandos.txt → trabajo/docker_images/comandos.txt b/trabajo/codigo/docker/comandos.txt → trabajo/docker_images/comandos.txt
diff --git a/trabajo/codigo/docker-compose-flink.yml → ...jo/docker_images/docker-compose-flink.yml b/trabajo/codigo/docker-compose-flink.yml → ...jo/docker_images/docker-compose-flink.yml
diff --git a/trabajo/codigo/docker-compose-spark.yml → ...jo/docker_images/docker-compose-spark.yml b/trabajo/codigo/docker-compose-spark.yml → ...jo/docker_images/docker-compose-spark.yml
diff --git a/trabajo/codigo/docker-compose-storm.yml → ...jo/docker_images/docker-compose-storm.yml b/trabajo/codigo/docker-compose-storm.yml → ...jo/docker_images/docker-compose-storm.yml
diff --git a/trabajo/codigo/kafka-storm.yml → trabajo/docker_images/kafka-storm.yml b/trabajo/codigo/kafka-storm.yml → trabajo/docker_images/kafka-storm.yml
diff --git a/trabajo/codigo/docker/kafka/Dockerfile → trabajo/docker_images/kafka/Dockerfile b/trabajo/codigo/docker/kafka/Dockerfile → trabajo/docker_images/kafka/Dockerfile
diff --git a/trabajo/codigo/docker/kafka/start.sh → trabajo/docker_images/kafka/start.sh b/trabajo/codigo/docker/kafka/start.sh → trabajo/docker_images/kafka/start.sh
diff --git a/trabajo/codigo/docker/storm-base/Dockerfile → trabajo/docker_images/storm-base/Dockerfile b/trabajo/codigo/docker/storm-base/Dockerfile → trabajo/docker_images/storm-base/Dockerfile
diff --git a/trabajo/codigo/docker/storm-base/cluster.xml → trabajo/docker_images/storm-base/cluster.xml b/trabajo/codigo/docker/storm-base/cluster.xml → trabajo/docker_images/storm-base/cluster.xml
diff --git a/...o/docker/storm-base/config-supervisord.sh → ...r_images/storm-base/config-supervisord.sh b/...o/docker/storm-base/config-supervisord.sh → ...r_images/storm-base/config-supervisord.sh
diff --git a/...igo/docker/storm-base/start-supervisor.sh → ...ker_images/storm-base/start-supervisor.sh b/...igo/docker/storm-base/start-supervisor.sh → ...ker_images/storm-base/start-supervisor.sh
diff --git a/trabajo/codigo/docker/storm-base/storm.yaml → trabajo/docker_images/storm-base/storm.yaml b/trabajo/codigo/docker/storm-base/storm.yaml → trabajo/docker_images/storm-base/storm.yaml
diff --git a/...ajo/codigo/docker/storm-nimbus/Dockerfile → ...ajo/docker_images/storm-nimbus/Dockerfile b/...ajo/codigo/docker/storm-nimbus/Dockerfile → ...ajo/docker_images/storm-nimbus/Dockerfile
diff --git a/...codigo/docker/storm-supervisor/Dockerfile → ...docker_images/storm-supervisor/Dockerfile b/...codigo/docker/storm-supervisor/Dockerfile → ...docker_images/storm-supervisor/Dockerfile
diff --git a/trabajo/codigo/docker/storm-ui/Dockerfile → trabajo/docker_images/storm-ui/Dockerfile b/trabajo/codigo/docker/storm-ui/Dockerfile → trabajo/docker_images/storm-ui/Dockerfile
diff --git a/trabajo/codigo/docker/ubuntu-base/Dockerfile → trabajo/docker_images/ubuntu-base/Dockerfile b/trabajo/codigo/docker/ubuntu-base/Dockerfile → trabajo/docker_images/ubuntu-base/Dockerfile
diff --git a/...codigo/docker/zookeeper-alpine/Dockerfile → ...docker_images/zookeeper-alpine/Dockerfile b/...codigo/docker/zookeeper-alpine/Dockerfile → ...docker_images/zookeeper-alpine/Dockerfile
diff --git a/...o/codigo/docker/zookeeper-alpine/start.sh → ...o/docker_images/zookeeper-alpine/start.sh b/...o/codigo/docker/zookeeper-alpine/start.sh → ...o/docker_images/zookeeper-alpine/start.sh
diff --git a/trabajo/codigo/docker/zookeeper/Dockerfile → trabajo/docker_images/zookeeper/Dockerfile b/trabajo/codigo/docker/zookeeper/Dockerfile → trabajo/docker_images/zookeeper/Dockerfile
diff --git a/trabajo/codigo/docker/zookeeper/start.sh → trabajo/docker_images/zookeeper/start.sh b/trabajo/codigo/docker/zookeeper/start.sh → trabajo/docker_images/zookeeper/start.sh
diff --git a/trabajo/informe/portada/portada.tex b/trabajo/informe/portada/portada.tex
@@ -53,7 +53,7 @@
 
 		\begin{figure}[H]
 			\centering
-			\includegraphics[width=.10\linewidth]{./portada/logo_utn}
+			\includegraphics[width=.10\linewidth]{./informe/portada/logo_utn}
 		\end{figure}	
 
 

diff --git a/trabajo/codigo/build-tools/pom.xml → trabajo/software/build-tools/pom.xml b/trabajo/codigo/build-tools/pom.xml → trabajo/software/build-tools/pom.xml
diff --git a/trabajo/codigo/commons/pom.xml → trabajo/software/commons/pom.xml b/trabajo/codigo/commons/pom.xml → trabajo/software/commons/pom.xml
diff --git a/...tn/frc/posgrado/jnonino/MetricRecord.java → ...tn/frc/posgrado/jnonino/MetricRecord.java b/...tn/frc/posgrado/jnonino/MetricRecord.java → ...tn/frc/posgrado/jnonino/MetricRecord.java
diff --git a/trabajo/codigo/flink/pom.xml → trabajo/software/flink/pom.xml b/trabajo/codigo/flink/pom.xml → trabajo/software/flink/pom.xml
diff --git a/...ar/edu/utn/frc/posgrado/jnonino/Main.java → ...ar/edu/utn/frc/posgrado/jnonino/Main.java b/...ar/edu/utn/frc/posgrado/jnonino/Main.java → ...ar/edu/utn/frc/posgrado/jnonino/Main.java
diff --git a/...frc/posgrado/jnonino/MetricsConsumer.java → ...frc/posgrado/jnonino/MetricsConsumer.java b/...frc/posgrado/jnonino/MetricsConsumer.java → ...frc/posgrado/jnonino/MetricsConsumer.java
diff --git a/...odigo/flink/src/main/resources/log4j2.xml → ...tware/flink/src/main/resources/log4j2.xml b/...odigo/flink/src/main/resources/log4j2.xml → ...tware/flink/src/main/resources/log4j2.xml
diff --git a/...digo/flink/src/main/resources/numbers.txt → ...ware/flink/src/main/resources/numbers.txt b/...digo/flink/src/main/resources/numbers.txt → ...ware/flink/src/main/resources/numbers.txt
diff --git a/...jo/codigo/flink/src/test/java/PLACEHOLDER → .../software/flink/src/test/java/PLACEHOLDER b/...jo/codigo/flink/src/test/java/PLACEHOLDER → .../software/flink/src/test/java/PLACEHOLDER
diff --git a/...digo/flink/src/test/resources/PLACEHOLDER → ...ware/flink/src/test/resources/PLACEHOLDER b/...digo/flink/src/test/resources/PLACEHOLDER → ...ware/flink/src/test/resources/PLACEHOLDER
diff --git a/trabajo/codigo/kafka/Dockerfile → trabajo/software/kafka/Dockerfile b/trabajo/codigo/kafka/Dockerfile → trabajo/software/kafka/Dockerfile
diff --git a/trabajo/codigo/kafka/pom.xml → trabajo/software/kafka/pom.xml b/trabajo/codigo/kafka/pom.xml → trabajo/software/kafka/pom.xml
diff --git a/...tn/frc/posgrado/jnonino/DataConsumer.java → ...tn/frc/posgrado/jnonino/DataConsumer.java b/...tn/frc/posgrado/jnonino/DataConsumer.java → ...tn/frc/posgrado/jnonino/DataConsumer.java
diff --git a/...tn/frc/posgrado/jnonino/DataProducer.java → ...tn/frc/posgrado/jnonino/DataProducer.java b/...tn/frc/posgrado/jnonino/DataProducer.java → ...tn/frc/posgrado/jnonino/DataProducer.java
diff --git a/...ar/edu/utn/frc/posgrado/jnonino/Main.java → ...ar/edu/utn/frc/posgrado/jnonino/Main.java b/...ar/edu/utn/frc/posgrado/jnonino/Main.java → ...ar/edu/utn/frc/posgrado/jnonino/Main.java
diff --git a/...odigo/kafka/src/main/resources/log4j2.xml → ...tware/kafka/src/main/resources/log4j2.xml b/...odigo/kafka/src/main/resources/log4j2.xml → ...tware/kafka/src/main/resources/log4j2.xml
diff --git a/.../edu/utn/frc/posgrado/jnonino/PLACEHOLDER → .../edu/utn/frc/posgrado/jnonino/PLACEHOLDER b/.../edu/utn/frc/posgrado/jnonino/PLACEHOLDER → .../edu/utn/frc/posgrado/jnonino/PLACEHOLDER
diff --git a/...digo/kafka/src/test/resources/PLACEHOLDER → ...ware/kafka/src/test/resources/PLACEHOLDER b/...digo/kafka/src/test/resources/PLACEHOLDER → ...ware/kafka/src/test/resources/PLACEHOLDER
diff --git a/trabajo/codigo/pom.xml → trabajo/software/pom.xml b/trabajo/codigo/pom.xml → trabajo/software/pom.xml
diff --git a/trabajo/codigo/spark/pom.xml → trabajo/software/spark/pom.xml b/trabajo/codigo/spark/pom.xml → trabajo/software/spark/pom.xml
diff --git a/...ar/edu/utn/frc/posgrado/jnonino/Main.java → ...ar/edu/utn/frc/posgrado/jnonino/Main.java b/...ar/edu/utn/frc/posgrado/jnonino/Main.java → ...ar/edu/utn/frc/posgrado/jnonino/Main.java
diff --git a/...digo/spark/src/main/resources/PLACEHOLDER → ...ware/spark/src/main/resources/PLACEHOLDER b/...digo/spark/src/main/resources/PLACEHOLDER → ...ware/spark/src/main/resources/PLACEHOLDER
diff --git a/...jo/codigo/spark/src/test/java/PLACEHOLDER → .../software/spark/src/test/java/PLACEHOLDER b/...jo/codigo/spark/src/test/java/PLACEHOLDER → .../software/spark/src/test/java/PLACEHOLDER
diff --git a/...digo/spark/src/test/resources/PLACEHOLDER → ...ware/spark/src/test/resources/PLACEHOLDER b/...digo/spark/src/test/resources/PLACEHOLDER → ...ware/spark/src/test/resources/PLACEHOLDER
diff --git a/trabajo/codigo/storm/pom.xml → trabajo/software/storm/pom.xml b/trabajo/codigo/storm/pom.xml → trabajo/software/storm/pom.xml
diff --git a/...ar/edu/utn/frc/posgrado/jnonino/Main.java → ...ar/edu/utn/frc/posgrado/jnonino/Main.java b/...ar/edu/utn/frc/posgrado/jnonino/Main.java → ...ar/edu/utn/frc/posgrado/jnonino/Main.java
diff --git a/...digo/storm/src/main/resources/PLACEHOLDER → ...ware/storm/src/main/resources/PLACEHOLDER b/...digo/storm/src/main/resources/PLACEHOLDER → ...ware/storm/src/main/resources/PLACEHOLDER
diff --git a/...jo/codigo/storm/src/test/java/PLACEHOLDER → .../software/storm/src/test/java/PLACEHOLDER b/...jo/codigo/storm/src/test/java/PLACEHOLDER → .../software/storm/src/test/java/PLACEHOLDER
diff --git a/...digo/storm/src/test/resources/PLACEHOLDER → ...ware/storm/src/test/resources/PLACEHOLDER b/...digo/storm/src/test/resources/PLACEHOLDER → ...ware/storm/src/test/resources/PLACEHOLDER