Merge branch 'development' into occupancy

Author: baltzell

Makefile

@@ -0,0 +1,24 @@
+# this is a simple Makefile meant for developers' convenience
+# - it only has the most common build commands we use
+# - for any other build command, please use `./build-coatjava.sh`
+
+# convert `make` arg `-j#` -> `mvn` arg `-T#`, if provided
+JOBS := $(patsubst -j%,%,$(filter -j%,$(MAKEFLAGS)))
+THREADS := $(if $(strip $(JOBS)),-T$(JOBS),)
+
+BUILD := ./build-coatjava.sh
+
+.PHONY: default all clean clara
+
+.DEFAULT_GOAL := default
+
+default:
+	$(BUILD) $(THREADS)
+
+clean:
+	$(BUILD) --clean $(THREADS)
+
+clara:
+	$(BUILD) --clara $(THREADS)
+
+all: clara

common-tools/clas-reco/pom.xml

@@ -36,12 +36,6 @@
       <classifier>jar-with-dependencies</classifier>
     </dependency>
 
-    <dependency>
-      <groupId>org.jlab.coda</groupId>
-      <artifactId>jtools</artifactId>
-      <version>2.2</version>
-    </dependency>
-
     <dependency>
       <groupId>cnuphys</groupId>
       <artifactId>magfield</artifactId>

common-tools/clas-reco/src/main/java/org/jlab/clas/reco/Clas12Types.java

@@ -5,8 +5,6 @@
 import org.jlab.clara.base.error.ClaraException;
 import org.jlab.clara.engine.ClaraSerializer;
 import org.jlab.clara.engine.EngineDataType;
-import org.jlab.clas12.tools.MimeType;
-import org.jlab.clas12.tools.property.JPropertyList;
 import org.jlab.jnp.hipo4.data.Event;
 
 
@@ -30,22 +28,9 @@ public Object read(ByteBuffer buffer) throws ClaraException {
         }
     }
 
-	public static final EngineDataType EVIO = new EngineDataType(MimeType.EVIO.type(), EngineDataType.BYTES.serializer());
+	public static final EngineDataType EVIO = new EngineDataType("binary/data-evio", EngineDataType.BYTES.serializer());
 
         public static final EngineDataType HIPO =
                     new EngineDataType("binary/data-hipo", new HipoSerializer());
 
-	public static final EngineDataType PROPERTY_LIST = new EngineDataType(MimeType.PROPERTY_LIST.type(), new ClaraSerializer() {
-
-                @Override
-		public ByteBuffer write(Object data) throws ClaraException {
-			JPropertyList pl = (JPropertyList) data;
-			return ByteBuffer.wrap(pl.getStringRepresentation(true).getBytes());
-		}
-
-                @Override
-		public Object read(ByteBuffer buffer) throws ClaraException {
-			return new JPropertyList(new String(buffer.array()));
-		}
-	});
 }