Assembly moved to submodule distribution

distribution/pom.xml

+<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>
+	<name>Distribution</name>
+	
+	<packaging>pom</packaging>
+	
+	<groupId>de.sekmi.histream</groupId>
+	<artifactId>distribution</artifactId>
+	<version>0.2-alpha</version>
+
+	<parent>
+		<groupId>de.sekmi.histream</groupId>
+		<artifactId>histream</artifactId>
+		<version>0.2-alpha</version>
+	</parent>
+  
+	<dependencies>
+		<dependency>
+			<groupId>de.sekmi.histream</groupId>
+			<artifactId>histream-core</artifactId>
+			<version>0.2-alpha</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+		      <plugin>
+			<artifactId>maven-assembly-plugin</artifactId>
+			<executions>
+			  <execution>
+			    <id>distro-assembly</id>
+			    <phase>package</phase>
+			    <goals>
+			      <goal>single</goal>
+			    </goals>
+			    <configuration>
+			      <descriptors>
+				<descriptor>src/assembly/assembly.xml</descriptor>
+			      </descriptors>
+			    </configuration>
+			  </execution>
+			</executions>
+		      </plugin>
+
+		</plugins>
+	</build>
+</project>
\ No newline at end of file

histream-core/src/assembly/assembly.xml → distribution/src/assembly/assembly.xml

@@ -4,20 +4,25 @@
     <formats>
         <format>zip</format>
     </formats>
- 
-    <!-- Adds the dependencies of our application to the lib directory -->
-    <dependencySets>
-        <dependencySet>
-            <!--
-                Project artifact is not copied under library directory since
-                it is added to the root directory of the zip package.
-            -->
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-        </dependencySet>
-    </dependencySets>
- 
+  
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <moduleSets>
+    <moduleSet>
+    
+      <!-- Enable access to all projects in the current multimodule build! -->
+      <useAllReactorProjects>true</useAllReactorProjects>
+      
+      <!-- Now, select which projects to include in this module-set. -->
+      <includes>
+        <include>de.sekmi.histream:histream-i2b2</include>
+      </includes>
+      <binaries>
+        <outputDirectory>lib</outputDirectory>
+        <unpack>false</unpack>
+      </binaries>
+    </moduleSet>
+  </moduleSets>
+
     <fileSets>
         <!--
             Adds startup scripts to the root directory of zip package. The startup
@@ -32,18 +37,7 @@
             <filtered>true</filtered>
         </fileSet>
         <!--
-            Adds the jar file of our example application to the root directory
-            of the created zip package.
-        -->
-        <fileSet>
-            <directory>${project.build.directory}</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-        <!--
-            Add license files 
+            Add license files. TODO copy/create files
         -->
 	<fileSet>
 		<directory>${basedir}</directory>

distribution/src/main/scripts/startup/histream.xml

+<!--
+  #%L
+  histream
+  %%
+  Copyright (C) 2013 - 2015 R.W.Majeed
+  %%
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  #L%
+  -->
+<histream>
+	<!-- TODO named property groups, which can be shared and referenced by plugins. this will reduce duplicate properties -->
+	<plugins>
+		<!-- plugins are loaded in order of occurance -->
+		<plugin class="de.sekmi.histream.i2b2.PostgresPatientStore">
+			<property name="user">i2b2demodata</property>	
+			<property name="host">localhost</property>	
+			<property name="database">i2b2</property>	
+			<property name="port">15432</property>	
+			<property name="password"></property>	
+			<property name="project">demo</property>					
+		</plugin>
+		<plugin class="de.sekmi.histream.i2b2.PostgresVisitStore">
+			<property name="user">i2b2demodata</property>	
+			<property name="host">localhost</property>	
+			<property name="database">i2b2</property>	
+			<property name="port">15432</property>	
+			<property name="password"></property>	
+			<property name="project">demo</property>					
+		</plugin>
+		<plugin class="de.sekmi.histream.i2b2.I2b2Inserter">
+			<property name="user">i2b2demodata</property>	
+			<property name="host">localhost</property>	
+			<property name="database">i2b2</property>	
+			<property name="port">15432</property>	
+			<property name="password"></property>	
+			<property name="project">demo</property>					
+			<property name="nullProvider">LCS-I2B2:PROVIDERS</property>					
+		</plugin>
+		<plugin class="de.sekmi.histream.io.XMLProviderFactory"/>
+		<plugin class="de.sekmi.histream.io.FlatProviderFactory"/>
+		
+		<!-- 
+		<plugin class="de.sekmi.histream.i2b2.services.HiveServer">
+			<property name="user">i2b2demodata</property>
+		</plugin>
+		<plugin class="de.sekmi.histream.hl7.MLLPListener">
+			<property name="port">123</property>
+		</plugin> -->
+	</plugins>
+	<!-- Wie kann die Konfiguration benutzt werden, wenn z.B. Dateien von der Kommandozeile
+	gelesen werden sollen und dann das Programm beendet werden soll?
+	 -->
+	<!-- 
+	<source plugin="de.sekmi.histream.hl7.MLLPListener" />
+	<source plugin="de.sekmi.histream.impl.SAXObservationProvider" />
+	-->
+	<!-- TODO source umbenennen in listener (fuer netzwerkschnittstellen) -->
+	
+	<destination plugin="de.sekmi.histream.i2b2.I2b2Inserter" />
+	
+	<!-- kann dateien von Kommandozeile lesen -->
+	<filehandler  type="text/xml" plugin-ref="de.sekmi.histream.hl7.MLLPListener">
+		<url src="file://....xml" />
+	</filehandler>
+		
+</histream>

distribution/src/main/scripts/startup/startup.bat

+@ECHO OFF
+REM ${name}
+SET mydir="%~dp0"
+java -Djava.util.logging.config.file=logging.properties -cp lib\* de.sekmi.histream.impl.RunConfiguration %*

histream-core/pom.xml

@@ -27,16 +27,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<!-- Configures the used assembly descriptor -->
-					<descriptors>
-						<descriptor>src/assembly/assembly.xml</descriptor>
-					</descriptors>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>

histream-core/src/main/java/de/sekmi/histream/impl/RunConfiguration.java

@@ -131,7 +131,7 @@ public class RunConfiguration implements Closeable{
 	}
 	
 	private static final String readVersion() throws IOException{
-		InputStream inputStream = RunConfiguration.class.getClassLoader().getResourceAsStream("META-INF/maven/de.sekmi.histream/histream/pom.properties");
+		InputStream inputStream = RunConfiguration.class.getClassLoader().getResourceAsStream("META-INF/maven/de.sekmi.histream/histream-core/pom.properties");
 		Properties props = new Properties();
 		props.load(inputStream);
 		return props.getProperty("version","[unknown]");

histream-core/src/main/scripts/startup/startup.bat

-@ECHO OFF
-REM ${name}
-SET mydir="%~dp0"
-java -Djava.util.logging.config.file=logging.properties -jar ${project.build.finalName}.jar %*

pom.xml

@@ -30,6 +30,7 @@
 		<module>histream-core</module>
 		<module>HIStream-i2b2</module>
 		<module>HIStream-HL7</module>
+		<module>distribution</module>
 	</modules>
 	<build>
 		<pluginManagement>