You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/02/26 16:40:08 UTC
[1/3] git commit: MARMOTTA-107: removed some more references to LMF
MARMOTTA-107: removed some more references to LMF
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/50eca163
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/50eca163
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/50eca163
Branch: refs/heads/master
Commit: 50eca16388f0027015f92aa90fd36c02ef88852a
Parents: 57f1c08
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Feb 26 16:01:28 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Feb 26 16:01:28 2013 +0100
----------------------------------------------------------------------
.../src/main/resources/logback.xml | 9 +---
.../maven/plugins/buildinfo/BuildInfoMojo.java | 39 ++++++++------
...ewmedialab.maven.plugins.buildinfo.InfoProvider | 3 -
...e.marmotta.maven.plugins.buildinfo.InfoProvider | 3 +
build/plugins/pom.xml | 2 +-
.../maven/plugins/refpack/RefPackMojo.java | 2 +-
6 files changed, 28 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/50eca163/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
index b314d9e..c14307f 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
@@ -46,19 +46,12 @@
</encoder>
</appender>
+ <logger name="org.apache.marmotta" level="WARN" />
<logger name="org.apache.marmotta.platform.core" level="INFO" />
<logger name="org.apache.marmotta.platform.reasoner" level="INFO" />
- <logger name="at.newmedialab.sn" level="TRACE" />
-
- <logger name="kiwi.social" level="TRACE" />
-
<logger name="org.hibernate" level="WARN" />
- <!--
- <logger name="org.hibernate.SQL" level="DEBUG" />
- <logger name="org.hibernate.pretty" level="DEBUG" />
- -->
<logger name="org.apache.solr" level="WARN" />
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/50eca163/build/plugins/buildinfo-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/buildinfo/BuildInfoMojo.java
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/buildinfo/BuildInfoMojo.java b/build/plugins/buildinfo-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/buildinfo/BuildInfoMojo.java
index dc7ad9a..39cf39e 100644
--- a/build/plugins/buildinfo-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/buildinfo/BuildInfoMojo.java
+++ b/build/plugins/buildinfo-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/buildinfo/BuildInfoMojo.java
@@ -15,14 +15,12 @@
*/
package org.apache.marmotta.maven.plugins.buildinfo;
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.model.Build;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -30,6 +28,13 @@ import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.model.Build;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+
/**
* Date: 13.05.2011
* Time: 12:00:00
@@ -51,14 +56,14 @@ public class BuildInfoMojo extends AbstractMojo {
private MavenProject project;
- private static Map<String,String> lmfCommiters = new HashMap<String, String>();
+ private static Map<String,String> marmottaCommiters = new HashMap<String, String>();
static {
- lmfCommiters.put("sschaffe", "Sebastian Schaffert <se...@salzburgresearch.at>");
- lmfCommiters.put("tkurz", "Thomas Kurz <th...@salzburgresearch.at>");
- lmfCommiters.put("dglachs", "Dietmar Glachs <di...@salzburgresearch.at>");
- lmfCommiters.put("jfrank", "Jakob Frank <ja...@salzburgresearch.at>");
- lmfCommiters.put("jakob","Jakob Frank <ja...@salzburgresearch.at>");
- lmfCommiters.put("sfernandez","Sergio Fernández <se...@salzburgresearch.at>");
+ marmottaCommiters.put("sschaffe", "Sebastian Schaffert <wa...@apache.org>");
+ marmottaCommiters.put("tkurz", "Thomas Kurz <tk...@apache.org>");
+ marmottaCommiters.put("dglachs", "Dietmar Glachs <dg...@apache.org>");
+ marmottaCommiters.put("jfrank", "Jakob Frank <ja...@apache.org>");
+ marmottaCommiters.put("jakob", "Jakob Frank <ja...@apache.org>");
+ marmottaCommiters.put("sfernandez","Sergio Fernández <wi...@apache.org>");
}
@@ -92,8 +97,8 @@ public class BuildInfoMojo extends AbstractMojo {
}
// user name
- if(lmfCommiters.get(System.getProperty("user.name")) != null) {
- map.put("build.user", lmfCommiters.get(System.getProperty("user.name")));
+ if(marmottaCommiters.get(System.getProperty("user.name")) != null) {
+ map.put("build.user", marmottaCommiters.get(System.getProperty("user.name")));
} else {
map.put("build.user", System.getProperty("user.name"));
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/50eca163/build/plugins/buildinfo-maven-plugin/src/main/resources/META-INF/services/at.newmedialab.maven.plugins.buildinfo.InfoProvider
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/src/main/resources/META-INF/services/at.newmedialab.maven.plugins.buildinfo.InfoProvider b/build/plugins/buildinfo-maven-plugin/src/main/resources/META-INF/services/at.newmedialab.maven.plugins.buildinfo.InfoProvider
deleted file mode 100644
index 35bf232..0000000
--- a/build/plugins/buildinfo-maven-plugin/src/main/resources/META-INF/services/at.newmedialab.maven.plugins.buildinfo.InfoProvider
+++ /dev/null
@@ -1,3 +0,0 @@
-at.newmedialab.maven.plugins.buildinfo.ProjectInfoProvider
-at.newmedialab.maven.plugins.buildinfo.MercurialInfoProvider
-at.newmedialab.maven.plugins.buildinfo.GitInfoProvider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/50eca163/build/plugins/buildinfo-maven-plugin/src/main/resources/META-INF/services/org.apache.marmotta.maven.plugins.buildinfo.InfoProvider
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/src/main/resources/META-INF/services/org.apache.marmotta.maven.plugins.buildinfo.InfoProvider b/build/plugins/buildinfo-maven-plugin/src/main/resources/META-INF/services/org.apache.marmotta.maven.plugins.buildinfo.InfoProvider
new file mode 100644
index 0000000..838ac27
--- /dev/null
+++ b/build/plugins/buildinfo-maven-plugin/src/main/resources/META-INF/services/org.apache.marmotta.maven.plugins.buildinfo.InfoProvider
@@ -0,0 +1,3 @@
+org.apache.marmotta.maven.plugins.buildinfo.ProjectInfoProvider
+org.apache.marmotta.maven.plugins.buildinfo.MercurialInfoProvider
+org.apache.marmotta.maven.plugins.buildinfo.GitInfoProvider
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/50eca163/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index b31c910..f104b2e 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -21,7 +21,7 @@
<packaging>pom</packaging>
<name>Apache Marmotta: Maven Plugins</name>
- <description>LMF-specific maven plugins</description>
+ <description>Marmotta-specific maven plugins</description>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/50eca163/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java b/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
index 3864c27..5e5ef56 100644
--- a/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
+++ b/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
@@ -79,7 +79,7 @@ public class RefPackMojo extends AbstractMojo {
* the dependency tree, the process will break at each module of this group id and instead add
* a dependency to the other module to the refpacks.
*
- * @parameter expression="${refpack.moduleGroupId}" default-value="at.newmedialab.lmf"
+ * @parameter expression="${refpack.moduleGroupId}" default-value="org.apache.marmotta"
* @required
* @readonly
*/