You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2011/07/24 19:52:17 UTC
svn commit: r1150447 - in /servicemix/maven-plugins/trunk/jbi-maven-plugin:
pom.xml
src/main/java/org/apache/servicemix/maven/plugin/jbi/XmlDescriptorHelper.java
Author: jbonofre
Date: Sun Jul 24 17:52:17 2011
New Revision: 1150447
URL: http://svn.apache.org/viewvc?rev=1150447&view=rev
Log:
[SM-2048] Use SLF4J in place of commons-logging.
Modified:
servicemix/maven-plugins/trunk/jbi-maven-plugin/pom.xml
servicemix/maven-plugins/trunk/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/XmlDescriptorHelper.java
Modified: servicemix/maven-plugins/trunk/jbi-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/maven-plugins/trunk/jbi-maven-plugin/pom.xml?rev=1150447&r1=1150446&r2=1150447&view=diff
==============================================================================
--- servicemix/maven-plugins/trunk/jbi-maven-plugin/pom.xml (original)
+++ servicemix/maven-plugins/trunk/jbi-maven-plugin/pom.xml Sun Jul 24 17:52:17 2011
@@ -1,168 +1,172 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
-<!--
- 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.
--->
- <modelVersion>4.0.0</modelVersion>
- <parent>
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>maven-plugins-pom</artifactId>
+ <version>4</version>
+ <relativePath>../maven-plugins-pom/pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>maven-plugins-pom</artifactId>
- <version>4</version>
- <relativePath>../maven-plugins-pom/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>jbi-maven-plugin</artifactId>
- <version>4.6-SNAPSHOT</version>
-
- <packaging>maven-plugin</packaging>
- <name>Apache ServiceMix :: Plugins :: Maven2 JBI Plugin</name>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/maven-plugins/jbi-maven-plugin/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/maven-plugins/jbi-maven-plugin/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/servicemix/maven-plugins/jbi-maven-plugin/trunk</url>
- </scm>
-
- <properties>
- <servicemix.specs.version>1.8.0</servicemix.specs.version>
- </properties>
-
- <dependencies>
- <!-- little hack to make sure this gets downloaded before maven-repository.dev.java.net gets pulled in -->
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-pom</artifactId>
- <version>2</version>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>2.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-script-ant</artifactId>
- <version>2.0.9</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-core</artifactId>
- <version>3.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-common</artifactId>
- <version>2011.01</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>3.0.5.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.2</version>
- </dependency>
- </dependencies>
+ <artifactId>jbi-maven-plugin</artifactId>
+ <version>4.6-SNAPSHOT</version>
+
+ <packaging>maven-plugin</packaging>
+ <name>Apache ServiceMix :: Plugins :: Maven2 JBI Plugin</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/maven-plugins/jbi-maven-plugin/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/maven-plugins/jbi-maven-plugin/trunk
+ </developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/servicemix/maven-plugins/jbi-maven-plugin/trunk</url>
+ </scm>
+
+ <properties>
+ <servicemix.specs.version>1.8.0</servicemix.specs.version>
+ </properties>
- <dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <!-- little hack to avoid touching jencks 2.1 (refers to servicemix.org) -->
- <dependency>
- <groupId>org.jencks</groupId>
- <artifactId>jencks</artifactId>
- <version>2.2</version>
- </dependency>
+ <!-- little hack to make sure this gets downloaded before maven-repository.dev.java.net gets pulled in -->
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-pom</artifactId>
+ <version>2</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-script-ant</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <version>3.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-common</artifactId>
+ <version>2011.01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.0.5.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.6.2</version>
+ </dependency>
</dependencies>
- </dependencyManagement>
- <profiles>
- <profile>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <!-- little hack to avoid touching jencks 2.1 (refers to servicemix.org) -->
+ <dependency>
+ <groupId>org.jencks</groupId>
+ <artifactId>jencks</artifactId>
+ <version>2.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <profiles>
+ <profile>
<id>release</id>
<build>
<plugins>
@@ -198,8 +202,8 @@
<id>deploy</id>
<build>
<defaultGoal>deploy</defaultGoal>
- <plugins>
- <plugin>
+ <plugins>
+ <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.2</version>
<executions>
@@ -213,8 +217,8 @@
<source>1.5</source>
<attach>true</attach>
</configuration>
- </plugin>
- <plugin>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.0.2</version>
@@ -232,34 +236,34 @@
</plugins>
</build>
</profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <!-- Add the Ant plugin tools -->
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-ant</artifactId>
- <version>2.5</version>
- </dependency>
- </dependencies>
- <configuration>
- <goalPrefix>jbi</goalPrefix>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <!-- Add the Ant plugin tools -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-ant</artifactId>
+ <version>2.5</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <goalPrefix>jbi</goalPrefix>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: servicemix/maven-plugins/trunk/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/XmlDescriptorHelper.java
URL: http://svn.apache.org/viewvc/servicemix/maven-plugins/trunk/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/XmlDescriptorHelper.java?rev=1150447&r1=1150446&r2=1150447&view=diff
==============================================================================
--- servicemix/maven-plugins/trunk/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/XmlDescriptorHelper.java (original)
+++ servicemix/maven-plugins/trunk/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/XmlDescriptorHelper.java Sun Jul 24 17:52:17 2011
@@ -18,15 +18,14 @@ package org.apache.servicemix.maven.plug
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
public final class XmlDescriptorHelper {
- private static final Log LOG = LogFactory.getLog(XmlDescriptorHelper.class);
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(XmlDescriptorHelper.class);
private XmlDescriptorHelper() {
}
@@ -61,17 +60,17 @@ public final class XmlDescriptorHelper {
String localPart) {
if (node instanceof Element) {
Element element = (Element) node;
- LOG.debug("Got Element nodeName:" + element.getNodeName()
+ LOGGER.debug("Got Element nodeName:" + element.getNodeName()
+ " namespaceUri:" + element.getNamespaceURI()
+ " localName:" + element.getLocalName());
if (localPart.equals(element.getNodeName())) {
return true;
} else {
// Compare the namespace URI and localname
- LOG.debug(namespaceUrl + "=" + element.getNamespaceURI()
+ LOGGER.debug(namespaceUrl + "=" + element.getNamespaceURI()
+ " is "
+ namespaceUrl.equals(element.getNamespaceURI()));
- LOG.debug(localPart + "=" + element.getLocalName() + " is "
+ LOGGER.debug(localPart + "=" + element.getLocalName() + " is "
+ localPart.equals(element.getLocalName()));
if ((namespaceUrl.equals(element.getNamespaceURI()))
&& (localPart.equals(element.getLocalName()))) {