Author: gdaniels Date: Thu Mar 5 14:02:45 2009 New Revision: 750460 URL: http://svn.apache.org/viewvc?rev=750460&view=rev Log: Remove tests module, reformat mail pom.
Added: webservices/commons/trunk/modules/transport/log4j.properties Removed: webservices/commons/trunk/modules/transport/modules/tests/ Modified: webservices/commons/trunk/modules/transport/modules/mail/pom.xml webservices/commons/trunk/modules/transport/pom.xml Added: webservices/commons/trunk/modules/transport/log4j.properties URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/log4j.properties?rev=750460&view=auto ============================================================================== --- webservices/commons/trunk/modules/transport/log4j.properties (added) +++ webservices/commons/trunk/modules/transport/log4j.properties Thu Mar 5 14:02:45 2009 @@ -0,0 +1,31 @@ +# +# 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. +# + +# log4j configuration file used by unit tests + +log4j.rootCategory=DEBUG, CONSOLE +#log4j.rootCategory=WARN, CONSOLE + +log4j.category.org.apache.axis2.transport.jms=TRACE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.threshold=ERROR +#log4j.appender.CONSOLE.threshold=TRACE +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%5p [%t] %c{1} %m%n Modified: webservices/commons/trunk/modules/transport/modules/mail/pom.xml URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/pom.xml?rev=750460&r1=750459&r2=750460&view=diff ============================================================================== --- webservices/commons/trunk/modules/transport/modules/mail/pom.xml (original) +++ webservices/commons/trunk/modules/transport/modules/mail/pom.xml Thu Mar 5 14:02:45 2009 @@ -22,129 +22,129 @@ 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> - <parent> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-transport</artifactId> - <version>SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-transport-mail</artifactId> - <name>Apache Axis2 - Transport - Mail</name> - <description>Apache Axis2 - Mail Transport</description> - <packaging>bundle</packaging> + <artifactId>axis2-transport</artifactId> + <version>SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-transport-mail</artifactId> + <name>Apache Axis2 - Transport - Mail</name> + <description>Apache Axis2 - Mail Transport</description> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>1.4.0</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Version>1.0</Bundle-Version> + <Bundle-Name>${pom.artifactId}</Bundle-Name> + <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor> + <Bundle-Description>${pom.description}</Bundle-Description> + <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName> + <Export-Package> + org.apache.axis2.transport.mail.*;-split-package:=merge-last, + </Export-Package> + <Import-Package> + !javax.xml.namespace, + javax.xml.namespace; version=0.0.0, + *; resolution:=optional + </Import-Package> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.0</version> + <executions> + <execution> + <id>copy</id> + <phase>generate-test-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <outputDirectory>target/lib</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3</version> + <configuration> + <systemProperties> + <property> + <name>log4j.configuration</name> + <value>file:log4j.properties</value> + </property> + <property> + <name>net.sourceforge.cobertura.datafile</name> + <value>target/cobertura.ser</value> + </property> + </systemProperties> + <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine> + </configuration> + </plugin> + </plugins> + </build> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>1.4.0</version> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Version>1.0</Bundle-Version> - <Bundle-Name>${pom.artifactId}</Bundle-Name> - <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor> - <Bundle-Description>${pom.description}</Bundle-Description> - <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName> - <Export-Package> - org.apache.axis2.transport.mail.*;-split-package:=merge-last, - </Export-Package> - <Import-Package> - !javax.xml.namespace, - javax.xml.namespace; version=0.0.0, - *; resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> - <executions> - <execution> - <id>copy</id> - <phase>generate-test-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <stripVersion>true</stripVersion> - <artifactItems> - <artifactItem> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - <outputDirectory>target/lib</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> - <configuration> - <systemProperties> - <property> - <name>log4j.configuration</name> - <value>file:log4j.properties</value> - </property> - <property> - <name>net.sourceforge.cobertura.datafile</name> - <value>target/cobertura.ser</value> - </property> - </systemProperties> - <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-transport-base</artifactId> + <version>${version}</version> + <exclusions> + <!-- We want to choose the JavaMail implementation ourselves --> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + </exclusion> + </exclusions> - <dependencies> - <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-transport-base</artifactId> - <version>${version}</version> - <exclusions> - <!-- We want to choose the JavaMail implementation ourselves --> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.4_spec</artifactId> - </exclusion> - </exclusions> - - </dependency> - <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-transport-testkit</artifactId> - <version>${pom.version}</version> - <scope>test</scope> - <exclusions> - <!-- We want to choose the JavaMail implementation ourselves --> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.icegreen</groupId> - <artifactId>greenmail</artifactId> - <version>1.3</version> - <scope>test</scope> - <exclusions> - <!-- We want to choose the JavaMail implementation ourselves --> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> + </dependency> + <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-transport-testkit</artifactId> + <version>${pom.version}</version> + <scope>test</scope> + <exclusions> + <!-- We want to choose the JavaMail implementation ourselves --> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.icegreen</groupId> + <artifactId>greenmail</artifactId> + <version>1.3</version> + <scope>test</scope> + <exclusions> + <!-- We want to choose the JavaMail implementation ourselves --> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: webservices/commons/trunk/modules/transport/pom.xml URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/pom.xml?rev=750460&r1=750459&r2=750460&view=diff ============================================================================== --- webservices/commons/trunk/modules/transport/pom.xml (original) +++ webservices/commons/trunk/modules/transport/pom.xml Thu Mar 5 14:02:45 2009 @@ -45,7 +45,6 @@ <module>modules/mail</module> <module>modules/jms</module> <module>modules/testkit</module> - <module>modules/tests</module> </modules> <profiles>