Menu
▾
▴
[EsiGate-commits] SF.net SVN: webassembletool:[1585] trunk
|
From: <ath...@us...> - 2014-03-26 15:53:50
|
Revision: 1585
http://sourceforge.net/p/webassembletool/code/1585
Author: athaveau
Date: 2014-03-26 15:53:43 +0000 (Wed, 26 Mar 2014)
Log Message:
-----------
Upgrade cargo plugin version and jetty embedded version
Modified Paths:
--------------
trunk/esigate-app-aggregator/pom.xml
trunk/esigate-app-aggregator/src/test/java/org/esigate/test/cases/RequestHeadersTest.java
trunk/esigate-app-casified-aggregator/pom.xml
trunk/esigate-app-master/pom.xml
trunk/pom.xml
Modified: trunk/esigate-app-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-aggregator/pom.xml 2014-03-26 15:51:21 UTC (rev 1584)
+++ trunk/esigate-app-aggregator/pom.xml 2014-03-26 15:53:43 UTC (rev 1585)
@@ -31,7 +31,7 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -134,23 +134,28 @@
</execution>
</executions>
<configuration>
+ <container>
+ <containerId>jetty7x</containerId>
+ <type>embedded</type>
+ </container>
+ <deployables>
+ <deployable>
+ <groupId>org.esigate</groupId>
+ <artifactId>esigate-app-aggregated1</artifactId>
+ <properties>
+ <context>esigate-app-aggregated1</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.esigate</groupId>
+ <artifactId>esigate-app-aggregated2</artifactId>
+ <properties>
+ <context>esigate-app-aggregated2</context>
+ </properties>
+ </deployable>
+ </deployables>
<configuration>
- <deployables>
- <deployable>
- <groupId>org.esigate</groupId>
- <artifactId>esigate-app-aggregated1</artifactId>
- <properties>
- <context>esigate-app-aggregated1</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.esigate</groupId>
- <artifactId>esigate-app-aggregated2</artifactId>
- <properties>
- <context>esigate-app-aggregated2</context>
- </properties>
- </deployable>
- </deployables>
+
<properties>
<cargo.jvmargs>-Xmx256M -server</cargo.jvmargs>
</properties>
Modified: trunk/esigate-app-aggregator/src/test/java/org/esigate/test/cases/RequestHeadersTest.java
===================================================================
--- trunk/esigate-app-aggregator/src/test/java/org/esigate/test/cases/RequestHeadersTest.java 2014-03-26 15:51:21 UTC (rev 1584)
+++ trunk/esigate-app-aggregator/src/test/java/org/esigate/test/cases/RequestHeadersTest.java 2014-03-26 15:53:43 UTC (rev 1585)
@@ -159,7 +159,7 @@
public void testCookie() throws Exception {
// In driver.properties, cookie "test0" is supposed to be forwarded but
// not test4
- String resp = sendRequestWithHeader("Cookie", "test0=dummy,test4=dummy");
+ String resp = sendRequestWithHeader("Cookie", "test0=dummy;test4=dummy");
assertEquals("HTTP header Cookie should not be forwarded as is due to cookies filtering",
"cookie: test0=dummy", resp.toLowerCase());
}
Modified: trunk/esigate-app-casified-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregator/pom.xml 2014-03-26 15:51:21 UTC (rev 1584)
+++ trunk/esigate-app-casified-aggregator/pom.xml 2014-03-26 15:53:43 UTC (rev 1585)
@@ -130,28 +130,30 @@
</execution>
</executions>
<configuration>
- <configuration>
- <deployables>
- <deployable>
- <artifactId>esigate-app-cas</artifactId>
- <properties>
- <context>esigate-app-cas</context>
- </properties>
- </deployable>
- <deployable>
- <artifactId>esigate-app-casified-aggregated1</artifactId>
- <properties>
- <context>esigate-app-casified-aggregated1</context>
- </properties>
- </deployable>
- <deployable>
- <artifactId>esigate-app-casified-aggregated2</artifactId>
- <properties>
- <context>esigate-app-casified-aggregated2</context>
- </properties>
- </deployable>
- </deployables>
- </configuration>
+ <container>
+ <containerId>jetty7x</containerId>
+ <type>embedded</type>
+ </container>
+ <deployables>
+ <deployable>
+ <artifactId>esigate-app-cas</artifactId>
+ <properties>
+ <context>esigate-app-cas</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <artifactId>esigate-app-casified-aggregated1</artifactId>
+ <properties>
+ <context>esigate-app-casified-aggregated1</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <artifactId>esigate-app-casified-aggregated2</artifactId>
+ <properties>
+ <context>esigate-app-casified-aggregated2</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
</plugin>
</plugins>
Modified: trunk/esigate-app-master/pom.xml
===================================================================
--- trunk/esigate-app-master/pom.xml 2014-03-26 15:51:21 UTC (rev 1584)
+++ trunk/esigate-app-master/pom.xml 2014-03-26 15:53:43 UTC (rev 1585)
@@ -105,16 +105,18 @@
</execution>
</executions>
<configuration>
- <configuration>
- <deployables>
- <deployable>
- <artifactId>esigate-app-provider</artifactId>
- <properties>
- <context>esigate-app-provider</context>
- </properties>
- </deployable>
- </deployables>
- </configuration>
+ <container>
+ <containerId>jetty7x</containerId>
+ <type>embedded</type>
+ </container>
+ <deployables>
+ <deployable>
+ <artifactId>esigate-app-provider</artifactId>
+ <properties>
+ <context>esigate-app-provider</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
</plugin>
</plugins>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-03-26 15:51:21 UTC (rev 1584)
+++ trunk/pom.xml 2014-03-26 15:53:43 UTC (rev 1585)
@@ -200,7 +200,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.1.2</version>
+ <version>1.4.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
