Author: jbonofre
Date: Fri Mar 18 07:43:59 2011
New Revision: 1082835
URL: http://svn.apache.org/viewvc?rev=1082835&view=rev
Log:
[SM-2022] Replace commons-logging by java.util.logging.
Dependencies alignment with components.
Modified:
servicemix/archetypes/trunk/pom.xml
servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/pom.xml
servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/java/MyTransform.java
Modified: servicemix/archetypes/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/pom.xml?rev=1082835&r1=1082834&r2=1082835&view=diff
==============================================================================
--- servicemix/archetypes/trunk/pom.xml (original)
+++ servicemix/archetypes/trunk/pom.xml Fri Mar 18 07:43:59 2011
@@ -40,7 +40,7 @@
</scm>
<properties>
- <components.version>2011.01-SNAPSHOT</components.version>
+ <components.version>2011.01</components.version>
<jbi-maven-plugin.version>4.4</jbi-maven-plugin.version>
<maven-bundle-plugin.version>2.2.0</maven-bundle-plugin.version>
<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
@@ -48,18 +48,18 @@
<maven-jar-plugin.version>2.3.1</maven-jar-plugin.version>
<maven-shade-plugin.version>1.4</maven-shade-plugin.version>
<junit.version>4.7</junit.version>
- <xbean.version>3.4.1</xbean.version>
+ <xbean.version>3.7</xbean.version>
<geronimo-jta.specs.version>1.1.1</geronimo-jta.specs.version>
<servicemix.version>3.3.2</servicemix.version>
<commons-logging.version>1.1.1</commons-logging.version>
<activemq.version>5.4.2</activemq.version>
- <camel.version>2.6-SNAPSHOT</camel.version>
+ <camel.version>2.6.0</camel.version>
<cxf.version>2.3.2</cxf.version>
- <servicemix.specs.version>1.6.0</servicemix.specs.version>
- <servicemix-utils.version>1.4.0-SNAPSHOT</servicemix-utils.version>
+ <servicemix.specs.version>1.7.0</servicemix.specs.version>
+ <servicemix-utils.version>1.4.0</servicemix-utils.version>
<activemq.version>5.4.2</activemq.version>
- <jaxb.version>2.2</jaxb.version>
- <jaxws.version>2.2</jaxws.version>
+ <jaxb.version>2.1</jaxb.version>
+ <jaxws.version>2.1</jaxws.version>
<geronimo.wsmetadata.version>1.1.2</geronimo.wsmetadata.version>
</properties>
Modified:
servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/pom.xml?rev=1082835&r1=1082834&r2=1082835&view=diff
==============================================================================
---
servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/pom.xml
(original)
+++
servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/pom.xml
Fri Mar 18 07:43:59 2011
@@ -12,18 +12,11 @@
<name>Apache ServiceMix :: Camel OSGi Bundle</name>
<properties>
-
<commons-logging.version>@{commons-logging.version}</commons-logging.version>
<camel.version>@{camel.version}</camel.version>
</properties>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<version>${camel.version}</version>
Modified:
servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/java/MyTransform.java
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/java/MyTransform.java?rev=1082835&r1=1082834&r2=1082835&view=diff
==============================================================================
---
servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/java/MyTransform.java
(original)
+++
servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/java/MyTransform.java
Fri Mar 18 07:43:59 2011
@@ -1,12 +1,10 @@
package ${packageName};
import java.util.Date;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
public class MyTransform {
- private static final transient Log LOG =
LogFactory.getLog(MyTransform.class);
+ private static final transient Logger LOGGER =
Logger.getLogger(MyTransform.class.getName());
private boolean verbose = true;
private String prefix = "MyTransform";
@@ -15,7 +13,7 @@ public class MyTransform {
if (verbose) {
System.out.println(">>>> " + answer);
}
- LOG.info(">>>> " + answer);
+ LOGGER.info(">>>> " + answer);
return answer;
}