From a79ca128a5a32656bee04df074b968bbe8f6d2db Mon Sep 17 00:00:00 2001
From: Simon Ebner <simon.ebner@psi.ch>
Date: Wed, 25 Sep 2013 09:45:28 +0200
Subject: [PATCH] Renamed project and package structure

---
 ch.psi.imagej.zeromq/.project                         |  2 +-
 ch.psi.imagej.zeromq/pom.xml                          | 11 +++--------
 .../psi/{imagej/zeromq => zmq/imagej}/HeaderInfo.java |  2 +-
 .../{imagej/zeromq => zmq/imagej}/ZeroMQViewer.java   |  2 +-
 .../src/main/resources/plugins.config                 |  2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)
 rename ch.psi.imagej.zeromq/src/main/java/ch/psi/{imagej/zeromq => zmq/imagej}/HeaderInfo.java (98%)
 rename ch.psi.imagej.zeromq/src/main/java/ch/psi/{imagej/zeromq => zmq/imagej}/ZeroMQViewer.java (99%)

diff --git a/ch.psi.imagej.zeromq/.project b/ch.psi.imagej.zeromq/.project
index 09b1d63..9a4f2f6 100644
--- a/ch.psi.imagej.zeromq/.project
+++ b/ch.psi.imagej.zeromq/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ch.psi.imagej.zeromq</name>
+	<name>ch.psi.zmq.imagej</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/ch.psi.imagej.zeromq/pom.xml b/ch.psi.imagej.zeromq/pom.xml
index 737e61c..4274405 100644
--- a/ch.psi.imagej.zeromq/pom.xml
+++ b/ch.psi.imagej.zeromq/pom.xml
@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>ch.psi</groupId>
-	<artifactId>ch.psi.imagej.zeromq</artifactId>
-	<version>0.0.8</version>
+	<groupId>ch.psi.zmq</groupId>
+	<artifactId>ch.psi.zmq.imagej</artifactId>
+	<version>0.1.0</version>
 
 	<dependencies>
 		<dependency>
@@ -11,11 +11,6 @@
 			<artifactId>jeromq</artifactId>
 			<version>0.2.0</version>
 		</dependency>
-		<!-- <dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20090211</version>
-		</dependency> -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
diff --git a/ch.psi.imagej.zeromq/src/main/java/ch/psi/imagej/zeromq/HeaderInfo.java b/ch.psi.imagej.zeromq/src/main/java/ch/psi/zmq/imagej/HeaderInfo.java
similarity index 98%
rename from ch.psi.imagej.zeromq/src/main/java/ch/psi/imagej/zeromq/HeaderInfo.java
rename to ch.psi.imagej.zeromq/src/main/java/ch/psi/zmq/imagej/HeaderInfo.java
index 1d7d80a..79ce51e 100644
--- a/ch.psi.imagej.zeromq/src/main/java/ch/psi/imagej/zeromq/HeaderInfo.java
+++ b/ch.psi.imagej.zeromq/src/main/java/ch/psi/zmq/imagej/HeaderInfo.java
@@ -16,7 +16,7 @@
  * along with this code. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package ch.psi.imagej.zeromq;
+package ch.psi.zmq.imagej;
 
 import javax.swing.JFrame;
 import javax.swing.JLabel;
diff --git a/ch.psi.imagej.zeromq/src/main/java/ch/psi/imagej/zeromq/ZeroMQViewer.java b/ch.psi.imagej.zeromq/src/main/java/ch/psi/zmq/imagej/ZeroMQViewer.java
similarity index 99%
rename from ch.psi.imagej.zeromq/src/main/java/ch/psi/imagej/zeromq/ZeroMQViewer.java
rename to ch.psi.imagej.zeromq/src/main/java/ch/psi/zmq/imagej/ZeroMQViewer.java
index 0e1ce7f..e8bbd75 100644
--- a/ch.psi.imagej.zeromq/src/main/java/ch/psi/imagej/zeromq/ZeroMQViewer.java
+++ b/ch.psi.imagej.zeromq/src/main/java/ch/psi/zmq/imagej/ZeroMQViewer.java
@@ -1,4 +1,4 @@
-package ch.psi.imagej.zeromq;
+package ch.psi.zmq.imagej;
 
 // EPICS_AD_Viewer.java
 // Original authors
diff --git a/ch.psi.imagej.zeromq/src/main/resources/plugins.config b/ch.psi.imagej.zeromq/src/main/resources/plugins.config
index aea6427..f0698ad 100644
--- a/ch.psi.imagej.zeromq/src/main/resources/plugins.config
+++ b/ch.psi.imagej.zeromq/src/main/resources/plugins.config
@@ -1 +1 @@
-Plugins, "ZeroMQ Viewer", ch.psi.imagej.zeromq.ZeroMQViewer
+Plugins, "ZeroMQ Viewer", ch.psi.zmq.imagej.ZeroMQViewer