Author: davsclaus
Date: Tue Nov 13 08:03:54 2012
New Revision: 1408630
URL: http://svn.apache.org/viewvc?rev=1408630&view=rev
Log:
Polished pom to be aligned with the others.
Modified:
camel/trunk/components/camel-sjms/pom.xml
camel/trunk/components/camel-sjms/src/test/resources/log4j.properties
Modified: camel/trunk/components/camel-sjms/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/pom.xml?rev=1408630&r1=1408629&r2=1408630&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/pom.xml (original)
+++ camel/trunk/components/camel-sjms/pom.xml Tue Nov 13 08:03:54 2012
@@ -19,124 +19,114 @@
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";>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>2.11-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-sjms</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Simple JMS</name>
+ <description>A pure Java JMS Camel Component</description>
+
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.component.sjms,
+ org.apache.camel.component.sjms.jms
+ </camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>
+ !org.apache.camel.component.sjms.*,
+ org.apache.camel.*;${camel.osgi.import.camel.version},
+ ${camel.osgi.import.defaults},
+ *
+ </camel.osgi.import.pkg>
+ <camel.osgi.private.pkg>
+ org.apache.camel.component.sjms.consumer,
+ org.apache.camel.component.sjms.producer,
+ org.apache.camel.component.sjms.tx
+ </camel.osgi.private.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>${geronimo-annotation-spec-version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.fusesource.mqtt-client</groupId>
+ <artifactId>mqtt-client</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-pool</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.atomikos</groupId>
+ <artifactId>transactions-jta</artifactId>
+ <version>${atomikos-transactions-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <forkedProcessTimeoutInSeconds>6000</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/activemq-data</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>2.11-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-sjms</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: SJMS</name>
- <description>A pure Java JMS Camel Component</description>
-
-
- <properties>
- <camel.osgi.export.pkg>
- org.apache.camel.component.sjms,
- org.apache.camel.component.sjms.jms
- </camel.osgi.export.pkg>
- <camel.osgi.import.pkg>
- !org.apache.camel.component.sjms.*,
- org.apache.camel.*;${camel.osgi.import.camel.version},
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import.pkg>
- <camel.osgi.private.pkg>
- org.apache.camel.component.sjms.consumer,
- org.apache.camel.component.sjms.producer,
- org.apache.camel.component.sjms.tx
- </camel.osgi.private.pkg>
-
-
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>${geronimo-annotation-spec-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
-
- <!-- for testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>spring-context</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pool</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.atomikos</groupId>
- <artifactId>transactions-jta</artifactId>
- <version>${atomikos-transactions-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <defaultGoal>install</defaultGoal>
-
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>-Xmx512M</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <forkMode>pertest</forkMode>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <argLine>-Xmx512M</argLine>
- <systemProperties>
- <property>
-
<name>org.apache.activemq.default.directory.prefix</name>
- <value>target/activemq/</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: camel/trunk/components/camel-sjms/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/resources/log4j.properties?rev=1408630&r1=1408629&r2=1408630&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/resources/log4j.properties
(original)
+++ camel/trunk/components/camel-sjms/src/test/resources/log4j.properties Tue
Nov 13 08:03:54 2012
@@ -17,7 +17,7 @@
#
# The logging properties used
#
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, file
# uncomment the following line to turn on Camel debugging
log4j.logger.org.apache.activemq=warn
