You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2009/05/01 17:45:20 UTC
svn commit: r770722 - in /synapse/trunk/java/modules/transports: ./
core/nhttp/ core/nhttp/src/main/assembly/ core/nhttp/src/test/
core/nhttp/src/test/java/ core/nhttp/src/test/java/org/
core/nhttp/src/test/java/org/apache/ core/nhttp/src/test/java/org...
Author: veithen
Date: Fri May 1 15:45:19 2009
New Revision: 770722
URL: http://svn.apache.org/viewvc?rev=770722&view=rev
Log:
Reenabled transport tests and fixed hudson profile.
Added:
synapse/trunk/java/modules/transports/core/nhttp/src/main/assembly/
- copied from r770632, synapse/trunk/java/modules/transports/src/main/assembly/
synapse/trunk/java/modules/transports/core/nhttp/src/test/
synapse/trunk/java/modules/transports/core/nhttp/src/test/java/
synapse/trunk/java/modules/transports/core/nhttp/src/test/java/org/
synapse/trunk/java/modules/transports/core/nhttp/src/test/java/org/apache/
synapse/trunk/java/modules/transports/core/nhttp/src/test/java/org/apache/synapse/
synapse/trunk/java/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/
synapse/trunk/java/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/nhttp/
- copied from r770632, synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/
synapse/trunk/java/modules/transports/core/nhttp/src/test/resources/
- copied from r770632, synapse/trunk/java/modules/transports/src/test/resources/
synapse/trunk/java/modules/transports/core/pipe/src/test/
synapse/trunk/java/modules/transports/core/pipe/src/test/java/
synapse/trunk/java/modules/transports/core/pipe/src/test/java/org/
synapse/trunk/java/modules/transports/core/pipe/src/test/java/org/apache/
synapse/trunk/java/modules/transports/core/pipe/src/test/java/org/apache/synapse/
synapse/trunk/java/modules/transports/core/pipe/src/test/java/org/apache/synapse/transport/
synapse/trunk/java/modules/transports/core/pipe/src/test/java/org/apache/synapse/transport/pipe/
- copied from r770632, synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/pipe/
synapse/trunk/java/modules/transports/core/vfs/src/main/assembly/
- copied from r770632, synapse/trunk/java/modules/transports/src/main/assembly/
synapse/trunk/java/modules/transports/core/vfs/src/test/
synapse/trunk/java/modules/transports/core/vfs/src/test/java/
synapse/trunk/java/modules/transports/core/vfs/src/test/java/org/
synapse/trunk/java/modules/transports/core/vfs/src/test/java/org/apache/
synapse/trunk/java/modules/transports/core/vfs/src/test/java/org/apache/synapse/
synapse/trunk/java/modules/transports/core/vfs/src/test/java/org/apache/synapse/transport/
synapse/trunk/java/modules/transports/core/vfs/src/test/java/org/apache/synapse/transport/vfs/
- copied from r770632, synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/
synapse/trunk/java/modules/transports/core/vfs/src/test/resources/
- copied from r770632, synapse/trunk/java/modules/transports/src/test/resources/
Removed:
synapse/trunk/java/modules/transports/src/main/assembly/
synapse/trunk/java/modules/transports/src/test/
Modified:
synapse/trunk/java/modules/transports/core/nhttp/pom.xml
synapse/trunk/java/modules/transports/core/pipe/pom.xml
synapse/trunk/java/modules/transports/core/vfs/pom.xml
synapse/trunk/java/modules/transports/pom.xml
Modified: synapse/trunk/java/modules/transports/core/nhttp/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/pom.xml?rev=770722&r1=770721&r2=770722&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/nhttp/pom.xml (original)
+++ synapse/trunk/java/modules/transports/core/nhttp/pom.xml Fri May 1 15:45:19 2009
@@ -61,7 +61,7 @@
</instructions>
</configuration>
</plugin>
- <!--<plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
@@ -102,10 +102,38 @@
</systemProperties>
<argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
</configuration>
- </plugin>-->
+ </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>hudson</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/testkit-logs.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-testkit-logs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Modified: synapse/trunk/java/modules/transports/core/pipe/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/pipe/pom.xml?rev=770722&r1=770721&r2=770722&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/pipe/pom.xml (original)
+++ synapse/trunk/java/modules/transports/core/pipe/pom.xml Fri May 1 15:45:19 2009
@@ -61,48 +61,6 @@
</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>
Modified: synapse/trunk/java/modules/transports/core/vfs/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/vfs/pom.xml?rev=770722&r1=770721&r2=770722&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/vfs/pom.xml (original)
+++ synapse/trunk/java/modules/transports/core/vfs/pom.xml Fri May 1 15:45:19 2009
@@ -61,7 +61,7 @@
</instructions>
</configuration>
</plugin>
- <!--<plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
@@ -102,10 +102,38 @@
</systemProperties>
<argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
</configuration>
- </plugin>-->
+ </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>hudson</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/testkit-logs.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-testkit-logs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
Modified: synapse/trunk/java/modules/transports/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/pom.xml?rev=770722&r1=770721&r2=770722&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/pom.xml (original)
+++ synapse/trunk/java/modules/transports/pom.xml Fri May 1 15:45:19 2009
@@ -130,34 +130,6 @@
</plugins>
</build-->
- <profiles>
- <profile>
- <id>hudson</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/testkit-logs.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>attach-testkit-logs</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<modules>
<module>core/nhttp</module>
<module>core/pipe</module>
@@ -165,6 +137,16 @@
<module>optional/fix</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>${aspectj.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.synapse</groupId>