catch up with development

16 files changed, 111 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..69898c6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,38 @@
+**/bin/
+**/target/
+**._trace
+**git.properties
+**log.properties
+**/target/
+**/.metadata/
+
+**/emf-gen/**/.gitignore
+**/src-gen/**/.gitignore
+**/git.properties
+**/*.java._trace
+**/*.log
+**/*.log.properties
+
+**/bin/
+**/build/
+*.class
+*.ctrl
+**/Debug/
+.DS_Store
+*.ear
+*.war
+
+**/*.actionbin
+**/*.blipbin
+**/*.chartbin
+**/*.cubebin
+**/*.datatypebin
+**/*.dtobin
+**/*.entitybin
+**/*.servicebin
+**/*.tablebin
+**/*.uibin
+**/*.uisemanticbin
+**/*.xtendbin
+**/*.xtextbin
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/jenkins.build.config.xml b/jenkins.build.config.xml
index a270563..bdd322c 100644
--- a/jenkins.build.config.xml
+++ b/jenkins.build.config.xml
@@ -18,6 +18,6 @@
 	<settings>${user.home}/.m2/settingsMirrors.xml</settings>
 	<!-- DO NOT EDIT BELOW THIS LINE -->
         <jenkins.build.dependencies>
-                <jenkins.build.dependency>org.eclipse.osbp.dependencies-mbp</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.releng.maven</jenkins.build.dependency>
         </jenkins.build.dependencies>
 </jenkins>
diff --git a/org.eclipse.osbp.gitinfo.feature/.gitignore b/org.eclipse.osbp.gitinfo.feature/.gitignore
new file mode 100644
index 0000000..10529f3
--- /dev/null
+++ b/org.eclipse.osbp.gitinfo.feature/.gitignore
@@ -0,0 +1,3 @@
+/target/
+!**/README.txt
+/apidocs/
diff --git a/org.eclipse.osbp.gitinfo.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.gitinfo.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.gitinfo.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.gitinfo.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.gitinfo.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.gitinfo.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.gitinfo.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.gitinfo.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.gitinfo.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.gitinfo.feature/feature.xml b/org.eclipse.osbp.gitinfo.feature/feature.xml
index 9d6d875..92c2479 100644
--- a/org.eclipse.osbp.gitinfo.feature/feature.xml
+++ b/org.eclipse.osbp.gitinfo.feature/feature.xml
@@ -14,7 +14,8 @@
       id="org.eclipse.osbp.gitinfo.feature"
       label="%featureName"
       version="0.9.0.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+	  plugin="org.eclipse.osbp.gitinfo">
 
    <description>
       %description
diff --git a/org.eclipse.osbp.gitinfo/.classpath b/org.eclipse.osbp.gitinfo/.classpath
new file mode 100644
index 0000000..cf36b56
--- /dev/null
+++ b/org.eclipse.osbp.gitinfo/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.gitinfo/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.gitinfo/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.gitinfo/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.gitinfo/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.gitinfo/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.gitinfo/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.gitinfo/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.gitinfo/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.gitinfo/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.gitinfo/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.gitinfo/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.gitinfo/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.gitinfo/pom.xml b/org.eclipse.osbp.gitinfo/pom.xml
index da774c5..acf53e3 100644
--- a/org.eclipse.osbp.gitinfo/pom.xml
+++ b/org.eclipse.osbp.gitinfo/pom.xml
@@ -26,7 +26,6 @@
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
                 <artifactId>tycho-compiler-plugin</artifactId>
-                <version>0.21.0</version>
                 <configuration>
                     <compilerVersion>1.6</compilerVersion>
                     <encoding>UTF-8</encoding>
diff --git a/org.eclipse.osbp.gitinfo/src/org/eclipse/osbp/gitinfo/Loginfo.java b/org.eclipse.osbp.gitinfo/src/org/eclipse/osbp/gitinfo/Loginfo.java
index e5458d0..93770d4 100644
--- a/org.eclipse.osbp.gitinfo/src/org/eclipse/osbp/gitinfo/Loginfo.java
+++ b/org.eclipse.osbp.gitinfo/src/org/eclipse/osbp/gitinfo/Loginfo.java
@@ -117,9 +117,17 @@ private boolean printOneLoginfo( Logger extLOGGER, String cn, ClassLoader cl, St
 			if ( !remoteurl.isEmpty() ) {
 			
 				String host = remoteurl.substring(remoteurl.indexOf('@')+1);
-				host = host.substring(0,host.indexOf('/'));
+				
+				if ( host.isEmpty() ) {
+					host = "unknownhost";
+				} else {
+					host = host.substring(0,host.indexOf('/'));
+				}
 
 				String gitrepo = remoteurl.substring(remoteurl.lastIndexOf('/')+1);
+				if ( gitrepo.isEmpty() ) {
+					gitrepo = "unknown-repo.git";
+				}
 				if ( "Development".equals(prefixInfoText) ) {
 					infoText = "last commit -> http://"+host+"/trac/changeset/"+prop.getProperty("git.commit.id")+"/"+gitrepo.substring(0,gitrepo.indexOf(".git"));
 				}
@@ -132,17 +140,17 @@ private boolean printOneLoginfo( Logger extLOGGER, String cn, ClassLoader cl, St
 			bSuccess = false;
 		}
 
-	} catch (Exception ex) { // NOSONAR
+	} catch (Exception ex) { 
 		infoText = cn + ": "+propFile+" not found, continue ...";
 		LOGGER.debug(infoText);
-		ex.printStackTrace(); // NOSONAR
+		LOGGER.error(ex.toString()); 
 		bSuccess = false;
 	} finally {
 		if (input != null) {
 			try {
 				input.close();
-			} catch (IOException e) { // NOSONAR
-				e.printStackTrace(); // NOSONAR
+			} catch (IOException e) { 
+				LOGGER.error(e.toString()); 
 			}
 		}
 	}