Author: veithen
Date: Thu Jan 5 10:43:59 2012
New Revision: 1227548
URL: http://svn.apache.org/viewvc?rev=1227548&view=rev
Log:
Maven plugins: redirect logging to Plexus.
Added:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractAxisMojo.java
(with props)
Modified:
axis/axis1/java/trunk/axis-maven-plugin/pom.xml
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java
axis/axis1/java/trunk/pom.xml
Modified: axis/axis1/java/trunk/axis-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-maven-plugin/pom.xml?rev=1227548&r1=1227547&r2=1227548&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-maven-plugin/pom.xml (original)
+++ axis/axis1/java/trunk/axis-maven-plugin/pom.xml Thu Jan 5 10:43:59 2012
@@ -33,6 +33,19 @@
<groupId>${project.groupId}</groupId>
<artifactId>axis</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <!-- commons-logging is replaced by ulog -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- ulog allows to easily redirect commons logging to Plexus logging
-->
+ <dependency>
+ <groupId>com.github.veithen.ulog</groupId>
+ <artifactId>ulog</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Added:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractAxisMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractAxisMojo.java?rev=1227548&view=auto
==============================================================================
---
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractAxisMojo.java
(added)
+++
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractAxisMojo.java
Thu Jan 5 10:43:59 2012
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+package org.apache.axis.maven;
+
+import org.apache.maven.plugin.AbstractMojo;
+
+import com.github.veithen.ulog.PlexusLoggerInjector;
+
+public abstract class AbstractAxisMojo extends AbstractMojo {
+ /**
+ * @component
+ */
+ // This is necessary to set up logging such that all messages logged by
the Axis
+ // libraries through commons logging are redirected to Plexus logs.
+ PlexusLoggerInjector loggerInjector;
+}
Propchange:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractAxisMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java?rev=1227548&r1=1227547&r2=1227548&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java
(original)
+++
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java
Thu Jan 5 10:43:59 2012
@@ -18,9 +18,7 @@
*/
package org.apache.axis.maven;
-import org.apache.maven.plugin.AbstractMojo;
-
-public abstract class AbstractServerMojo extends AbstractMojo {
+public abstract class AbstractServerMojo extends AbstractAxisMojo {
/**
* The port of the Axis server.
*
Modified:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java?rev=1227548&r1=1227547&r2=1227548&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java
(original)
+++
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java
Thu Jan 5 10:43:59 2012
@@ -24,12 +24,11 @@ import java.util.HashMap;
import org.apache.axis.constants.Scope;
import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
-public abstract class AbstractWsdl2JavaMojo extends AbstractMojo {
+public abstract class AbstractWsdl2JavaMojo extends AbstractAxisMojo {
/**
* The maven project.
*
Modified: axis/axis1/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1227548&r1=1227547&r2=1227548&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Thu Jan 5 10:43:59 2012
@@ -91,4 +91,19 @@
</plugins>
</pluginManagement>
</build>
+
+ <!-- TODO: remove this once a ulog release is deployed to Maven Central -->
+ <repositories>
+ <repository>
+ <id>veithen-github-mvn-repo</id>
+
<url>https://raw.github.com/veithen/mvn-repo/master/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
</project>
