You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/04/10 15:02:54 UTC
git commit: fixed deprecation warnings in refpack plugin nicer
logging output for tests
Updated Branches:
refs/heads/master cedec3d21 -> 64cb4003b
fixed deprecation warnings in refpack plugin
nicer logging output for tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/64cb4003
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/64cb4003
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/64cb4003
Branch: refs/heads/master
Commit: 64cb4003b3591458f929afe46e1c9e1c184103d6
Parents: cedec3d
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Wed Apr 10 15:02:49 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Wed Apr 10 15:02:49 2013 +0200
----------------------------------------------------------------------
.../maven/plugins/refpack/RefPackMojo.java | 19 +++--------
.../kiwi-reasoner/src/test/resources/logback.xml | 27 ---------------
.../kiwi-versioning/src/test/resources/logback.xml | 27 ---------------
.../src/test/resources/logback.xml | 27 +++++++++++++++
.../ldpath-core/src/test/resources/logback.xml | 2 +-
.../src/test/resources/logback.xml | 2 +-
.../src/test/resources/logback.xml | 2 +-
.../src/test/resources/logback.xml | 2 +-
.../src/test/resources/logback.xml | 2 +-
.../src/test/resources/logback.xml | 2 +-
.../src/test/resources/logback.xml | 2 +-
.../src/test/resources/logback.xml | 6 ++--
12 files changed, 42 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/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 91779ad..b898ec6 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
@@ -31,6 +31,7 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
@@ -64,27 +65,19 @@ public class RefPackMojo extends AbstractMojo {
/**
* Location of the file.
- * @parameter expression="${project.build.directory}"
- * @required
*/
+ @Parameter(property="project.build.directory", required = true)
private File outputDirectory;
- /**
- * @parameter default-value="${project}"
- * @required
- * @readonly
- */
+ @Parameter(property = "project", required = true, readonly = true)
private MavenProject project;
/**
* The Group Identifier of the artifacts that should be considered local modules. When walking
* 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="org.apache.marmotta"
- * @required
- * @readonly
*/
+ @Parameter(property="refpack.moduleGroupId", defaultValue="org.apache.marmotta", required = true, readonly = true)
private String moduleGroupId;
/**
@@ -121,10 +114,8 @@ public class RefPackMojo extends AbstractMojo {
/**
* The required modules of the refpack
- *
- * @parameter expression="${refpack.requiredModules}"
- * @readonly
*/
+ @Parameter(property = "refpack.requiredModules", readonly = true)
private List<String> requiredModules;
// we collect here the library dependencies of each module, so we can identify which of the dependencies are already
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/libraries/kiwi/kiwi-reasoner/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/test/resources/logback.xml b/libraries/kiwi/kiwi-reasoner/src/test/resources/logback.xml
deleted file mode 100644
index 1bfecff..0000000
--- a/libraries/kiwi/kiwi-reasoner/src/test/resources/logback.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You 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.
- -->
-
-<configuration>
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
- </encoder>
- </appender>
- <root level="${root-level:-INFO}">
- <appender-ref ref="CONSOLE"/>
- </root>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/libraries/kiwi/kiwi-versioning/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/test/resources/logback.xml b/libraries/kiwi/kiwi-versioning/src/test/resources/logback.xml
deleted file mode 100644
index 1bfecff..0000000
--- a/libraries/kiwi/kiwi-versioning/src/test/resources/logback.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You 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.
- -->
-
-<configuration>
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
- </encoder>
- </appender>
- <root level="${root-level:-INFO}">
- <appender-ref ref="CONSOLE"/>
- </root>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/libraries/ldpath/ldpath-backend-file/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/src/test/resources/logback.xml b/libraries/ldpath/ldpath-backend-file/src/test/resources/logback.xml
new file mode 100644
index 0000000..1bfecff
--- /dev/null
+++ b/libraries/ldpath/ldpath-backend-file/src/test/resources/logback.xml
@@ -0,0 +1,27 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You 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.
+ -->
+
+<configuration>
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ </encoder>
+ </appender>
+ <root level="${root-level:-INFO}">
+ <appender-ref ref="CONSOLE"/>
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/libraries/ldpath/ldpath-core/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/resources/logback.xml b/libraries/ldpath/ldpath-core/src/test/resources/logback.xml
index dffe641..1bfecff 100644
--- a/libraries/ldpath/ldpath-core/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-core/src/test/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %level %logger - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/libraries/ldpath/ldpath-functions-collections/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-collections/src/test/resources/logback.xml
index dffe641..1bfecff 100644
--- a/libraries/ldpath/ldpath-functions-collections/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-collections/src/test/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %level %logger - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/libraries/ldpath/ldpath-functions-date/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-date/src/test/resources/logback.xml
index dffe641..1bfecff 100644
--- a/libraries/ldpath/ldpath-functions-date/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-date/src/test/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %level %logger - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/libraries/ldpath/ldpath-functions-html/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-html/src/test/resources/logback.xml
index dffe641..1bfecff 100644
--- a/libraries/ldpath/ldpath-functions-html/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-html/src/test/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %level %logger - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/libraries/ldpath/ldpath-functions-math/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-math/src/test/resources/logback.xml
index dffe641..1bfecff 100644
--- a/libraries/ldpath/ldpath-functions-math/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-math/src/test/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %level %logger - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/libraries/ldpath/ldpath-functions-text/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-text/src/test/resources/logback.xml
index dffe641..1bfecff 100644
--- a/libraries/ldpath/ldpath-functions-text/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-text/src/test/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %level %logger - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/libraries/ldpath/ldpath-functions-xml/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-xml/src/test/resources/logback.xml
index dffe641..1bfecff 100644
--- a/libraries/ldpath/ldpath-functions-xml/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-xml/src/test/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %level %logger - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/64cb4003/libraries/ldpath/ldpath-template-linkeddata/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/src/test/resources/logback.xml b/libraries/ldpath/ldpath-template-linkeddata/src/test/resources/logback.xml
index 5b0617d..1bfecff 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/src/test/resources/logback.xml
@@ -17,9 +17,9 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>%d [%thread] %level %logger - %m%n</Pattern>
- </layout>
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ </encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>