Menu
▾
▴
webassembletool-commits — ESIGate commit list
You can subscribe to this list here.
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
(4) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
(2) |
Feb
(19) |
Mar
(20) |
Apr
(20) |
May
|
Jun
(3) |
Jul
|
Aug
(23) |
Sep
(2) |
Oct
(5) |
Nov
(58) |
Dec
(49) |
| 2012 |
Jan
(11) |
Feb
(20) |
Mar
(9) |
Apr
(19) |
May
(14) |
Jun
(42) |
Jul
(13) |
Aug
|
Sep
(6) |
Oct
(6) |
Nov
(22) |
Dec
(66) |
| 2013 |
Jan
(12) |
Feb
(28) |
Mar
(54) |
Apr
(21) |
May
(7) |
Jun
(69) |
Jul
(80) |
Aug
(7) |
Sep
(12) |
Oct
(145) |
Nov
(44) |
Dec
(25) |
| 2014 |
Jan
(33) |
Feb
(21) |
Mar
(19) |
Apr
(2) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <nri...@us...> - 2014-02-15 23:22:24
|
Revision: 1574
http://sourceforge.net/p/webassembletool/code/1574
Author: nricheton
Date: 2014-02-15 23:22:20 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/esigate-app-aggregated1/pom.xml
trunk/esigate-app-aggregated2/pom.xml
trunk/esigate-app-aggregator/pom.xml
trunk/esigate-app-cas/pom.xml
trunk/esigate-app-casified-aggregated1/pom.xml
trunk/esigate-app-casified-aggregated2/pom.xml
trunk/esigate-app-casified-aggregator/pom.xml
trunk/esigate-app-master/pom.xml
trunk/esigate-app-provider/pom.xml
trunk/esigate-cas/pom.xml
trunk/esigate-core/pom.xml
trunk/esigate-distribution/pom.xml
trunk/esigate-server/pom.xml
trunk/esigate-servlet/pom.xml
trunk/esigate-war/pom.xml
trunk/pom.xml
Modified: trunk/esigate-app-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-aggregated1/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-app-aggregated1/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-aggregated1</finalName>
Modified: trunk/esigate-app-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-aggregated2/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-app-aggregated2/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-aggregated2</finalName>
Modified: trunk/esigate-app-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-aggregator/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-app-aggregator/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-cas/pom.xml
===================================================================
--- trunk/esigate-app-cas/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-app-cas/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-cas</finalName>
Modified: trunk/esigate-app-casified-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated1</finalName>
Modified: trunk/esigate-app-casified-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated2</finalName>
Modified: trunk/esigate-app-casified-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-master/pom.xml
===================================================================
--- trunk/esigate-app-master/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-app-master/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-provider/pom.xml
===================================================================
--- trunk/esigate-app-provider/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-app-provider/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-provider</finalName>
Modified: trunk/esigate-cas/pom.xml
===================================================================
--- trunk/esigate-cas/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-cas/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-core/pom.xml
===================================================================
--- trunk/esigate-core/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-core/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-distribution/pom.xml
===================================================================
--- trunk/esigate-distribution/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-distribution/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-server/pom.xml
===================================================================
--- trunk/esigate-server/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-server/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -4,7 +4,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<name>ESIGate server</name>
<description>Standalone server for development. Can be run using java -jar esigate-server-<version>.jar -Desigate.config=<config file></description>
Modified: trunk/esigate-servlet/pom.xml
===================================================================
--- trunk/esigate-servlet/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-servlet/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-war/pom.xml
===================================================================
--- trunk/esigate-war/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/esigate-war/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<name>ESIGate web application</name>
<description>ESIGate war application which can be deployed "as-is" or customized for your needs.</description>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-02-15 23:22:08 UTC (rev 1573)
+++ trunk/pom.xml 2014-02-15 23:22:20 UTC (rev 1574)
@@ -12,7 +12,7 @@
<artifactId>esigate</artifactId>
<packaging>pom</packaging>
<name>esigate</name>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<mailingLists>
<mailingList>
@@ -95,9 +95,9 @@
</developer>
</developers>
<scm>
- <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</developerConnection>
- <url>http://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</developerConnection>
+ <url>http://svn.code.sf.net/p/webassembletool/code/trunk/</url>
</scm>
<build>
<pluginManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 23:22:10
|
Revision: 1573
http://sourceforge.net/p/webassembletool/code/1573
Author: nricheton
Date: 2014-02-15 23:22:08 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
[maven-release-plugin] copy for tag esigate-5.0-beta-1
Added Paths:
-----------
tags/esigate-5.0-beta-1/
Index: tags/esigate-5.0-beta-1
===================================================================
--- trunk 2014-02-15 23:21:57 UTC (rev 1572)
+++ tags/esigate-5.0-beta-1 2014-02-15 23:22:08 UTC (rev 1573)
Property changes on: tags/esigate-5.0-beta-1
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,4 ##
+target
+.classpath
+.project
+.settings
Added: svn:mergeinfo
## -0,0 +1 ##
+/branches/esigate-5.0-httpclient-4.3-update:1320-1512
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 23:22:01
|
Revision: 1572
http://sourceforge.net/p/webassembletool/code/1572
Author: nricheton
Date: 2014-02-15 23:21:57 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
[maven-release-plugin] prepare release esigate-5.0-beta-1
Modified Paths:
--------------
trunk/esigate-app-aggregated1/pom.xml
trunk/esigate-app-aggregated2/pom.xml
trunk/esigate-app-aggregator/pom.xml
trunk/esigate-app-cas/pom.xml
trunk/esigate-app-casified-aggregated1/pom.xml
trunk/esigate-app-casified-aggregated2/pom.xml
trunk/esigate-app-casified-aggregator/pom.xml
trunk/esigate-app-master/pom.xml
trunk/esigate-app-provider/pom.xml
trunk/esigate-cas/pom.xml
trunk/esigate-core/pom.xml
trunk/esigate-distribution/pom.xml
trunk/esigate-server/pom.xml
trunk/esigate-servlet/pom.xml
trunk/esigate-war/pom.xml
trunk/pom.xml
Modified: trunk/esigate-app-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-aggregated1/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-app-aggregated1/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-aggregated1</finalName>
Modified: trunk/esigate-app-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-aggregated2/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-app-aggregated2/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-aggregated2</finalName>
Modified: trunk/esigate-app-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-aggregator/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-app-aggregator/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-cas/pom.xml
===================================================================
--- trunk/esigate-app-cas/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-app-cas/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-cas</finalName>
Modified: trunk/esigate-app-casified-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated1</finalName>
Modified: trunk/esigate-app-casified-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated2</finalName>
Modified: trunk/esigate-app-casified-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-master/pom.xml
===================================================================
--- trunk/esigate-app-master/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-app-master/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-provider/pom.xml
===================================================================
--- trunk/esigate-app-provider/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-app-provider/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-provider</finalName>
Modified: trunk/esigate-cas/pom.xml
===================================================================
--- trunk/esigate-cas/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-cas/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-core/pom.xml
===================================================================
--- trunk/esigate-core/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-core/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-distribution/pom.xml
===================================================================
--- trunk/esigate-distribution/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-distribution/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-server/pom.xml
===================================================================
--- trunk/esigate-server/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-server/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -4,7 +4,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<name>ESIGate server</name>
<description>Standalone server for development. Can be run using java -jar esigate-server-<version>.jar -Desigate.config=<config file></description>
Modified: trunk/esigate-servlet/pom.xml
===================================================================
--- trunk/esigate-servlet/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-servlet/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-war/pom.xml
===================================================================
--- trunk/esigate-war/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/esigate-war/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<name>ESIGate web application</name>
<description>ESIGate war application which can be deployed "as-is" or customized for your needs.</description>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-02-15 23:19:56 UTC (rev 1571)
+++ trunk/pom.xml 2014-02-15 23:21:57 UTC (rev 1572)
@@ -12,7 +12,7 @@
<artifactId>esigate</artifactId>
<packaging>pom</packaging>
<name>esigate</name>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
<inceptionYear>2008</inceptionYear>
<mailingLists>
<mailingList>
@@ -95,9 +95,9 @@
</developer>
</developers>
<scm>
- <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</developerConnection>
- <url>http://svn.code.sf.net/p/webassembletool/code/trunk/</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</developerConnection>
+ <url>http://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</url>
</scm>
<build>
<pluginManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 23:19:58
|
Revision: 1571
http://sourceforge.net/p/webassembletool/code/1571
Author: nricheton
Date: 2014-02-15 23:19:56 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
failed release
Removed Paths:
-------------
tags/esigate-5.0-beta-1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 23:19:34
|
Revision: 1570
http://sourceforge.net/p/webassembletool/code/1570
Author: nricheton
Date: 2014-02-15 23:19:31 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
Remove site javadoc in parent (release issue) -> same conf as 4.x
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
+++ trunk/pom.xml 2014-02-15 23:19:31 UTC (rev 1570)
@@ -306,10 +306,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
+
</reportPlugins>
</configuration>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 19:47:29
|
Revision: 1569
http://sourceforge.net/p/webassembletool/code/1569
Author: nricheton
Date: 2014-02-15 19:47:26 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/esigate-app-aggregated1/pom.xml
trunk/esigate-app-aggregated2/pom.xml
trunk/esigate-app-aggregator/pom.xml
trunk/esigate-app-cas/pom.xml
trunk/esigate-app-casified-aggregated1/pom.xml
trunk/esigate-app-casified-aggregated2/pom.xml
trunk/esigate-app-casified-aggregator/pom.xml
trunk/esigate-app-master/pom.xml
trunk/esigate-app-provider/pom.xml
trunk/esigate-cas/pom.xml
trunk/esigate-core/pom.xml
trunk/esigate-distribution/pom.xml
trunk/esigate-server/pom.xml
trunk/esigate-servlet/pom.xml
trunk/esigate-war/pom.xml
trunk/pom.xml
Modified: trunk/esigate-app-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-aggregated1/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-app-aggregated1/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-aggregated1</finalName>
Modified: trunk/esigate-app-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-aggregated2/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-app-aggregated2/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-aggregated2</finalName>
Modified: trunk/esigate-app-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-aggregator/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-app-aggregator/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-cas/pom.xml
===================================================================
--- trunk/esigate-app-cas/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-app-cas/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-cas</finalName>
Modified: trunk/esigate-app-casified-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated1</finalName>
Modified: trunk/esigate-app-casified-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated2</finalName>
Modified: trunk/esigate-app-casified-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-master/pom.xml
===================================================================
--- trunk/esigate-app-master/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-app-master/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-provider/pom.xml
===================================================================
--- trunk/esigate-app-provider/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-app-provider/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-provider</finalName>
Modified: trunk/esigate-cas/pom.xml
===================================================================
--- trunk/esigate-cas/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-cas/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-core/pom.xml
===================================================================
--- trunk/esigate-core/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-core/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-distribution/pom.xml
===================================================================
--- trunk/esigate-distribution/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-distribution/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-server/pom.xml
===================================================================
--- trunk/esigate-server/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-server/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -4,7 +4,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<name>ESIGate server</name>
<description>Standalone server for development. Can be run using java -jar esigate-server-<version>.jar -Desigate.config=<config file></description>
Modified: trunk/esigate-servlet/pom.xml
===================================================================
--- trunk/esigate-servlet/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-servlet/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-war/pom.xml
===================================================================
--- trunk/esigate-war/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/esigate-war/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<name>ESIGate web application</name>
<description>ESIGate war application which can be deployed "as-is" or customized for your needs.</description>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-02-15 19:47:13 UTC (rev 1568)
+++ trunk/pom.xml 2014-02-15 19:47:26 UTC (rev 1569)
@@ -12,7 +12,7 @@
<artifactId>esigate</artifactId>
<packaging>pom</packaging>
<name>esigate</name>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<mailingLists>
<mailingList>
@@ -95,9 +95,9 @@
</developer>
</developers>
<scm>
- <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</developerConnection>
- <url>http://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</developerConnection>
+ <url>http://svn.code.sf.net/p/webassembletool/code/trunk/</url>
</scm>
<build>
<pluginManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 19:47:16
|
Revision: 1568
http://sourceforge.net/p/webassembletool/code/1568
Author: nricheton
Date: 2014-02-15 19:47:13 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
[maven-release-plugin] copy for tag esigate-5.0-beta-1
Added Paths:
-----------
tags/esigate-5.0-beta-1/
Index: tags/esigate-5.0-beta-1
===================================================================
--- trunk 2014-02-15 19:47:02 UTC (rev 1567)
+++ tags/esigate-5.0-beta-1 2014-02-15 19:47:13 UTC (rev 1568)
Property changes on: tags/esigate-5.0-beta-1
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,4 ##
+target
+.classpath
+.project
+.settings
Added: svn:mergeinfo
## -0,0 +1 ##
+/branches/esigate-5.0-httpclient-4.3-update:1320-1512
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 19:47:06
|
Revision: 1567
http://sourceforge.net/p/webassembletool/code/1567
Author: nricheton
Date: 2014-02-15 19:47:02 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
[maven-release-plugin] prepare release esigate-5.0-beta-1
Modified Paths:
--------------
trunk/esigate-app-aggregated1/pom.xml
trunk/esigate-app-aggregated2/pom.xml
trunk/esigate-app-aggregator/pom.xml
trunk/esigate-app-cas/pom.xml
trunk/esigate-app-casified-aggregated1/pom.xml
trunk/esigate-app-casified-aggregated2/pom.xml
trunk/esigate-app-casified-aggregator/pom.xml
trunk/esigate-app-master/pom.xml
trunk/esigate-app-provider/pom.xml
trunk/esigate-cas/pom.xml
trunk/esigate-core/pom.xml
trunk/esigate-distribution/pom.xml
trunk/esigate-server/pom.xml
trunk/esigate-servlet/pom.xml
trunk/esigate-war/pom.xml
trunk/pom.xml
Modified: trunk/esigate-app-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-aggregated1/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-app-aggregated1/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-aggregated1</finalName>
Modified: trunk/esigate-app-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-aggregated2/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-app-aggregated2/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-aggregated2</finalName>
Modified: trunk/esigate-app-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-aggregator/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-app-aggregator/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-cas/pom.xml
===================================================================
--- trunk/esigate-app-cas/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-app-cas/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-cas</finalName>
Modified: trunk/esigate-app-casified-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated1</finalName>
Modified: trunk/esigate-app-casified-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated2</finalName>
Modified: trunk/esigate-app-casified-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-master/pom.xml
===================================================================
--- trunk/esigate-app-master/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-app-master/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-provider/pom.xml
===================================================================
--- trunk/esigate-app-provider/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-app-provider/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-provider</finalName>
Modified: trunk/esigate-cas/pom.xml
===================================================================
--- trunk/esigate-cas/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-cas/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-core/pom.xml
===================================================================
--- trunk/esigate-core/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-core/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-distribution/pom.xml
===================================================================
--- trunk/esigate-distribution/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-distribution/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-server/pom.xml
===================================================================
--- trunk/esigate-server/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-server/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -4,7 +4,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<name>ESIGate server</name>
<description>Standalone server for development. Can be run using java -jar esigate-server-<version>.jar -Desigate.config=<config file></description>
Modified: trunk/esigate-servlet/pom.xml
===================================================================
--- trunk/esigate-servlet/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-servlet/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-war/pom.xml
===================================================================
--- trunk/esigate-war/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/esigate-war/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<name>ESIGate web application</name>
<description>ESIGate war application which can be deployed "as-is" or customized for your needs.</description>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-02-15 19:43:34 UTC (rev 1566)
+++ trunk/pom.xml 2014-02-15 19:47:02 UTC (rev 1567)
@@ -12,7 +12,7 @@
<artifactId>esigate</artifactId>
<packaging>pom</packaging>
<name>esigate</name>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
<inceptionYear>2008</inceptionYear>
<mailingLists>
<mailingList>
@@ -95,9 +95,9 @@
</developer>
</developers>
<scm>
- <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</developerConnection>
- <url>http://svn.code.sf.net/p/webassembletool/code/trunk/</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</developerConnection>
+ <url>http://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</url>
</scm>
<build>
<pluginManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 19:43:37
|
Revision: 1566
http://sourceforge.net/p/webassembletool/code/1566
Author: nricheton
Date: 2014-02-15 19:43:34 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
failed release
Removed Paths:
-------------
tags/esigate-5.0-beta-1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 19:38:20
|
Revision: 1565
http://sourceforge.net/p/webassembletool/code/1565
Author: nricheton
Date: 2014-02-15 19:38:18 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/esigate-app-aggregated1/pom.xml
trunk/esigate-app-aggregated2/pom.xml
trunk/esigate-app-aggregator/pom.xml
trunk/esigate-app-cas/pom.xml
trunk/esigate-app-casified-aggregated1/pom.xml
trunk/esigate-app-casified-aggregated2/pom.xml
trunk/esigate-app-casified-aggregator/pom.xml
trunk/esigate-app-master/pom.xml
trunk/esigate-app-provider/pom.xml
trunk/esigate-cas/pom.xml
trunk/esigate-core/pom.xml
trunk/esigate-distribution/pom.xml
trunk/esigate-server/pom.xml
trunk/esigate-servlet/pom.xml
trunk/esigate-war/pom.xml
trunk/pom.xml
Modified: trunk/esigate-app-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-aggregated1/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-app-aggregated1/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-aggregated1</finalName>
Modified: trunk/esigate-app-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-aggregated2/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-app-aggregated2/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-aggregated2</finalName>
Modified: trunk/esigate-app-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-aggregator/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-app-aggregator/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-cas/pom.xml
===================================================================
--- trunk/esigate-app-cas/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-app-cas/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-cas</finalName>
Modified: trunk/esigate-app-casified-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated1</finalName>
Modified: trunk/esigate-app-casified-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated2</finalName>
Modified: trunk/esigate-app-casified-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-master/pom.xml
===================================================================
--- trunk/esigate-app-master/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-app-master/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-provider/pom.xml
===================================================================
--- trunk/esigate-app-provider/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-app-provider/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<build>
<finalName>esigate-app-provider</finalName>
Modified: trunk/esigate-cas/pom.xml
===================================================================
--- trunk/esigate-cas/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-cas/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-core/pom.xml
===================================================================
--- trunk/esigate-core/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-core/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-distribution/pom.xml
===================================================================
--- trunk/esigate-distribution/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-distribution/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-server/pom.xml
===================================================================
--- trunk/esigate-server/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-server/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -4,7 +4,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<name>ESIGate server</name>
<description>Standalone server for development. Can be run using java -jar esigate-server-<version>.jar -Desigate.config=<config file></description>
Modified: trunk/esigate-servlet/pom.xml
===================================================================
--- trunk/esigate-servlet/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-servlet/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-war/pom.xml
===================================================================
--- trunk/esigate-war/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/esigate-war/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<name>ESIGate web application</name>
<description>ESIGate war application which can be deployed "as-is" or customized for your needs.</description>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-02-15 19:38:05 UTC (rev 1564)
+++ trunk/pom.xml 2014-02-15 19:38:18 UTC (rev 1565)
@@ -12,7 +12,7 @@
<artifactId>esigate</artifactId>
<packaging>pom</packaging>
<name>esigate</name>
- <version>5.0-beta-1</version>
+ <version>5.0-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<mailingLists>
<mailingList>
@@ -95,9 +95,9 @@
</developer>
</developers>
<scm>
- <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</developerConnection>
- <url>http://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</developerConnection>
+ <url>http://svn.code.sf.net/p/webassembletool/code/trunk/</url>
</scm>
<build>
<pluginManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 19:38:08
|
Revision: 1564
http://sourceforge.net/p/webassembletool/code/1564
Author: nricheton
Date: 2014-02-15 19:38:05 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
[maven-release-plugin] copy for tag esigate-5.0-beta-1
Added Paths:
-----------
tags/esigate-5.0-beta-1/
Index: tags/esigate-5.0-beta-1
===================================================================
--- trunk 2014-02-15 19:37:54 UTC (rev 1563)
+++ tags/esigate-5.0-beta-1 2014-02-15 19:38:05 UTC (rev 1564)
Property changes on: tags/esigate-5.0-beta-1
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,4 ##
+target
+.classpath
+.project
+.settings
Added: svn:mergeinfo
## -0,0 +1 ##
+/branches/esigate-5.0-httpclient-4.3-update:1320-1512
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 19:37:58
|
Revision: 1563
http://sourceforge.net/p/webassembletool/code/1563
Author: nricheton
Date: 2014-02-15 19:37:54 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
[maven-release-plugin] prepare release esigate-5.0-beta-1
Modified Paths:
--------------
trunk/esigate-app-aggregated1/pom.xml
trunk/esigate-app-aggregated2/pom.xml
trunk/esigate-app-aggregator/pom.xml
trunk/esigate-app-cas/pom.xml
trunk/esigate-app-casified-aggregated1/pom.xml
trunk/esigate-app-casified-aggregated2/pom.xml
trunk/esigate-app-casified-aggregator/pom.xml
trunk/esigate-app-master/pom.xml
trunk/esigate-app-provider/pom.xml
trunk/esigate-cas/pom.xml
trunk/esigate-core/pom.xml
trunk/esigate-distribution/pom.xml
trunk/esigate-server/pom.xml
trunk/esigate-servlet/pom.xml
trunk/esigate-war/pom.xml
trunk/pom.xml
Modified: trunk/esigate-app-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-aggregated1/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-app-aggregated1/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-aggregated1</finalName>
Modified: trunk/esigate-app-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-aggregated2/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-app-aggregated2/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-aggregated2</finalName>
Modified: trunk/esigate-app-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-aggregator/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-app-aggregator/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-cas/pom.xml
===================================================================
--- trunk/esigate-app-cas/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-app-cas/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-cas</finalName>
Modified: trunk/esigate-app-casified-aggregated1/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-app-casified-aggregated1/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated1</finalName>
Modified: trunk/esigate-app-casified-aggregated2/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-app-casified-aggregated2/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-casified-aggregated2</finalName>
Modified: trunk/esigate-app-casified-aggregator/pom.xml
===================================================================
--- trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-app-casified-aggregator/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -1,5 +1,4 @@
-<project 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">
+<project 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>
<artifactId>esigate-app-casified-aggregator</artifactId>
<packaging>war</packaging>
@@ -7,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-master/pom.xml
===================================================================
--- trunk/esigate-app-master/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-app-master/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-app-provider/pom.xml
===================================================================
--- trunk/esigate-app-provider/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-app-provider/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<build>
<finalName>esigate-app-provider</finalName>
Modified: trunk/esigate-cas/pom.xml
===================================================================
--- trunk/esigate-cas/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-cas/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -1,12 +1,11 @@
-<project 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">
+<project 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>
<artifactId>esigate-cas</artifactId>
<name>esigate-cas</name>
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-core/pom.xml
===================================================================
--- trunk/esigate-core/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-core/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -1,12 +1,11 @@
-<project 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">
+<project 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>
<artifactId>esigate-core</artifactId>
<name>esigate-core</name>
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-distribution/pom.xml
===================================================================
--- trunk/esigate-distribution/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-distribution/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -6,7 +6,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-server/pom.xml
===================================================================
--- trunk/esigate-server/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-server/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -1,11 +1,10 @@
-<project 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/xsd/maven-4.0.0.xsd">
+<project 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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>esigate-server</artifactId>
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<name>ESIGate server</name>
<description>Standalone server for development. Can be run using java -jar esigate-server-<version>.jar -Desigate.config=<config file></description>
@@ -88,8 +87,7 @@
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
<transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.esigate.server.EsigateServer</mainClass>
</transformer>
</transformers>
Modified: trunk/esigate-servlet/pom.xml
===================================================================
--- trunk/esigate-servlet/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-servlet/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -1,12 +1,11 @@
-<project 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">
+<project 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>
<artifactId>esigate-servlet</artifactId>
<name>esigate-servlet</name>
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/esigate-war/pom.xml
===================================================================
--- trunk/esigate-war/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/esigate-war/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -5,7 +5,7 @@
<parent>
<artifactId>esigate</artifactId>
<groupId>org.esigate</groupId>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
</parent>
<name>ESIGate web application</name>
<description>ESIGate war application which can be deployed "as-is" or customized for your needs.</description>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
+++ trunk/pom.xml 2014-02-15 19:37:54 UTC (rev 1563)
@@ -1,5 +1,4 @@
-<project 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">
+<project 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.sonatype.oss</groupId>
@@ -13,7 +12,7 @@
<artifactId>esigate</artifactId>
<packaging>pom</packaging>
<name>esigate</name>
- <version>5.0-SNAPSHOT</version>
+ <version>5.0-beta-1</version>
<inceptionYear>2008</inceptionYear>
<mailingLists>
<mailingList>
@@ -96,9 +95,9 @@
</developer>
</developers>
<scm>
- <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</developerConnection>
- <url>http://svn.code.sf.net/p/webassembletool/code/trunk/</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</developerConnection>
+ <url>http://svn.code.sf.net/p/webassembletool/code/tags/esigate-5.0-beta-1</url>
</scm>
<build>
<pluginManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 17:54:34
|
Revision: 1562
http://sourceforge.net/p/webassembletool/code/1562
Author: nricheton
Date: 2014-02-15 17:54:30 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
Update to jetty 9.1.2
Modified Paths:
--------------
trunk/esigate-server/pom.xml
Modified: trunk/esigate-server/pom.xml
===================================================================
--- trunk/esigate-server/pom.xml 2014-02-15 14:59:38 UTC (rev 1561)
+++ trunk/esigate-server/pom.xml 2014-02-15 17:54:30 UTC (rev 1562)
@@ -172,6 +172,6 @@
</dependencies>
</dependencyManagement>
<properties>
- <jetty.version>9.1.0.RC1</jetty.version>
+ <jetty.version>9.1.2.v20140210</jetty.version>
</properties>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-15 14:59:41
|
Revision: 1561
http://sourceforge.net/p/webassembletool/code/1561
Author: nricheton
Date: 2014-02-15 14:59:38 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
Fix for work dir deletion
Modified Paths:
--------------
trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java
Modified: trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java
===================================================================
--- trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java 2014-02-14 14:20:42 UTC (rev 1560)
+++ trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java 2014-02-15 14:59:38 UTC (rev 1561)
@@ -205,7 +205,14 @@
workDir = new File(currentDir, "work");
// }
if (workDir.exists()) {
- FileUtils.deleteDirectory(workDir);
+ try {
+ FileUtils.cleanDirectory(workDir);
+ } catch (IllegalArgumentException e) {
+ // Strange behavior : if this directory exists, it disappears a
+ // few ms later, causing this exception. We can ignore since we
+ // initially wanted to delete it.
+ System.out.println("Info: issue while deleting work directory, it was already deleted. Not a problem.");
+ }
}
return workDir;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-14 14:20:46
|
Revision: 1560
http://sourceforge.net/p/webassembletool/code/1560
Author: nricheton
Date: 2014-02-14 14:20:42 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
refactoring working dir cleanup
Modified Paths:
--------------
trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java
Modified: trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java
===================================================================
--- trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java 2014-02-14 10:28:57 UTC (rev 1559)
+++ trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java 2014-02-14 14:20:42 UTC (rev 1560)
@@ -46,268 +46,275 @@
*
*
* <p>
- * Inspiration from Ole Christian Rynning (http://open.bekk.no/embedded-jetty-7-webapp-executable-with-maven/)
+ * Inspiration from Ole Christian Rynning
+ * (http://open.bekk.no/embedded-jetty-7-webapp-executable-with-maven/)
*
* @author Nicolas Richeton
*
*/
public final class EsigateServer {
- private static String contextPath;
- private static int controlPort;
- private static String extraClasspath;
- private static long idleTimeout = 0;
- private static int maxThreads = 0;
- private static int minThreads = 0;
- private static int outputBufferSize = 0;
- private static int port;
- private static final int PROPERTY_DEFAULT_CONTROL_PORT = 8081;
- private static final int PROPERTY_DEFAULT_HTTP_PORT = 8080;
- private static final String PROPERTY_PREFIX = "server.";
- private static Server srv = null;
+ private static String contextPath;
+ private static int controlPort;
+ private static String extraClasspath;
+ private static long idleTimeout = 0;
+ private static int maxThreads = 0;
+ private static int minThreads = 0;
+ private static int outputBufferSize = 0;
+ private static int port;
+ private static final int PROPERTY_DEFAULT_CONTROL_PORT = 8081;
+ private static final int PROPERTY_DEFAULT_HTTP_PORT = 8080;
+ private static final String PROPERTY_PREFIX = "server.";
+ private static Server srv = null;
- private EsigateServer() {
+ private EsigateServer() {
- }
+ }
- /**
- * Get an integer from System properties
- *
- * @param prefix
- * @param name
- * @param defaultValue
- * @return
- */
- private static int getProperty(String prefix, String name, int defaultValue) {
- int result = defaultValue;
+ /**
+ * Get an integer from System properties
+ *
+ * @param prefix
+ * @param name
+ * @param defaultValue
+ * @return
+ */
+ private static int getProperty(String prefix, String name, int defaultValue) {
+ int result = defaultValue;
- try {
- result = Integer.parseInt(System.getProperty(prefix + name));
- } catch (NumberFormatException e) {
- System.err.println("Value for " + prefix + name + " must be an integer. Using default " + defaultValue);
- }
- return result;
- }
+ try {
+ result = Integer.parseInt(System.getProperty(prefix + name));
+ } catch (NumberFormatException e) {
+ System.err.println("Value for " + prefix + name + " must be an integer. Using default " + defaultValue);
+ }
+ return result;
+ }
- /**
- * Get String from System properties
- *
- * @param prefix
- * @param name
- * @param defaultValue
- * @return
- */
- private static String getProperty(String prefix, String name, String defaultValue) {
- return System.getProperty(prefix + name, defaultValue);
- }
+ /**
+ * Get String from System properties
+ *
+ * @param prefix
+ * @param name
+ * @param defaultValue
+ * @return
+ */
+ private static String getProperty(String prefix, String name, String defaultValue) {
+ return System.getProperty(prefix + name, defaultValue);
+ }
- /**
- * Read server configuration from System properties and from server.properties.
- */
- public static void init() {
+ /**
+ * Read server configuration from System properties and from
+ * server.properties.
+ */
+ public static void init() {
- // Get configuration
+ // Get configuration
- // Read from "server.properties" or custom file.
- String configFile = null;
- Properties serverProperties = new Properties();
- try {
- configFile = System.getProperty(PROPERTY_PREFIX + "config", "server.properties");
- System.out.println("Loading server configuration from " + configFile);
+ // Read from "server.properties" or custom file.
+ String configFile = null;
+ Properties serverProperties = new Properties();
+ try {
+ configFile = System.getProperty(PROPERTY_PREFIX + "config", "server.properties");
+ System.out.println("Loading server configuration from " + configFile);
- try (InputStream is = new FileInputStream(configFile);) {
- serverProperties.load(is);
- }
+ try (InputStream is = new FileInputStream(configFile);) {
+ serverProperties.load(is);
+ }
- } catch (FileNotFoundException e) {
- System.out.println(configFile + " not found.");
- } catch (IOException e) {
- System.out.println("Unexpected error reading " + configFile);
- }
+ } catch (FileNotFoundException e) {
+ System.out.println(configFile + " not found.");
+ } catch (IOException e) {
+ System.out.println("Unexpected error reading " + configFile);
+ }
- init(serverProperties);
- }
+ init(serverProperties);
+ }
- /**
- * Set the provided server configuration then read configuration from System properties or load defaults.
- *
- * @param configuration
- * configuration to use.
- */
- public static void init(Properties configuration) {
+ /**
+ * Set the provided server configuration then read configuration from System
+ * properties or load defaults.
+ *
+ * @param configuration
+ * configuration to use.
+ */
+ public static void init(Properties configuration) {
- for (Object prop : configuration.keySet()) {
- String serverPropertyName = (String) prop;
- System.setProperty(PROPERTY_PREFIX + serverPropertyName, configuration.getProperty(serverPropertyName));
- }
+ for (Object prop : configuration.keySet()) {
+ String serverPropertyName = (String) prop;
+ System.setProperty(PROPERTY_PREFIX + serverPropertyName, configuration.getProperty(serverPropertyName));
+ }
- // Read system properties
- System.out.println("Using configuration provided using '-D' parameter and/or default values");
- EsigateServer.port = getProperty(PROPERTY_PREFIX, "port", PROPERTY_DEFAULT_HTTP_PORT);
- EsigateServer.controlPort = getProperty(PROPERTY_PREFIX, "controlPort", PROPERTY_DEFAULT_CONTROL_PORT);
- EsigateServer.contextPath = getProperty(PROPERTY_PREFIX, "contextPath", "/");
- EsigateServer.extraClasspath = getProperty(PROPERTY_PREFIX, "extraClasspath", null);
- EsigateServer.maxThreads = getProperty(PROPERTY_PREFIX, "maxThreads", 500);
- EsigateServer.minThreads = getProperty(PROPERTY_PREFIX, "minThreads", 40);
- EsigateServer.outputBufferSize = getProperty(PROPERTY_PREFIX, "outputBufferSize", 8 * 1024);
- EsigateServer.idleTimeout = getProperty(PROPERTY_PREFIX, "idleTimeout", 30 * 1000);
- }
+ // Read system properties
+ System.out.println("Using configuration provided using '-D' parameter and/or default values");
+ EsigateServer.port = getProperty(PROPERTY_PREFIX, "port", PROPERTY_DEFAULT_HTTP_PORT);
+ EsigateServer.controlPort = getProperty(PROPERTY_PREFIX, "controlPort", PROPERTY_DEFAULT_CONTROL_PORT);
+ EsigateServer.contextPath = getProperty(PROPERTY_PREFIX, "contextPath", "/");
+ EsigateServer.extraClasspath = getProperty(PROPERTY_PREFIX, "extraClasspath", null);
+ EsigateServer.maxThreads = getProperty(PROPERTY_PREFIX, "maxThreads", 500);
+ EsigateServer.minThreads = getProperty(PROPERTY_PREFIX, "minThreads", 40);
+ EsigateServer.outputBufferSize = getProperty(PROPERTY_PREFIX, "outputBufferSize", 8 * 1024);
+ EsigateServer.idleTimeout = getProperty(PROPERTY_PREFIX, "idleTimeout", 30 * 1000);
+ }
- /**
- * Returns current control port.
- *
- * @return current control port.
- */
- public static int getControlPort() {
- return controlPort;
- }
+ /**
+ * Returns current control port.
+ *
+ * @return current control port.
+ */
+ public static int getControlPort() {
+ return controlPort;
+ }
- /**
- * Esigate Server entry point.
- *
- * @param args
- * command line arguments.
- * @throws Exception
- * when server cannot be started.
- */
- public static void main(String[] args) throws Exception {
+ /**
+ * Esigate Server entry point.
+ *
+ * @param args
+ * command line arguments.
+ * @throws Exception
+ * when server cannot be started.
+ */
+ public static void main(String[] args) throws Exception {
- if (args.length < 1) {
- EsigateServer.usage();
- return;
- }
+ if (args.length < 1) {
+ EsigateServer.usage();
+ return;
+ }
- switch (args[0]) {
- case "start":
- EsigateServer.init();
- EsigateServer.start();
- break;
+ switch (args[0]) {
+ case "start":
+ EsigateServer.init();
+ EsigateServer.start();
+ break;
- case "stop":
- EsigateServer.stop();
- break;
+ case "stop":
+ EsigateServer.stop();
+ break;
- default:
- EsigateServer.usage();
- break;
- }
- }
+ default:
+ EsigateServer.usage();
+ break;
+ }
+ }
- private static void resetTempDirectory(WebAppContext context, String currentDir) throws IOException {
- File workDir;
- // Currently disabled because this may be dangerous.
- // if (EsigateServer.workPath != null) {
- // workDir = new File(EsigateServer.workPath);
- // } else {
- workDir = new File(currentDir, "work");
- // }
- if( workDir.exists()){
- FileUtils.deleteDirectory(workDir);
- }
- context.setTempDirectory(workDir);
- }
+ private static File resetTempDirectory(String currentDir) throws IOException {
+ File workDir;
+ // Currently disabled because this may be dangerous.
+ // if (EsigateServer.workPath != null) {
+ // workDir = new File(EsigateServer.workPath);
+ // } else {
+ workDir = new File(currentDir, "work");
+ // }
+ if (workDir.exists()) {
+ FileUtils.deleteDirectory(workDir);
+ }
- /**
- * Create and start server.
- *
- * @throws Exception
- * when server cannot be started.
- */
- public static void start() throws Exception {
- MetricRegistry registry = new MetricRegistry();
+ return workDir;
- QueuedThreadPool threadPool = new InstrumentedQueuedThreadPool(registry);
- threadPool.setName("esigate");
- threadPool.setMaxThreads(maxThreads);
- threadPool.setMinThreads(minThreads);
+ }
- srv = new Server(threadPool);
- srv.setStopAtShutdown(true);
- srv.setStopTimeout(5000);
+ /**
+ * Create and start server.
+ *
+ * @throws Exception
+ * when server cannot be started.
+ */
+ public static void start() throws Exception {
+ MetricRegistry registry = new MetricRegistry();
- // HTTP Configuration
- HttpConfiguration httpConfig = new HttpConfiguration();
- httpConfig.setOutputBufferSize(outputBufferSize);
- httpConfig.setSendServerVersion(false);
- Timer processTime = registry.timer("processTime");
+ QueuedThreadPool threadPool = new InstrumentedQueuedThreadPool(registry);
+ threadPool.setName("esigate");
+ threadPool.setMaxThreads(maxThreads);
+ threadPool.setMinThreads(minThreads);
- try (ServerConnector connector = new InstrumentedServerConnector("main", EsigateServer.port, srv, registry,
- new InstrumentedConnectionFactory(new HttpConnectionFactory(httpConfig), processTime));
- ServerConnector controlConnector = new ServerConnector(srv)) {
+ srv = new Server(threadPool);
+ srv.setStopAtShutdown(true);
+ srv.setStopTimeout(5000);
- // Main connector
- connector.setIdleTimeout(EsigateServer.idleTimeout);
- connector.setSoLingerTime(-1);
- connector.setName("main");
- connector.setAcceptQueueSize(200);
+ // HTTP Configuration
+ HttpConfiguration httpConfig = new HttpConfiguration();
+ httpConfig.setOutputBufferSize(outputBufferSize);
+ httpConfig.setSendServerVersion(false);
+ Timer processTime = registry.timer("processTime");
- // Control connector
- controlConnector.setHost("127.0.0.1");
- controlConnector.setPort(EsigateServer.controlPort);
- controlConnector.setName("control");
+ try (ServerConnector connector = new InstrumentedServerConnector("main", EsigateServer.port, srv, registry,
+ new InstrumentedConnectionFactory(new HttpConnectionFactory(httpConfig), processTime));
+ ServerConnector controlConnector = new ServerConnector(srv)) {
- srv.setConnectors(new Connector[] { connector, controlConnector });
- // War
- ProtectionDomain protectionDomain = EsigateServer.class.getProtectionDomain();
- String warFile = protectionDomain.getCodeSource().getLocation().toExternalForm();
- String currentDir = new File(protectionDomain.getCodeSource().getLocation().getPath()).getParent();
+ // Main connector
+ connector.setIdleTimeout(EsigateServer.idleTimeout);
+ connector.setSoLingerTime(-1);
+ connector.setName("main");
+ connector.setAcceptQueueSize(200);
- WebAppContext context = new WebAppContext(warFile, EsigateServer.contextPath);
- context.setServer(srv);
+ // Control connector
+ controlConnector.setHost("127.0.0.1");
+ controlConnector.setPort(EsigateServer.controlPort);
+ controlConnector.setName("control");
- // Add extra classpath (allows to add extensions).
- if (EsigateServer.extraClasspath != null) {
- context.setExtraClasspath(EsigateServer.extraClasspath);
- }
- resetTempDirectory(context, currentDir);
+ srv.setConnectors(new Connector[] { connector, controlConnector });
+ // War
+ ProtectionDomain protectionDomain = EsigateServer.class.getProtectionDomain();
+ String warFile = protectionDomain.getCodeSource().getLocation().toExternalForm();
+ String currentDir = new File(protectionDomain.getCodeSource().getLocation().getPath()).getParent();
- // Add the handlers
- HandlerCollection handlers = new HandlerList();
- // control handler must be the first one.
- // Work in progress, currently disabled.
- handlers.addHandler(new ControlHandler(registry));
- InstrumentedHandler ih = new InstrumentedHandler(registry);
- ih.setName("main");
- ih.setHandler(context);
- handlers.addHandler(ih);
+ File workDir = resetTempDirectory(currentDir);
- srv.setHandler(handlers);
- srv.start();
- srv.join();
+ WebAppContext context = new WebAppContext(warFile, EsigateServer.contextPath);
+ context.setServer(srv);
+ context.setTempDirectory(workDir);
- }
+ // Add extra classpath (allows to add extensions).
+ if (EsigateServer.extraClasspath != null) {
+ context.setExtraClasspath(EsigateServer.extraClasspath);
+ }
- }
+ // Add the handlers
+ HandlerCollection handlers = new HandlerList();
+ // control handler must be the first one.
+ // Work in progress, currently disabled.
+ handlers.addHandler(new ControlHandler(registry));
+ InstrumentedHandler ih = new InstrumentedHandler(registry);
+ ih.setName("main");
+ ih.setHandler(context);
+ handlers.addHandler(ih);
- /**
- * Check if server is started.
- *
- * @return true if started.
- */
- public static boolean isStarted() {
- if (srv == null) {
- return false;
- }
- return srv.isStarted();
- }
+ srv.setHandler(handlers);
+ srv.start();
+ srv.join();
- /**
- * Send a shutdown request to esigate server.
- */
- public static void stop() {
- ControlHandler.shutdown(EsigateServer.controlPort);
- }
+ }
- /**
- * Display usage informations.
- */
- private static void usage() {
- StringBuffer usageText = new StringBuffer();
- usageText.append("Usage: java -Desigate.config=esigate.properties -jar esigate-server.jar [start|stop]\n\t");
- usageText.append("start Start the server (default)\n\t");
- usageText.append("stop Stop the server gracefully\n\t");
+ }
- System.out.println(usageText.toString());
- System.exit(-1);
- }
+ /**
+ * Check if server is started.
+ *
+ * @return true if started.
+ */
+ public static boolean isStarted() {
+ if (srv == null) {
+ return false;
+ }
+ return srv.isStarted();
+ }
+
+ /**
+ * Send a shutdown request to esigate server.
+ */
+ public static void stop() {
+ ControlHandler.shutdown(EsigateServer.controlPort);
+ }
+
+ /**
+ * Display usage informations.
+ */
+ private static void usage() {
+ StringBuffer usageText = new StringBuffer();
+ usageText.append("Usage: java -Desigate.config=esigate.properties -jar esigate-server.jar [start|stop]\n\t");
+ usageText.append("start Start the server (default)\n\t");
+ usageText.append("stop Stop the server gracefully\n\t");
+
+ System.out.println(usageText.toString());
+ System.exit(-1);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-14 10:29:00
|
Revision: 1559
http://sourceforge.net/p/webassembletool/code/1559
Author: nricheton
Date: 2014-02-14 10:28:57 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
fix work dir deletion if it doesn't exist
Modified Paths:
--------------
trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java
Modified: trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java
===================================================================
--- trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java 2014-02-14 10:14:23 UTC (rev 1558)
+++ trunk/esigate-server/src/main/java/org/esigate/server/EsigateServer.java 2014-02-14 10:28:57 UTC (rev 1559)
@@ -201,7 +201,9 @@
// } else {
workDir = new File(currentDir, "work");
// }
- FileUtils.deleteDirectory(workDir);
+ if( workDir.exists()){
+ FileUtils.deleteDirectory(workDir);
+ }
context.setTempDirectory(workDir);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-14 10:14:30
|
Revision: 1558
http://sourceforge.net/p/webassembletool/code/1558
Author: nricheton
Date: 2014-02-14 10:14:23 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
secure connection for svn
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-02-14 10:03:34 UTC (rev 1557)
+++ trunk/pom.xml 2014-02-14 10:14:23 UTC (rev 1558)
@@ -96,7 +96,7 @@
</developer>
</developers>
<scm>
- <connection>scm:svn:http://svn.code.sf.net/p/webassembletool/code/trunk</connection>
+ <connection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</connection>
<developerConnection>scm:svn:https://svn.code.sf.net/p/webassembletool/code/trunk</developerConnection>
<url>http://svn.code.sf.net/p/webassembletool/code/trunk/</url>
</scm>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nri...@us...> - 2014-02-14 10:03:38
|
Revision: 1557
http://sourceforge.net/p/webassembletool/code/1557
Author: nricheton
Date: 2014-02-14 10:03:34 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
fix xml formating -> mvn argument issue with line breaks on release
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-02-06 22:39:22 UTC (rev 1556)
+++ trunk/pom.xml 2014-02-14 10:03:34 UTC (rev 1557)
@@ -140,10 +140,7 @@
</dependencies>
<configuration>
<goals>source:jar javadoc:jar deploy site:site site:deploy</goals>
-
- <arguments>-pl
- esigate-server,esigate-cas,esigate-distribution
- -am</arguments>
+ <arguments>-pl esigate-server,esigate-cas,esigate-distribution -am</arguments>
</configuration>
</plugin>
<plugin>
@@ -662,7 +659,7 @@
<module>esigate-app-casified-aggregated1</module>
<module>esigate-app-casified-aggregated2</module>
<module>esigate-app-casified-aggregator</module>
-
+
<module>esigate-war</module>
<module>esigate-server</module>
<module>esigate-distribution</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fxb...@us...> - 2014-02-06 22:39:30
|
Revision: 1556
http://sourceforge.net/p/webassembletool/code/1556
Author: fxbonnet
Date: 2014-02-06 22:39:22 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
0000285: Refactor URL rewriting code
https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=285
Moved most code from ResourceFixupRenderer to UrlRewriter
Modified Paths:
--------------
trunk/esigate-core/src/main/java/org/esigate/Driver.java
trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java
trunk/esigate-core/src/main/java/org/esigate/cache/CacheAdapter.java
trunk/esigate-core/src/main/java/org/esigate/extension/ResourceFixup.java
trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java
trunk/esigate-core/src/main/java/org/esigate/renderers/ResourceFixupRenderer.java
trunk/esigate-core/src/test/java/org/esigate/DriverTest.java
trunk/esigate-core/src/test/java/org/esigate/cookie/DefaultCookieManagerTest.java
trunk/esigate-core/src/test/java/org/esigate/renderers/ResourceFixupRendererTest.java
Added Paths:
-----------
trunk/esigate-core/src/main/java/org/esigate/impl/UrlRewriter.java
trunk/esigate-core/src/test/java/org/esigate/impl/UrlRewriterTest.java
Modified: trunk/esigate-core/src/main/java/org/esigate/Driver.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/Driver.java 2014-02-06 08:24:44 UTC (rev 1555)
+++ trunk/esigate-core/src/main/java/org/esigate/Driver.java 2014-02-06 22:39:22 UTC (rev 1556)
@@ -39,6 +39,7 @@
import org.esigate.http.IncomingRequest;
import org.esigate.http.ResourceUtils;
import org.esigate.impl.DriverRequest;
+import org.esigate.impl.UrlRewriter;
import org.esigate.util.UriUtils;
import org.esigate.vars.VariablesResolver;
import org.slf4j.Logger;
@@ -60,6 +61,7 @@
private EventManager eventManager;
private RequestExecutor requestExecutor;
private ContentTypeHelper contentTypeHelper;
+ private UrlRewriter urlRewriter;
public static class DriverBuilder {
private Driver driver = new Driver();
@@ -84,6 +86,7 @@
ExtensionFactory.getExtensions(properties, Parameters.EXTENSIONS, driver);
driver.requestExecutor = requestExecutorBuilder.setDriver(driver).setEventManager(driver.eventManager)
.setProperties(properties).setContentTypeHelper(driver.contentTypeHelper).build();
+ driver.urlRewriter = new UrlRewriter(properties);
return driver;
}
@@ -397,4 +400,8 @@
return contentTypeHelper;
}
+ public UrlRewriter getUrlRewriter() {
+ return urlRewriter;
+ }
+
}
Modified: trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java 2014-02-06 08:24:44 UTC (rev 1555)
+++ trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java 2014-02-06 22:39:22 UTC (rev 1556)
@@ -23,7 +23,6 @@
import org.apache.commons.lang3.StringUtils;
import org.esigate.api.BaseUrlRetrieveStrategy;
import org.esigate.impl.UriMapping;
-import org.esigate.renderers.ResourceFixupRenderer;
import org.esigate.url.IpHashBaseUrlRetrieveStrategy;
import org.esigate.url.RoundRobinBaseUrlRetrieveStrategy;
import org.esigate.url.SingleBaseUrlRetrieveStrategy;
@@ -40,7 +39,6 @@
private final String instanceName;
private final String uriEncoding;
private final String visibleBaseURL;
- private final int fixMode;
private final Properties properties;
private final boolean preserveHost;
private final BaseUrlRetrieveStrategy baseUrlRetrieveStrategy;
@@ -54,12 +52,6 @@
preserveHost = Parameters.PRESERVE_HOST.getValueBoolean(props);
visibleBaseURL = Parameters.VISIBLE_URL_BASE.getValueString(props);
isVisibleBaseURLEmpty = StringUtils.isEmpty(visibleBaseURL);
- if ("absolute".equalsIgnoreCase(Parameters.FIX_MODE.getValueString(props))) {
- this.fixMode = ResourceFixupRenderer.ABSOLUTE;
- } else {
- this.fixMode = ResourceFixupRenderer.RELATIVE;
- }
-
this.uriMappings = parseMappings(props);
properties = props;
}
@@ -104,10 +96,6 @@
return urlStrategy;
}
- public int getFixMode() {
- return fixMode;
- }
-
public String getVisibleBaseURL(String currentBaseUrl) {
return isVisibleBaseURLEmpty ? currentBaseUrl : visibleBaseURL;
}
Modified: trunk/esigate-core/src/main/java/org/esigate/cache/CacheAdapter.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/cache/CacheAdapter.java 2014-02-06 08:24:44 UTC (rev 1555)
+++ trunk/esigate-core/src/main/java/org/esigate/cache/CacheAdapter.java 2014-02-06 22:39:22 UTC (rev 1556)
@@ -123,7 +123,8 @@
return (statusCode == HttpStatus.SC_OK || statusCode == HttpStatus.SC_MOVED_PERMANENTLY
|| statusCode == HttpStatus.SC_MOVED_TEMPORARILY || statusCode == HttpStatus.SC_NOT_FOUND
|| statusCode == HttpStatus.SC_INTERNAL_SERVER_ERROR
- || statusCode == HttpStatus.SC_SERVICE_UNAVAILABLE || statusCode == HttpStatus.SC_NOT_MODIFIED || statusCode == HttpStatus.SC_GATEWAY_TIMEOUT);
+ || statusCode == HttpStatus.SC_SERVICE_UNAVAILABLE
+ || statusCode == HttpStatus.SC_NOT_MODIFIED || statusCode == HttpStatus.SC_GATEWAY_TIMEOUT);
}
/**
Modified: trunk/esigate-core/src/main/java/org/esigate/extension/ResourceFixup.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/extension/ResourceFixup.java 2014-02-06 08:24:44 UTC (rev 1555)
+++ trunk/esigate-core/src/main/java/org/esigate/extension/ResourceFixup.java 2014-02-06 22:39:22 UTC (rev 1556)
@@ -3,7 +3,6 @@
import java.util.Properties;
import org.esigate.Driver;
-import org.esigate.DriverConfiguration;
import org.esigate.events.Event;
import org.esigate.events.EventDefinition;
import org.esigate.events.EventManager;
@@ -12,7 +11,6 @@
import org.esigate.renderers.ResourceFixupRenderer;
public class ResourceFixup implements Extension, IEventListener {
- private DriverConfiguration config;
@Override
public boolean event(EventDefinition id, Event event) {
@@ -20,8 +18,8 @@
RenderEvent renderEvent = (RenderEvent) event;
// Fix resources
String baseUrl = renderEvent.getOriginalRequest().getBaseUrl().toString();
- ResourceFixupRenderer fixup = new ResourceFixupRenderer(baseUrl, config.getVisibleBaseURL(baseUrl),
- renderEvent.getRemoteUrl(), config.getFixMode());
+ ResourceFixupRenderer fixup = new ResourceFixupRenderer(baseUrl, renderEvent.getRemoteUrl(), renderEvent
+ .getOriginalRequest().getDriver().getUrlRewriter());
// Add fixup renderer as first renderer.
renderEvent.getRenderers().add(0, fixup);
@@ -32,7 +30,6 @@
@Override
public void init(Driver driver, Properties properties) {
- this.config = driver.getConfiguration();
driver.getEventManager().register(EventManager.EVENT_RENDER_PRE, this);
}
Modified: trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java 2014-02-06 08:24:44 UTC (rev 1555)
+++ trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java 2014-02-06 22:39:22 UTC (rev 1556)
@@ -96,7 +96,8 @@
String uri = httpRequest.getRequestLine().getUri();
for (Header header : originalRequest.getAllHeaders()) {
// Special headers
- if (HttpHeaders.REFERER.equalsIgnoreCase(header.getName()) && isForwardedRequestHeader(HttpHeaders.REFERER)) {
+ if (HttpHeaders.REFERER.equalsIgnoreCase(header.getName())
+ && isForwardedRequestHeader(HttpHeaders.REFERER)) {
String value = header.getValue();
value = UriUtils.translateUrl(value, originalUri, uri);
httpRequest.addHeader(header.getName(), value);
Added: trunk/esigate-core/src/main/java/org/esigate/impl/UrlRewriter.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/impl/UrlRewriter.java (rev 0)
+++ trunk/esigate-core/src/main/java/org/esigate/impl/UrlRewriter.java 2014-02-06 22:39:22 UTC (rev 1556)
@@ -0,0 +1,214 @@
+/*
+ * Licensed 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.
+ *
+ */
+
+package org.esigate.impl;
+
+import static org.apache.commons.lang3.StringUtils.stripEnd;
+import static org.apache.commons.lang3.StringUtils.stripStart;
+
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.http.HttpHost;
+import org.esigate.Parameters;
+import org.esigate.util.UriUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * "fixes" links to resources, images and pages in pages retrieved by esigate :
+ * <ul>
+ * <li>Current-path-relative urls are converted to full path relative urls ( img/test.img ->
+ * /myapp/curentpath/img/test.img)</li>
+ * <li>All relative urls can be converted to absolute urls (including server name)</li>
+ * </ul>
+ *
+ * This enables use of esigate without any special modifications of the generated urls on the provider side.
+ *
+ * All href and src attributes are processed, except javascript links.
+ *
+ * @author Nicolas Richeton
+ *
+ */
+public final class UrlRewriter {
+ private static final Logger LOG = LoggerFactory.getLogger(UrlRewriter.class);
+
+ public static final int ABSOLUTE = 0;
+ public static final int RELATIVE = 1;
+
+ private static final Pattern URL_PATTERN = Pattern.compile(
+ "<([^\\!][^>]+)(src|href|action|background)\\s*=\\s*('[^<']*'|\"[^<\"]*\")([^>]*)>",
+ Pattern.CASE_INSENSITIVE);
+
+ private String visibleBaseUrlParameter;
+ private int mode;
+
+ /**
+ * Creates a renderer which fixes urls. The domain name and the url path are computed from the full url made of
+ * baseUrl + pageFullPath.
+ *
+ * If mode is ABSOLUTE, all relative urls will be replaced by the full urls :
+ * <ul>
+ * <li>images/image.png is replaced by http://server/context/images/image.png</li>
+ * <li>/context/images/image.png is replaced by http://server/context/images/image.png</li>
+ * </ul>
+ *
+ * If mode is RELATIVE, context will be added to relative urls :
+ * <ul>
+ * <li>images/image.png is replaced by /context/images/image.png</li>
+ * </ul>
+ *
+ * @param properties
+ * Configuration properties
+ *
+ */
+ public UrlRewriter(Properties properties) {
+ if ("absolute".equalsIgnoreCase(Parameters.FIX_MODE.getValueString(properties))) {
+ mode = ABSOLUTE;
+ } else {
+ mode = RELATIVE;
+ }
+ visibleBaseUrlParameter = stripEnd(Parameters.VISIBLE_URL_BASE.getValueString(properties), "/");
+ }
+
+ private String concatUrl(String begin, String end) {
+ return stripEnd(begin, "/") + "/" + stripStart(end, "/");
+ }
+
+ /**
+ * Fix an url according to the chosen mode.
+ *
+ * @param url
+ * the url to fix.
+ * @param requestUrl
+ * The request URL.
+ * @param baseUrl
+ * The base URL selected for this request.
+ *
+ * @return the fixed url.
+ */
+ public String rewriteUrl(String url, String requestUrl, String baseUrl) {
+ if (url.isEmpty()) {
+ LOG.debug("skip empty url");
+ return url;
+ }
+
+ // Store the filename, if specified
+ String fileName = null;
+ if (!requestUrl.isEmpty() && !requestUrl.endsWith("/")) {
+ fileName = requestUrl.substring(requestUrl.lastIndexOf('/') + 1);
+ }
+
+ // Build clean URI for further processing
+ String cleanBaseUrl = stripEnd(baseUrl, "/");
+ String visibleBaseUrl = visibleBaseUrlParameter;
+ if (visibleBaseUrl == null) {
+ visibleBaseUrl = cleanBaseUrl;
+ }
+ String visibleBaseUrlPath = UriUtils.getPath(visibleBaseUrl);
+ String pagePath = concatUrl(visibleBaseUrlPath, requestUrl);
+ if (pagePath != null) {
+ int indexSlash = pagePath.lastIndexOf('/');
+ if (indexSlash >= 0) {
+ pagePath = pagePath.substring(0, indexSlash);
+ }
+ }
+
+ String result = url;
+ if (visibleBaseUrl != null && result.startsWith(cleanBaseUrl)) {
+ result = visibleBaseUrl + result.substring(cleanBaseUrl.length());
+ LOG.debug("fix absolute url: {} -> {} ", url, result);
+ return result;
+ }
+
+ // Keep absolute, protocol-absolute and javascript urls untouched.
+ if (result.startsWith("http://") || result.startsWith("https://") || result.startsWith("//")
+ || result.startsWith("#") || result.startsWith("javascript:")) {
+ LOG.debug("keeping absolute url: {}", result);
+ return result;
+ }
+
+ HttpHost httpHost = UriUtils.extractHost(visibleBaseUrl);
+ String server = httpHost.toURI();
+
+ // Add domain to context absolute urls
+ if (result.startsWith("/")) {
+
+ // Check if we are going to replace context
+ if (cleanBaseUrl != null && !cleanBaseUrl.equals(visibleBaseUrl)) {
+ String baseUrlPath = UriUtils.getPath(cleanBaseUrl);
+ if (result.startsWith(baseUrlPath)) {
+ result = result.substring(baseUrlPath.length());
+ result = concatUrl(visibleBaseUrlPath, result);
+ }
+ }
+
+ if (mode == ABSOLUTE) {
+ result = server + result;
+ }
+ } else {
+
+ if (result.charAt(0) == '?' && fileName != null) {
+ result = fileName + result;
+ }
+
+ // Process relative urls
+ if (mode == ABSOLUTE) {
+ result = server + pagePath + "/" + result;
+ } else {
+ result = pagePath + "/" + result;
+ }
+ }
+
+ LOG.debug("url fixed: {} -> {}", url, result);
+ return result;
+ }
+
+ /**
+ * Fix all resources urls and return the result.
+ *
+ * @param input
+ * The original charSequence to be processed.
+ * @param requestUrl
+ * The request URL.
+ * @param baseUrlParam
+ * The base URL selected for this request.
+ *
+ * @return the result of this renderer.
+ */
+ public CharSequence rewriteHtml(CharSequence input, String requestUrl, String baseUrlParam) {
+ StringBuffer result = new StringBuffer(input.length());
+ Matcher m = URL_PATTERN.matcher(input);
+ while (m.find()) {
+ LOG.trace("found match: {}", m);
+ String url = input.subSequence(m.start(3) + 1, m.end(3) - 1).toString();
+ url = rewriteUrl(url, requestUrl, baseUrlParam);
+ url = url.replaceAll("\\$", "\\\\\\$"); // replace '$' -> '\$' as it
+ // denotes group
+ StringBuffer tagReplacement = new StringBuffer("<$1$2=\"").append(url).append("\"");
+ if (m.groupCount() > 3) {
+ tagReplacement.append("$4");
+ }
+ tagReplacement.append('>');
+ LOG.trace("replacement: {}", tagReplacement);
+ m.appendReplacement(result, tagReplacement.toString());
+ }
+ m.appendTail(result);
+
+ return result;
+ }
+
+}
Modified: trunk/esigate-core/src/main/java/org/esigate/renderers/ResourceFixupRenderer.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/renderers/ResourceFixupRenderer.java 2014-02-06 08:24:44 UTC (rev 1555)
+++ trunk/esigate-core/src/main/java/org/esigate/renderers/ResourceFixupRenderer.java 2014-02-06 22:39:22 UTC (rev 1556)
@@ -15,19 +15,14 @@
package org.esigate.renderers;
-import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+import static org.apache.commons.lang3.StringUtils.stripEnd;
import java.io.IOException;
import java.io.Writer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.http.HttpHost;
import org.esigate.Renderer;
import org.esigate.impl.DriverRequest;
-import org.esigate.util.UriUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.esigate.impl.UrlRewriter;
/**
* This renderer "fixes" links to resources, images and pages in pages retrieved by esigate :
@@ -45,29 +40,11 @@
*
*/
public class ResourceFixupRenderer implements Renderer {
- private static final Logger LOG = LoggerFactory.getLogger(ResourceFixupRenderer.class);
+ private final String baseUrl;
+ private final String requestUrl;
+ private final UrlRewriter urlRewriter;
- public static final int ABSOLUTE = 0;
- public static final int RELATIVE = 1;
- private static final char SLASH = '/';
- private static final Pattern URL_PATTERN = Pattern.compile(
- "<([^\\!][^>]+)(src|href|action|background)\\s*=\\s*('[^<']*'|\"[^<\"]*\")([^>]*)>",
- Pattern.CASE_INSENSITIVE);
-
- private String contextAdd = null;
- private String contextRemove = null;
/**
- * Page path without the filename.
- */
- private String pagePath = null;
-
- private String fileName = null;
- private String server = null;
- private String baseUrl;
- private String replacementUrl;
- private final int mode;
-
- /**
* Creates a renderer which fixes urls. The domain name and the url path are computed from the full url made of
* baseUrl + pageFullPath.
*
@@ -84,171 +61,20 @@
*
* @param baseUrl
* Base url (same as configured in provider).
- * @param visibleBaseUrl
- * Visible Base url (same as configured in provider). Will replace the base url in rewritten urls.
- * @param pageFullPath
+ * @param requestUrl
* Page as used in tag lib or using API
- * @param mode
- * ResourceFixupRenderer.ABSOLUTE or ResourceFixupRenderer.RELATIVE
+ * @param urlRewriter
+ * The url rewriter for this provider
*/
- public ResourceFixupRenderer(String baseUrl, String visibleBaseUrl, String pageFullPath, int mode) {
- this.mode = mode;
- if (visibleBaseUrl != null && visibleBaseUrl.length() != 0) {
- this.baseUrl = removeLeadingSlash(baseUrl);
- this.replacementUrl = removeLeadingSlash(visibleBaseUrl);
- } else {
- this.baseUrl = null;
- this.replacementUrl = null;
- }
-
- // Clean up input
- String cleanBaseUrl = baseUrl;
- if (visibleBaseUrl != null) {
- cleanBaseUrl = visibleBaseUrl;
- }
- cleanBaseUrl = removeLeadingSlash(cleanBaseUrl);
-
- String cleanPageFullPath = pageFullPath;
- if (isNotEmpty(cleanPageFullPath) && cleanPageFullPath.charAt(0) == SLASH) {
- cleanPageFullPath = cleanPageFullPath.substring(1);
- }
-
- // Store the filename, if specified
- if (cleanPageFullPath.length() > 0 && cleanPageFullPath.charAt(cleanPageFullPath.length() - 1) != SLASH) {
- fileName = cleanPageFullPath.substring(cleanPageFullPath.lastIndexOf(SLASH) + 1);
- }
-
- // Build clean URI for further processing
- String url = cleanBaseUrl + SLASH + cleanPageFullPath;
- HttpHost httpHost = UriUtils.extractHost(url);
-
- // Split url
- server = httpHost.toURI();
- this.pagePath = UriUtils.getPath(url);
- if (pagePath != null) {
- int indexSlash = pagePath.lastIndexOf(SLASH);
- if (indexSlash >= 0) {
- pagePath = pagePath.substring(0, indexSlash);
- }
- }
-
- // Check if we are going to replace context
- if (baseUrl != null && !baseUrl.equals(visibleBaseUrl)) {
- contextRemove = UriUtils.getPath(baseUrl);
- contextAdd = UriUtils.getPath(visibleBaseUrl);
- }
+ public ResourceFixupRenderer(String baseUrl, String requestUrl, UrlRewriter urlRewriter) {
+ this.baseUrl = stripEnd(baseUrl, "/");
+ this.requestUrl = requestUrl;
+ this.urlRewriter = urlRewriter;
}
- /**
- * Remove the last character if it is a slash.
- *
- * @param src
- * url.
- * @return url without an ending slash.
- */
- private String removeLeadingSlash(String src) {
- int lastCharPosition = src.length() - 1;
- if (src.charAt(lastCharPosition) != SLASH) {
- return src;
- }
-
- return src.substring(0, lastCharPosition);
- }
-
- /**
- * Fix an url according to the chosen mode.
- *
- * @param urlParam
- * the url to fix.
- * @return the fixed url.
- */
- private String fixUrl(String urlParam) {
- String url = urlParam;
-
- // Do not process 0-length urls
- if (url.length() == 0) {
- return url;
- }
-
- if (replacementUrl != null && url.startsWith(baseUrl)) {
- url = new StringBuffer(replacementUrl).append(url.substring(baseUrl.length())).toString();
- LOG.debug("fix absolute url: {} -> {} ", urlParam, url);
- return url;
- }
-
- // Keep absolute, protocol-absolute and javascript urls untouched.
- if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("//") || url.startsWith("#")
- || url.startsWith("javascript:")) {
- LOG.debug("keeping absolute url: {}", url);
- return url;
- }
-
- // Add domain to context absolute urls
- if (url.charAt(0) == SLASH) {
-
- if (contextRemove != null && url.startsWith(contextRemove)) {
- url = url.substring(contextRemove.length());
- url = contextAdd + url;
- }
-
- if (mode == ABSOLUTE) {
- url = server + url;
- }
- } else {
-
- if (url.charAt(0) == '?' && fileName != null) {
- url = fileName + url;
- }
-
- // Process relative urls
- if (mode == ABSOLUTE) {
- url = server + pagePath + SLASH + url;
- } else {
- url = pagePath + SLASH + url;
- }
- }
-
- LOG.debug("url fixed: {} -> {}", urlParam, url);
- return url;
- }
-
@Override
public void render(DriverRequest httpRequest, String src, Writer out) throws IOException {
- out.write(replace(src).toString());
+ out.write(urlRewriter.rewriteHtml(src, requestUrl, baseUrl).toString());
}
- /**
- * Fix all resources urls and return the result.
- *
- * @param input
- * The original charSequence to be processed.
- *
- *
- * @return the result of this renderer.
- */
- private CharSequence replace(CharSequence input) {
- StringBuffer result = new StringBuffer(input.length());
- Matcher m = URL_PATTERN.matcher(input);
- while (m.find()) {
- LOG.trace("found match: {}", m);
- // m.group(3) matches to the attribute value including surrounded
- // quotes
- // String url = m.group(3);
- String url = input.subSequence(m.start(3) + 1, m.end(3) - 1).toString();
- url = fixUrl(url);
- url = url.replaceAll("\\$", "\\\\\\$"); // replace '$' -> '\$' as it
- // denotes group
- StringBuffer tagReplacement = new StringBuffer("<$1$2=\"").append(url).append("\"");
- if (m.groupCount() > 3) {
- tagReplacement.append("$4");
- }
- tagReplacement.append('>');
- LOG.trace("replacement: {}", tagReplacement);
- m.appendReplacement(result, tagReplacement.toString());
- }
- m.appendTail(result);
-
- return result;
- }
-
}
Modified: trunk/esigate-core/src/test/java/org/esigate/DriverTest.java
===================================================================
--- trunk/esigate-core/src/test/java/org/esigate/DriverTest.java 2014-02-06 08:24:44 UTC (rev 1555)
+++ trunk/esigate-core/src/test/java/org/esigate/DriverTest.java 2014-02-06 22:39:22 UTC (rev 1556)
@@ -133,7 +133,8 @@
} catch (HttpErrorPage e) {
driverResponse = e.getHttpResponse();
}
- assertEquals("Status code", HttpStatus.SC_INTERNAL_SERVER_ERROR, driverResponse.getStatusLine().getStatusCode());
+ assertEquals("Status code", HttpStatus.SC_INTERNAL_SERVER_ERROR, driverResponse
+ .getStatusLine().getStatusCode());
assertTrue("Header 'Dummy'", driverResponse.containsHeader("Dummy"));
}
@@ -155,7 +156,8 @@
} catch (HttpErrorPage e) {
driverResponse = e.getHttpResponse();
}
- assertEquals("Status code", HttpStatus.SC_INTERNAL_SERVER_ERROR, driverResponse.getStatusLine().getStatusCode());
+ assertEquals("Status code", HttpStatus.SC_INTERNAL_SERVER_ERROR, driverResponse.getStatusLine()
+ .getStatusCode());
assertFalse("Header 'Transfer-Encoding'", driverResponse.containsHeader("Transfer-Encoding"));
}
Modified: trunk/esigate-core/src/test/java/org/esigate/cookie/DefaultCookieManagerTest.java
===================================================================
--- trunk/esigate-core/src/test/java/org/esigate/cookie/DefaultCookieManagerTest.java 2014-02-06 08:24:44 UTC (rev 1555)
+++ trunk/esigate-core/src/test/java/org/esigate/cookie/DefaultCookieManagerTest.java 2014-02-06 22:39:22 UTC (rev 1556)
@@ -77,7 +77,8 @@
public void testFilter() throws HttpErrorPage {
IncomingRequest incomingRequest = TestUtils.createIncomingRequest()
.addCookie(new BasicClientCookie("a", "value a")).addCookie(new BasicClientCookie("b", "value b"))
- .addCookie(new BasicClientCookie("c", "value c")).addCookie(new BasicClientCookie("e", "value e")).build();
+ .addCookie(new BasicClientCookie("c", "value c")).addCookie(new BasicClientCookie("e", "value e"))
+ .build();
request = new DriverRequest(incomingRequest, driver, false);
List<org.apache.http.cookie.Cookie> cookies = cookieManager.getCookies(request);
assertNotNull(cookies);
Added: trunk/esigate-core/src/test/java/org/esigate/impl/UrlRewriterTest.java
===================================================================
--- trunk/esigate-core/src/test/java/org/esigate/impl/UrlRewriterTest.java (rev 0)
+++ trunk/esigate-core/src/test/java/org/esigate/impl/UrlRewriterTest.java 2014-02-06 22:39:22 UTC (rev 1556)
@@ -0,0 +1,284 @@
+/*
+ * Licensed 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.
+ *
+ */
+
+package org.esigate.impl;
+
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
+import org.esigate.Parameters;
+
+/**
+ * Tests on UrlRewriter.
+ *
+ * @author Francois-Xavier Bonnet
+ *
+ */
+public class UrlRewriterTest extends TestCase {
+
+ public static final UrlRewriter createUrlRewriter(String visibleBaseUrl, String mode) {
+ Properties properties = new Properties();
+ properties.put(Parameters.VISIBLE_URL_BASE, visibleBaseUrl);
+ properties.put(Parameters.FIX_MODE, mode);
+ return new UrlRewriter(properties);
+ }
+
+ public void testRenderBlock1() {
+ String base = "http://myapp/context";
+ String page = "templates/template1.html";
+ final String input = " <img src=\"images/logo.png\"/> <a href=\"/context/page/page1.htm\">link</a> "
+ + "<img src=\"http://www.google.com/logo.com\"/>";
+ final String expectedOutputRelative = " <img src=\"/context/templates/images/logo.png\"/> "
+ + "<a href=\"/context/page/page1.htm\">link</a> <img src=\"http://www.google.com/logo.com\"/>";
+ final String expectedOutputAbsolute = " <img src=\"http://myapp/context/templates/images/logo.png\"/> "
+ + "<a href=\"http://myapp/context/page/page1.htm\">link</a> "
+ + "<img src=\"http://www.google.com/logo.com\"/>";
+
+ UrlRewriter tested = createUrlRewriter(base, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputAbsolute, result);
+
+ tested = createUrlRewriter(base, "relative");
+ result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputRelative, result);
+ }
+
+ /**
+ * Ensure CDATA does not match replacement rules.
+ *
+ * @see "https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=120"
+ */
+ public void testComments() {
+ String base = "http://myapp/context";
+ String page = "templates/template1.html";
+ final String input = "<![CDATA[ var src=\"test\" ]]>";
+ final String expectedOutputRelative = "<![CDATA[ var src=\"test\" ]]>";
+ final String expectedOutputAbsolute = "<![CDATA[ var src=\"test\" ]]>";
+
+ UrlRewriter tested = createUrlRewriter(base, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputAbsolute, result);
+
+ tested = createUrlRewriter(base, "relative");
+ result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputRelative, result);
+ }
+
+ public void testUrlReplaceContext() {
+ String base = "http://myapp/context/";
+ String newBase = "http://myapp/newcontext/";
+ String page = "templates/template1.html";
+ final String input = " <img src=\"images/logo.png\"/> <a href=\"/context/page/page1.htm\">link</a> "
+ + "<img src=\"http://www.google.com/logo.com\"/>";
+ final String expectedOutputRelative = " <img src=\"/newcontext/templates/images/logo.png\"/> "
+ + "<a href=\"/newcontext/page/page1.htm\">link</a> <img src=\"http://www.google.com/logo.com\"/>";
+ final String expectedOutputAbsolute = " <img src=\"http://myapp/newcontext/templates/images/logo.png\"/> "
+ + "<a href=\"http://myapp/newcontext/page/page1.htm\">link</a> "
+ + "<img src=\"http://www.google.com/logo.com\"/>";
+
+ UrlRewriter tested = createUrlRewriter(newBase, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputAbsolute, result);
+
+ tested = createUrlRewriter(newBase, "relative");
+ result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputRelative, result);
+ }
+
+ public void testUrlSanitizing() {
+ String base = "http://myapp/context/";
+ String page = "templates/template1.html";
+ final String input = " <img src=\"images/logo.png\"/> <a href=\"/context/page/page1.htm\">link</a> "
+ + "<img src=\"http://www.google.com/logo.com\"/>";
+ final String expectedOutputRelative = " <img src=\"/context/templates/images/logo.png\"/> "
+ + "<a href=\"/context/page/page1.htm\">link</a> <img src=\"http://www.google.com/logo.com\"/>";
+ final String expectedOutputAbsolute = " <img src=\"http://myapp/context/templates/images/logo.png\"/> "
+ + "<a href=\"http://myapp/context/page/page1.htm\">link</a> "
+ + "<img src=\"http://www.google.com/logo.com\"/>";
+
+ UrlRewriter tested = createUrlRewriter(base, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputAbsolute, result);
+
+ tested = createUrlRewriter(base, "relative");
+ result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputRelative, result);
+ }
+
+ public void testUrlSanitizing2() {
+ String base = "http://myapp/context/";
+ String visibleBase = "http://app2/";
+ String page = "/page/";
+ final String input = " <a href=\"../styles/style.css\"/> <img src=\"images/logo.png\"/> "
+ + "<a href=\"/context/page/page1.htm\">link</a> <img src=\"http://www.google.com/logo.com\"/>";
+ final String expectedOutputRelative = " <a href=\"/page/../styles/style.css\"/> "
+ + "<img src=\"/page/images/logo.png\"/>"
+ + " <a href=\"/page/page1.htm\">link</a> <img src=\"http://www.google.com/logo.com\"/>";
+ final String expectedOutputAbsolute = " <a href=\"http://app2/page/../styles/style.css\"/> "
+ + "<img src=\"http://app2/page/images/logo.png\"/> "
+ + "<a href=\"http://app2/page/page1.htm\">link</a> <img src=\"http://www.google.com/logo.com\"/>";
+
+ UrlRewriter tested = createUrlRewriter(visibleBase, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputAbsolute, result);
+
+ tested = createUrlRewriter(visibleBase, "relative");
+ result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputRelative, result);
+ }
+
+ public void testDollarSignReplacement() {
+ String base = "http://myapp/context/";
+ String visibleBase = "http://app2/";
+ String page = "/page/";
+ final String input = " <a href=\"../styles/style$.css\"/> <img src=\"images/logo$.png\"/></a> "
+ + "<img src=\"http://www.google.com/logo.com\"/>";
+ final String expectedOutputAbsolute = " <a href=\"http://app2/page/../styles/style$.css\"/> "
+ + "<img src=\"http://app2/page/images/logo$.png\"/></a>"
+ + " <img src=\"http://www.google.com/logo.com\"/>";
+
+ UrlRewriter tested = createUrlRewriter(visibleBase, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputAbsolute, result);
+ }
+
+ public void testCaseInsensitiveReplacement() {
+ String base = "http://myapp/context/";
+ String visibleBase = "http://app2/";
+ String page = "/page/";
+ final String input = " <a HREF=\"../styles/style.css\"/> <img SrC=\"images/logo.png\"/></a> "
+ + "<img src=\"http://www.google.com/logo.com\"/>";
+ final String expectedOutputAbsolute = " <a HREF=\"http://app2/page/../styles/style.css\"/> "
+ + "<img SrC=\"http://app2/page/images/logo.png\"/></a> <img src=\"http://www.google.com/logo.com\"/>";
+
+ UrlRewriter tested = createUrlRewriter(visibleBase, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputAbsolute, result);
+ }
+
+ public void testBackgroundReplacement() {
+ String base = "http://myapp/context/";
+ String visibleBase = "http://app2/";
+ String page = "/page/";
+ final String input = " <a background=\"../styles/style.css\"/> <img background=\"images/logo.png\"/></a> "
+ + "<img background=\"http://www.google.com/logo.com\"/>";
+ final String expectedOutputAbsolute = " <a background=\"http://app2/page/../styles/style.css\"/> "
+ + "<img background=\"http://app2/page/images/logo.png\"/></a> "
+ + "<img background=\"http://www.google.com/logo.com\"/>";
+
+ UrlRewriter tested = createUrlRewriter(visibleBase, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputAbsolute, result);
+ }
+
+ /**
+ * Ensures links like <a href="?test=true">link<a/> are correctly fixed, with both RELATIVE and ABSOLUTE
+ * settings.
+ *
+ */
+ public void testSimpleUrlWithParamsOnly() {
+ String base = "http://myapp/";
+ String page = "/context/status";
+ final String input = "<a href=\"?p=services\">test</a>";
+ final String expectedOutputRelative = "<a href=\"/context/status?p=services\">test</a>";
+ final String expectedOutputAbsolute = "<a href=\"http://myapp/context/status?p=services\">test</a>";
+
+ // Relative test
+ UrlRewriter tested = createUrlRewriter(base, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputAbsolute, result);
+
+ // Absolute test
+ tested = createUrlRewriter(base, "relative");
+ result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputRelative, result);
+ }
+
+ /**
+ * Test for 0000186: ResourceFixup : StringIndexOutOfBoundsException: String index out of range: -1.
+ *
+ * @see "https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=186"
+ *
+ */
+ public void testBug186() {
+ String base = "http://localhost:8084/applicationPath/";
+ String visible = "http://localhost:8084/";
+ String page = "/";
+ final String input = "<script src=\"/applicationPath/controller\"></script>";
+ final String expectedOutputRelative = "<script src=\"/controller\"></script>";
+ final String expectedOutputAbsolute = "<script src=\"http://localhost:8084/controller\"></script>";
+
+ // Relative test
+ UrlRewriter tested = createUrlRewriter(visible, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputAbsolute, result);
+
+ // Absolute test
+ tested = createUrlRewriter(visible, "relative");
+ result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputRelative, result);
+ }
+
+ /**
+ * Test for 0000238: ResourceFixUp does not support the protocol-relative urls.
+ * <p>
+ * protocol-relative urls should be considered as absolute urls.
+ *
+ * @see "http://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=238"
+ *
+ */
+ public void testBug238() {
+ String base = "http://localhost:8084/applicationPath/";
+ String visible = "http://localhost:8084/";
+ String page = "/";
+ final String input = "<script src=\"//domain.com/applicationPath/controller\"></script>";
+ final String expectedOutputRelative = "<script src=\"//domain.com/applicationPath/controller\"></script>";
+ final String expectedOutputAbsolute = "<script src=\"//domain.com/applicationPath/controller\"></script>";
+
+ // Relative test
+ UrlRewriter tested = createUrlRewriter(visible, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputAbsolute, result);
+
+ // Absolute test
+ tested = createUrlRewriter(visible, "relative");
+ result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(expectedOutputRelative, result);
+ }
+
+ /**
+ * Test for 0000286: ResourceFixupRenderer StringIndexOutOfBoundsException
+ * <p>
+ * Index out of range if page parameter is empty.
+ *
+ */
+ public void testBug286() {
+ String base = "https://myapplication";
+ String page = "";
+ final String input = "<html></html>";
+
+ // Relative test
+ UrlRewriter tested = createUrlRewriter(base, "absolute");
+ String result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(input, result);
+
+ // Absolute test
+ tested = createUrlRewriter(base, "relative");
+ result = tested.rewriteHtml(input, page, base).toString();
+ assertEquals(input, result);
+ }
+
+}
Modified: trunk/esigate-core/src/test/java/org/esigate/renderers/ResourceFixupRendererTest.java
===================================================================
--- trunk/esigate-core/src/test/java/org/esigate/renderers/ResourceFixupRendererTest.java 2014-02-06 08:24:44 UTC (rev 1555)
+++ trunk/esigate-core/src/test/java/org/esigate/renderers/ResourceFixupRendererTest.java 2014-02-06 22:39:22 UTC (rev 1556)
@@ -16,12 +16,13 @@
package org.esigate.renderers;
import java.io.IOException;
-import java.io.StringWriter;
import java.io.Writer;
import junit.framework.TestCase;
import org.apache.commons.io.output.StringBuilderWriter;
+import org.esigate.impl.UrlRewriter;
+import org.esigate.impl.UrlRewriterTest;
/**
* Tests on ResourceFixupRenderer.
@@ -43,269 +44,15 @@
+ "<img src=\"http://www.google.com/logo.com\"/>";
Writer out = new StringBuilderWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, base, page, ResourceFixupRenderer.ABSOLUTE);
+ UrlRewriter urlRewriter = UrlRewriterTest.createUrlRewriter(base, "absolute");
+ ResourceFixupRenderer tested = new ResourceFixupRenderer(base, page, urlRewriter);
tested.render(null, input, out);
assertEquals(expectedOutputAbsolute, out.toString());
out = new StringBuilderWriter();
- tested = new ResourceFixupRenderer(base, base, page, ResourceFixupRenderer.RELATIVE);
+ urlRewriter = UrlRewriterTest.createUrlRewriter(base, "relative");
+ tested = new ResourceFixupRenderer(base, page, urlRewriter);
tested.render(null, input, out);
assertEquals(expectedOutputRelative, out.toString());
}
-
- /**
- * Ensure CDATA does not match replacement rules.
- *
- * @see "https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=120"
- * @throws IOException
- */
- public void testComments() throws IOException {
- String base = "http://myapp/context";
- String page = "templates/template1.html";
- final String input = "<![CDATA[ var src=\"test\" ]]>";
- final String expectedOutputRelative = "<![CDATA[ var src=\"test\" ]]>";
- final String expectedOutputAbsolute = "<![CDATA[ var src=\"test\" ]]>";
-
- Writer out = new StringBuilderWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, base, page, ResourceFixupRenderer.ABSOLUTE);
- tested.render(null, input, out);
- assertEquals(expectedOutputAbsolute, out.toString());
-
- out = new StringBuilderWriter();
- tested = new ResourceFixupRenderer(base, base, page, ResourceFixupRenderer.RELATIVE);
- tested.render(null, input, out);
- assertEquals(expectedOutputRelative, out.toString());
- }
-
- public void testUrlReplaceContext() throws IOException {
- String base = "http://myapp/context/";
- String newBase = "http://myapp/newcontext/";
- String page = "templates/template1.html";
- final String input = " <img src=\"images/logo.png\"/> <a href=\"/context/page/page1.htm\">link</a> "
- + "<img src=\"http://www.google.com/logo.com\"/>";
- final String expectedOutputRelative = " <img src=\"/newcontext/templates/images/logo.png\"/> "
- + "<a href=\"/newcontext/page/page1.htm\">link</a> <img src=\"http://www.google.com/logo.com\"/>";
- final String expectedOutputAbsolute = " <img src=\"http://myapp/newcontext/templates/images/logo.png\"/> "
- + "<a href=\"http://myapp/newcontext/page/page1.htm\">link</a> "
- + "<img src=\"http://www.google.com/logo.com\"/>";
-
- Writer out = new StringBuilderWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, newBase, page, ResourceFixupRenderer.ABSOLUTE);
- tested.render(null, input, out);
- assertEquals(expectedOutputAbsolute, out.toString());
-
- out = new StringBuilderWriter();
- tested = new ResourceFixupRenderer(base, newBase, page, ResourceFixupRenderer.RELATIVE);
- tested.render(null, input, out);
- assertEquals(expectedOutputRelative, out.toString());
- }
-
- public void testUrlSanitizing() throws IOException {
- String base = "http://myapp/context/";
- String page = "templates/template1.html";
- final String input = " <img src=\"images/logo.png\"/> <a href=\"/context/page/page1.htm\">link</a> "
- + "<img src=\"http://www.google.com/logo.com\"/>";
- final String expectedOutputRelative = " <img src=\"/context/templates/images/logo.png\"/> "
- + "<a href=\"/context/page/page1.htm\">link</a> <img src=\"http://www.google.com/logo.com\"/>";
- final String expectedOutputAbsolute = " <img src=\"http://myapp/context/templates/images/logo.png\"/> "
- + "<a href=\"http://myapp/context/page/page1.htm\">link</a> "
- + "<img src=\"http://www.google.com/logo.com\"/>";
-
- Writer out = new StringBuilderWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, base, page, ResourceFixupRenderer.ABSOLUTE);
- tested.render(null, input, out);
- assertEquals(expectedOutputAbsolute, out.toString());
-
- out = new StringBuilderWriter();
- tested = new ResourceFixupRenderer(base, base, page, ResourceFixupRenderer.RELATIVE);
- tested.render(null, input, out);
- assertEquals(expectedOutputRelative, out.toString());
- }
-
- public void testUrlSanitizing2() throws IOException {
- String base = "http://myapp/context/";
- String visibleBase = "http://app2/";
- String page = "/page/";
- final String input = " <a href=\"../styles/style.css\"/> <img src=\"images/logo.png\"/> "
- + "<a href=\"/context/page/page1.htm\">link</a> <img src=\"http://www.google.com/logo.com\"/>";
- final String expectedOutputRelative = " <a href=\"/page/../styles/style.css\"/> "
- + "<img src=\"/page/images/logo.png\"/>"
- + " <a href=\"/page/page1.htm\">link</a> <img src=\"http://www.google.com/logo.com\"/>";
- final String expectedOutputAbsolute = " <a href=\"http://app2/page/../styles/style.css\"/> "
- + "<img src=\"http://app2/page/images/logo.png\"/> "
- + "<a href=\"http://app2/page/page1.htm\">link</a> <img src=\"http://www.google.com/logo.com\"/>";
-
- Writer out = new StringBuilderWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, visibleBase, page,
- ResourceFixupRenderer.ABSOLUTE);
- tested.render(null, input, out);
- assertEquals(expectedOutputAbsolute, out.toString());
-
- out = new StringBuilderWriter();
- tested = new ResourceFixupRenderer(base, visibleBase, page, ResourceFixupRenderer.RELATIVE);
- tested.render(null, input, out);
- assertEquals(expectedOutputRelative, out.toString());
- }
-
- public void testDollarSignReplacement() throws IOException {
- String base = "http://myapp/context/";
- String visibleBase = "http://app2/";
- String page = "/page/";
- final String input = " <a href=\"../styles/style$.css\"/> <img src=\"images/logo$.png\"/></a> "
- + "<img src=\"http://www.google.com/logo.com\"/>";
- final String expectedOutputAbsolute = " <a href=\"http://app2/page/../styles/style$.css\"/> "
- + "<img src=\"http://app2/page/images/logo$.png\"/></a>"
- + " <img src=\"http://www.google.com/logo.com\"/>";
-
- Writer out = new StringBuilderWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, visibleBase, page,
- ResourceFixupRenderer.ABSOLUTE);
- tested.render(null, input, out);
- assertEquals(expectedOutputAbsolute, out.toString());
- }
-
- public void testCaseInsensitiveReplacement() throws IOException {
- String base = "http://myapp/context/";
- String visibleBase = "http://app2/";
- String page = "/page/";
- final String input = " <a HREF=\"../styles/style.css\"/> <img SrC=\"images/logo.png\"/></a> "
- + "<img src=\"http://www.google.com/logo.com\"/>";
- final String expectedOutputAbsolute = " <a HREF=\"http://app2/page/../styles/style.css\"/> "
- + "<img SrC=\"http://app2/page/images/logo.png\"/></a> <img src=\"http://www.google.com/logo.com\"/>";
-
- Writer out = new StringBuilderWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, visibleBase, page,
- ResourceFixupRenderer.ABSOLUTE);
- tested.render(null, input, out);
- assertEquals(expectedOutputAbsolute, out.toString());
- }
-
- public void testBackgroundReplacement() throws IOException {
- String base = "http://myapp/context/";
- String visibleBase = "http://app2/";
- String page = "/page/";
- final String input = " <a background=\"../styles/style.css\"/> <img background=\"images/logo.png\"/></a> "
- + "<img background=\"http://www.google.com/logo.com\"/>";
- final String expectedOutputAbsolute = " <a background=\"http://app2/page/../styles/style.css\"/> "
- + "<img background=\"http://app2/page/images/logo.png\"/></a> "
- + "<img background=\"http://www.google.com/logo.com\"/>";
-
- Writer out = new StringBuilderWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, visibleBase, page,
- ResourceFixupRenderer.ABSOLUTE);
- tested.render(null, input, out);
- assertEquals(expectedOutputAbsolute, out.toString());
- }
-
- /**
- * Ensures links like <a href="?test=true">link<a/> are correctly fixed, with both RELATIVE and ABSOLUTE
- * settings.
- *
- * @throws IOException
- */
- public void testSimpleUrlWithParamsOnly() throws IOException {
- String base = "http://myapp/";
- String page = "/context/status";
- final String input = "<a href=\"?p=services\">test</a>";
- final String expectedOutputRelative = "<a href=\"/context/status?p=services\">test</a>";
- final String expectedOutputAbsolute = "<a href=\"http://myapp/context/status?p=services\">test</a>";
-
- // Relative test
- Writer out = new StringBuilderWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, base, page, ResourceFixupRenderer.RELATIVE);
- tested.render(null, input, out);
- assertEquals(expectedOutputRelative, out.toString());
-
- // Absolute test
- out = new StringBuilderWriter();
- tested = new ResourceFixupRenderer(base, base, page, ResourceFixupRenderer.ABSOLUTE);
- tested.render(null, input, out);
- assertEquals(expectedOutputAbsolute, out.toString());
-
- }
-
- /**
- * Test for 0000186: ResourceFixup : StringIndexOutOfBoundsException: String index out of range: -1.
- *
- * @see "https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=186"
- *
- * @throws IOException
- */
- public void testBug186() throws IOException {
- String base = "http://localhost:8084/applicationPath/";
- String visible = "http://localhost:8084/";
- String page = "/";
- final String input = "<script src=\"/applicationPath/controller\"></script>";
- final String expectedOutputRelative = "<script src=\"/controller\"></script>";
- final String expectedOutputAbsolute = "<script src=\"http://localhost:8084/controller\"></script>";
-
- // Relative test
- Writer out = new StringBuilderWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, visible, page, ResourceFixupRenderer.RELATIVE);
- tested.render(null, input, out);
- assertEquals(expectedOutputRelative, out.toString());
-
- // Absolute test
- out = new StringBuilderWriter();
- tested = new ResourceFixupRenderer(base, visible, page, ResourceFixupRenderer.ABSOLUTE);
- tested.render(null, input, out);
- assertEquals(expectedOutputAbsolute, out.toString());
-
- }
-
- /**
- * Test for 0000238: ResourceFixUp does not support the protocol-relative urls.
- * <p>
- * protocol-relative urls should be considered as absolute urls.
- *
- * @see "http://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=238"
- *
- *
- *
- * @throws IOException
- */
- public void testBug238() throws IOException {
- String base = "http://localhost:8084/applicationPath/";
- String visible = "http://localhost:8084/";
- String page = "/";
- final String input = "<script src=\"//domain.com/applicationPath/controller\"></script>";
- final String expectedOutputRelative = "<script src=\"//domain.com/applicationPath/controller\"></script>";
- final String expectedOutputAbsolute = "<script src=\"//domain.com/applicationPath/controller\"></script>";
-
- // Relative test
- Writer out = new StringBuilderWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, visible, page, ResourceFixupRenderer.RELATIVE);
- tested.render(null, input, out);
- assertEquals(expectedOutputRelative, out.toString());
-
- // Absolute test
- out = new StringBuilderWriter();
- tested = new ResourceFixupRenderer(base, visible, page, ResourceFixupRenderer.ABSOLUTE);
- tested.render(null, input, out);
- assertEquals(expectedOutputAbsolute, out.toString());
- }
-
- /**
- * Test for 0000286: ResourceFixupRenderer StringIndexOutOfBoundsException
- * <p>
- * Index out of range if page paramter is empty.
- *
- * @throws IOException
- */
- public void testBug286() throws IOException {
- String base = "https://myapplication";
- String page = "";
- final String input = "<html></html>";
-
- // Relative test
- Writer out = new StringWriter();
- ResourceFixupRenderer tested = new ResourceFixupRenderer(base, base, page, ResourceFixupRenderer.RELATIVE);
- tested.render(null, input, out);
-
- // Absolute test
- out = new StringWriter();
- tested = new ResourceFixupRenderer(base, base, page, ResourceFixupRenderer.ABSOLUTE);
- tested.render(null, input, out);
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fxb...@us...> - 2014-02-06 08:24:47
|
Revision: 1555
http://sourceforge.net/p/webassembletool/code/1555
Author: fxbonnet
Date: 2014-02-06 08:24:44 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
0000285: Refactor URL rewriting code
https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=285
Removed dead code
Modified Paths:
--------------
trunk/esigate-core/src/main/java/org/esigate/renderers/ResourceFixupRenderer.java
Modified: trunk/esigate-core/src/main/java/org/esigate/renderers/ResourceFixupRenderer.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/renderers/ResourceFixupRenderer.java 2014-01-27 23:07:16 UTC (rev 1554)
+++ trunk/esigate-core/src/main/java/org/esigate/renderers/ResourceFixupRenderer.java 2014-02-06 08:24:44 UTC (rev 1555)
@@ -53,6 +53,7 @@
private static final Pattern URL_PATTERN = Pattern.compile(
"<([^\\!][^>]+)(src|href|action|background)\\s*=\\s*('[^<']*'|\"[^<\"]*\")([^>]*)>",
Pattern.CASE_INSENSITIVE);
+
private String contextAdd = null;
private String contextRemove = null;
/**
@@ -64,7 +65,6 @@
private String server = null;
private String baseUrl;
private String replacementUrl;
- private final boolean fixRelativeUrls;
private final int mode;
/**
@@ -82,50 +82,17 @@
* <li>images/image.png is replaced by /context/images/image.png</li>
* </ul>
*
- * @param pBaseUrl
- * Base url (same as configured in provider).
+ * @param baseUrl
+ * Base url (same as configured in provider).
* @param visibleBaseUrl
* Visible Base url (same as configured in provider). Will replace the base url in rewritten urls.
* @param pageFullPath
* Page as used in tag lib or using API
- * @param pMode
- * ResourceFixupRenderer.ABSOLUTE or ResourceFixupRenderer.RELATIVE
- */
- public ResourceFixupRenderer(String pBaseUrl, String visibleBaseUrl, String pageFullPath, int pMode) {
- this(pBaseUrl, visibleBaseUrl, pageFullPath, pMode, true);
- }
-
- /**
- * Creates a renderer which fixes urls. The domain name and the url path are computed from the full url made of
- * baseUrl + pageFullPath.
- *
- * If mode is ABSOLUTE, all relative urls will be replaced by the full urls :
- * <ul>
- * <li>images/image.png is replaced by http://server/context/images/image.png</li>
- * <li>/context/images/image.png is replaced by http://server/context/images/image.png</li>
- * </ul>
- *
- * If mode is RELATIVE, context will be added to relative urls :
- * <ul>
- * <li>images/image.png is replaced by /context/images/image.png</li>
- * </ul>
- *
- * @param baseUrl
- * Base url (same as configured in provider).
- * @param visibleBaseUrl
- * Visible Base url (same as configured in provider). Will replace the base url in rewritten urls.
- * @param pageFullPath
- * Page as used in tag lib or using API
* @param mode
* ResourceFixupRenderer.ABSOLUTE or ResourceFixupRenderer.RELATIVE
- * @param fixRelativeUrls
- * defines whether relative URLs should be fixed
*/
- public ResourceFixupRenderer(String baseUrl, String visibleBaseUrl, String pageFullPath, int mode,
- boolean fixRelativeUrls) {
+ public ResourceFixupRenderer(String baseUrl, String visibleBaseUrl, String pageFullPath, int mode) {
this.mode = mode;
- this.fixRelativeUrls = fixRelativeUrls;
-
if (visibleBaseUrl != null && visibleBaseUrl.length() != 0) {
this.baseUrl = removeLeadingSlash(baseUrl);
this.replacementUrl = removeLeadingSlash(visibleBaseUrl);
@@ -227,7 +194,7 @@
if (mode == ABSOLUTE) {
url = server + url;
}
- } else if (fixRelativeUrls) {
+ } else {
if (url.charAt(0) == '?' && fileName != null) {
url = fileName + url;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fxb...@us...> - 2014-01-27 23:07:19
|
Revision: 1554
http://sourceforge.net/p/webassembletool/code/1554
Author: fxbonnet
Date: 2014-01-27 23:07:16 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
0000258: Change esigate default settings.
https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=258
Documentation
Modified Paths:
--------------
trunk/src/site/xdoc/reference.xml
trunk/src/site/xdoc/upgrade.xml
Modified: trunk/src/site/xdoc/reference.xml
===================================================================
--- trunk/src/site/xdoc/reference.xml 2014-01-27 22:17:19 UTC (rev 1553)
+++ trunk/src/site/xdoc/reference.xml 2014-01-27 23:07:16 UTC (rev 1554)
@@ -230,45 +230,9 @@
<td>Instructs send the request to the target server with the same Host header value as in the incoming request.
This feature is very usefull when the target server uses virtual hosts.</td>
<td>No</td>
- <td>false</td>
+ <td>true</td>
</tr>
<tr>
- <td>discardRequestHeaders</td>
- <td>Comma separated list of HTTP request headers which will not be forwarded from client
- to server. By default, any other request header will be forwarded.
- See <a href="#Http_headers_support">HTTP headers support</a> for more details.
- </td>
- <td>No</td>
- <td>Authorization,Connection,Content-Length,Cache-control,Cookie,Expect,Host,Max-Forwards,Pragma,Proxy-Authorization,TE,Trailer,Transfer-Encoding,Upgrade</td>
- </tr>
- <tr>
- <td>forwardRequestHeaders</td>
- <td>Comma separated list of HTTP request headers which are discarded by default but have to be forwarded from client
- to server.
- See <a href="#Http_headers_support">HTTP headers support</a> for more details.
- </td>
- <td>No</td>
- <td></td>
- </tr>
- <tr>
- <td>discardResponseHeaders</td>
- <td>Comma separated list of HTTP request headers which will not be forwarded from server
- to client . By default, any other response header will be forwarded.
- See <a href="#Http_headers_support">HTTP headers support</a> for more details.
- </td>
- <td>No</td>
- <td>Connection,Content-Length,Content-MD5,Date,Keep-Alive,Proxy-Authenticate,Set-Cookie,Trailer,Transfer-Encoding,WWW-Authenticate</td>
- </tr>
- <tr>
- <td>forwardResponseHeaders</td>
- <td>Comma separated list of HTTP response headers which are discarded by default but have to be forwarded from server
- to client.
- See <a href="#Http_headers_support">HTTP headers support</a> for more details.
- </td>
- <td>No</td>
- <td></td>
- </tr>
- <tr>
<td>cookieManager</td>
<td>The cookieManager to use. Must be a class that implements org.esigate.cookie.CookieManager</td>
<td>No</td>
@@ -276,23 +240,17 @@
</tr>
<tr>
<td>discardCookies</td>
- <td>Comma separated list of the names of the cookies to ignore. By default, cookies are stored in the session on ESIGate side. You can use the value * to discard all cookies.</td>
+ <td>Comma separated list of the names of the cookies to ignore. By default, cookies are forwarded. You can use the value * to discard all cookies.</td>
<td>No</td>
<td></td>
</tr>
<tr>
- <td>forwardCookies</td>
- <td>Comma separated list of the names of the cookies to forward to the client. By default, cookies are stored in the session on ESIGate side. You can use the value * to forward all cookies. Domain and path are rewritten in order to match the domain and path that are visible from the client.</td>
+ <td>storeCookiesInSession</td>
+ <td>Comma separated list of the names of the cookies to store in the session on ESIGate side. By default, cookies are forwarded. You can use the value * to store all the cookies. Domain and path are rewritten in order to match the domain and path that are visible from the client.</td>
<td>No</td>
<td></td>
</tr>
<tr>
- <td>fixResources</td>
- <td>Fix links to resources, images and pages in the pages retrieved (parse the pages to find <a href=...> or <img src=...> ...)</td>
- <td>No</td>
- <td>false</td>
- </tr>
- <tr>
<td>fixMode</td>
<td>If "relative" the generated URLs will be relative to the root of the server (ie starting with "/"). If "absolute" generated URLs will be absolute (ie starting with "http://")</td>
<td>No</td>
@@ -316,17 +274,11 @@
<td>No</td>
<td>roundrobin</td>
</tr>
- <tr>
- <td><strike>authenticationHandler</strike></td>
- <td>This configuration is deprecated and no longer supported. Authentication handlers must now be implemented as extensions. See the <a href="#Authentication_and_SSO">authentication documentation</a> to learn how to use authentication and upgrade existing custom handlers. </td>
- <td>No</td>
- <td></td>
- </tr>
- <tr>
+ <tr>
<td>extensions</td>
<td>A comma-separated list of extensions (class names). Extensions can register to events and customize standard behavior, for instance add logging or handle authentication. Extensions will be called in the same order as in this list.</td>
<td>No</td>
- <td>org.esigate.extension.FragmentLogging, org.esigate.extension.FetchLogging, org.esigate.authentication.RemoteUserAuthenticationHandler, org.esigate.extension.ResourceFixup, org.esigate.extension.XPoweredBy</td>
+ <td>org.esigate.extension.FragmentLogging, org.esigate.extension.FetchLogging, org.esigate.authentication.RemoteUserAuthenticationHandler, org.esigate.extension.Esi, org.esigate.extension.ResourceFixup, org.esigate.extension.XPoweredBy, org.esigate.extension.surrogate.Surrogate, org.esigate.extension.ConfigReloadOnChange</td>
</tr>
<tr>
<td>useCache</td>
@@ -1192,10 +1144,7 @@
</tr>
<tr>
<td>Authorization</td>
- <td>
- Not forwarded. See
- <a href="#Authentication_and_SSO">authentication</a>
- </td>
+ <td>Forwarded</td>
</tr>
<tr>
<td>Cache-control</td>
@@ -1231,7 +1180,7 @@
</tr>
<tr>
<td>Cookie</td>
- <td>Depends on cookie configuration. By default not forwarded because cookies are kept into session (see <a href="#Cookies">Cookies</a>)</td>
+ <td>Depends on cookie configuration. Rewritten and forwarded by default (see <a href="#Cookies">Cookies</a>)</td>
</tr>
<tr>
<td>Date</td>
@@ -1247,7 +1196,7 @@
</tr>
<tr>
<td>Host</td>
- <td>Default ignored, depends on preserveHost parameter</td>
+ <td>Forwarded by default, depends on preserveHost parameter</td>
</tr>
<tr>
<td>If-Match</td>
@@ -1456,7 +1405,7 @@
</tr>
<tr>
<td>Set-Cookie</td>
- <td>Depends on cookie configuration. By default not forwarded because cookies are kept into session (see <a href="#Cookies">Cookies</a>)</td>
+ <td>Depends on cookie configuration. By default rewritten and forwarded (see <a href="#Cookies">Cookies</a>)</td>
</tr>
<tr>
<td>Trailer</td>
@@ -1480,10 +1429,7 @@
</tr>
<tr>
<td>WWW-Authenticate</td>
- <td>
- Not forwarded, see
- <a href="#Authentication_and_SSO">authentication</a>
- </td>
+ <td>Forwarded</td>
</tr>
</table>
</subsection>
@@ -1508,9 +1454,10 @@
</subsection>
<subsection name="Cookie storing">
<p>
- By default, cookies sent by the browser are NOT forwarded to
- target applications and cookies sent back by the server are not
- forwarded to the browser : they are kept server side into a the user
+ By default, cookies sent by the browser are forwarded to
+ target applications and cookies sent back by the server are
+ forwarded to the browser. It is also possible to store them in
+ the session on EsiGate side: they are kept server side into a the user
context. Of course, every user has a separate user context.
</p>
<p>
@@ -1525,37 +1472,37 @@
store the user context.
</p>
</subsection>
- <subsection name="Cookie forwarding, cookie discarding">
+ <subsection name="Cookie forwarding, cookie storing, cookie discarding">
<p>
- It is possible to configure ESIGate to forward all cookies or
- specific cookies to the browser and also discard all or specific
+ It is possible to configure ESIGate to store all cookies or
+ specific cookies to the session and also discard all or specific
cookies. This is done by using the properties
- "forwardCookies" and "discardCookies" in the configuration file.
+ "storeCookiesInSession" and "discardCookies" in the configuration file.
Values for these properties should be a comma separated list of cookie
names or the single value "*".
</p>
<p>
- Example 1: forward cookies named "cookie1" and "cookie2", discard
- cookie name "cookie3", all other cookies will be stored server side
+ Example 1: store cookies named "cookie1" and "cookie2", discard
+ cookie name "cookie3", all other cookies will be forwarded
(default behavior).
<source>
-forwardCookies=cookie1,cookie2
+storeCookiesInSession=cookie1,cookie2
discardCookies=cookie3
</source>
</p>
<p>
- Example 2: forward cookies named "cookie1" and "cookie2", discard
+ Example 2: store cookies named "cookie1" and "cookie2", discard
all other cookies.
<source>
-forwardCookies=cookie1,cookie2
+storeCookiesInSession=cookie1,cookie2
discardCookies=*
</source>
</p>
- <p>Note: if the name of a cookie is present in forwardCookies, it
+ <p>Note: if the name of a cookie is present in storeCookiesInSession, it
takes priority over "*" in discardCookies</p>
<p>Note: if the name of a cookie is present in discardCookies, it
- takes priority over "*" in forwardCookies</p>
- <p>Note: using value "*" for both forwardCookies and discardCookies
+ takes priority over "*" in storeCookiesInSession</p>
+ <p>Note: using value "*" for both storeCookiesInSession and discardCookies
is not allowed.</p>
<p>Note: forwarded cookies are not kept server side, they are
forwarded both ways, server to browser when the header "set-cookie"
@@ -1564,8 +1511,7 @@
<subsection name="Cookie rewriting">
<p>For forwarded cookie, the
domain and path of the cookie and secure
- or
- not cannot be kept as-is
+ or not cannot be kept as-is
because a cookie that would not match its
originating domain should be
rejected by the browser.
Modified: trunk/src/site/xdoc/upgrade.xml
===================================================================
--- trunk/src/site/xdoc/upgrade.xml 2014-01-27 22:17:19 UTC (rev 1553)
+++ trunk/src/site/xdoc/upgrade.xml 2014-01-27 23:07:16 UTC (rev 1554)
@@ -204,9 +204,34 @@
</p>
</subsection>
+ <subsection name="Default option values">
+ <p>
+ "preserveHost" is now set to true by default.
+ </p>
+ <p>
+ Cookies are now forwarded by default. "forwardCookies" parameter has
+ been removed and a new parameter "storeCookiesInSession" has been created
+ to be able to keep some cookies in the session.
+ </p>
+ <p>
+ Aggregator extension is not enabled anymore in the
+ default extensions list. I you still use the old html comments based
+ aggregator syntax, you have to add this extension.
+ </p>
+ <p>
+ "fixResources" option has been removed. Urls inside pages are now rewritten by default.
+ To desactivate it, you have to remove org.esigate.extension.ResourceFixup extension.
+ </p>
+ <p>
+ org.esigate.extension.ConfigReloadOnChange is now activated by default. The configuration
+ file is checked every 5 seconds and automatically reloaded if the file has changed.
+ This can be useful in development.
+ </p>
+ <p>
+ WWW-Authenticate response header and Authorization request header are now forwarded (basic authentication).
+ </p>
+ </subsection>
-
-
<div id="disqus_thread"></div>
<script type="text/javascript">
<![CDATA[
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fxb...@us...> - 2014-01-27 22:17:23
|
Revision: 1553
http://sourceforge.net/p/webassembletool/code/1553
Author: fxbonnet
Date: 2014-01-27 22:17:19 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
0000258: Change esigate default settings.
https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=258
Url rewriting activated by default
Modified Paths:
--------------
trunk/esigate-app-aggregator/src/main/resources/esigate.properties
trunk/esigate-app-master/src/main/resources/esigate.properties
trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java
trunk/esigate-core/src/main/java/org/esigate/Parameters.java
trunk/esigate-core/src/main/java/org/esigate/extension/ExtensionFactory.java
trunk/esigate-core/src/main/java/org/esigate/extension/ResourceFixup.java
trunk/esigate-core/src/main/java/org/esigate/util/PropertiesUtil.java
Added Paths:
-----------
trunk/esigate-core/src/test/java/org/esigate/util/PropertiesUtilTest.java
Modified: trunk/esigate-app-aggregator/src/main/resources/esigate.properties
===================================================================
--- trunk/esigate-app-aggregator/src/main/resources/esigate.properties 2014-01-27 21:12:11 UTC (rev 1552)
+++ trunk/esigate-app-aggregator/src/main/resources/esigate.properties 2014-01-27 22:17:19 UTC (rev 1553)
@@ -11,6 +11,7 @@
default.maxConnectionsPerHost=60
aggregated2.remoteUrlBase=http://localhost:8080/esigate-app-aggregated2/
+aggregated2.extensions=org.esigate.extension.Esi,org.esigate.extension.Aggregate
aggregated2.useCache=false
aggregated2.connectTimeout=1000
aggregated2.socketTimeout=5000
Modified: trunk/esigate-app-master/src/main/resources/esigate.properties
===================================================================
--- trunk/esigate-app-master/src/main/resources/esigate.properties 2014-01-27 21:12:11 UTC (rev 1552)
+++ trunk/esigate-app-master/src/main/resources/esigate.properties 2014-01-27 22:17:19 UTC (rev 1553)
@@ -5,6 +5,7 @@
useCache=true
ttl=5
maxObjectSize=10000
+extensions=org.esigate.authentication.RemoteUserAuthenticationHandler
xCacheHeader=true
@@ -13,6 +14,7 @@
local.mappings=*
proxy2.remoteUrlBase=http://localhost:8080/esigate-app-provider/images/
+proxy2.extensions=
proxy2.preserveHost=true
proxy2.ttl=5
proxy2.mappings=/images/*
Modified: trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java 2014-01-27 21:12:11 UTC (rev 1552)
+++ trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java 2014-01-27 22:17:19 UTC (rev 1553)
@@ -39,7 +39,6 @@
private final String instanceName;
private final String uriEncoding;
- private final boolean fixResources;
private final String visibleBaseURL;
private final int fixMode;
private final Properties properties;
@@ -53,7 +52,6 @@
baseUrlRetrieveStrategy = getBaseUrlRetrieveSession(props);
uriEncoding = Parameters.URI_ENCODING.getValueString(props);
preserveHost = Parameters.PRESERVE_HOST.getValueBoolean(props);
- fixResources = Parameters.FIX_RESOURCES.getValueBoolean(props);
visibleBaseURL = Parameters.VISIBLE_URL_BASE.getValueString(props);
isVisibleBaseURLEmpty = StringUtils.isEmpty(visibleBaseURL);
if ("absolute".equalsIgnoreCase(Parameters.FIX_MODE.getValueString(props))) {
@@ -110,10 +108,6 @@
return fixMode;
}
- public boolean isFixResources() {
- return fixResources;
- }
-
public String getVisibleBaseURL(String currentBaseUrl) {
return isVisibleBaseURLEmpty ? currentBaseUrl : visibleBaseURL;
}
Modified: trunk/esigate-core/src/main/java/org/esigate/Parameters.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/Parameters.java 2014-01-27 21:12:11 UTC (rev 1552)
+++ trunk/esigate-core/src/main/java/org/esigate/Parameters.java 2014-01-27 22:17:19 UTC (rev 1553)
@@ -65,8 +65,6 @@
public static final Parameter DISCARD_COOKIES = new Parameter("discardCookies", null);
public static final Parameter STORE_COOKIES_IN_SESSION = new Parameter("storeCookiesInSession", null);
- // Url rewriting
- public static final Parameter FIX_RESOURCES = new Parameter("fixResources", "false");
public static final Parameter FIX_MODE = new Parameter("fixMode", "relative");
public static final Parameter VISIBLE_URL_BASE = new Parameter("visibleUrlBase", null);
Modified: trunk/esigate-core/src/main/java/org/esigate/extension/ExtensionFactory.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/extension/ExtensionFactory.java 2014-01-27 21:12:11 UTC (rev 1552)
+++ trunk/esigate-core/src/main/java/org/esigate/extension/ExtensionFactory.java 2014-01-27 22:17:19 UTC (rev 1553)
@@ -83,9 +83,6 @@
*/
public static <T extends Extension> List<T> getExtensions(Properties properties, Parameter parameter, Driver d) {
Collection<String> className = parameter.getValueList(properties);
- if (className == null) {
- return null;
- }
List<T> finalResult = new ArrayList<T>();
for (String cName : className) {
try {
Modified: trunk/esigate-core/src/main/java/org/esigate/extension/ResourceFixup.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/extension/ResourceFixup.java 2014-01-27 21:12:11 UTC (rev 1552)
+++ trunk/esigate-core/src/main/java/org/esigate/extension/ResourceFixup.java 2014-01-27 22:17:19 UTC (rev 1553)
@@ -19,14 +19,12 @@
RenderEvent renderEvent = (RenderEvent) event;
// Fix resources
- if (config.isFixResources()) {
- String baseUrl = renderEvent.getOriginalRequest().getBaseUrl().toString();
- ResourceFixupRenderer fixup = new ResourceFixupRenderer(baseUrl, config.getVisibleBaseURL(baseUrl),
- renderEvent.getRemoteUrl(), config.getFixMode());
+ String baseUrl = renderEvent.getOriginalRequest().getBaseUrl().toString();
+ ResourceFixupRenderer fixup = new ResourceFixupRenderer(baseUrl, config.getVisibleBaseURL(baseUrl),
+ renderEvent.getRemoteUrl(), config.getFixMode());
- // Add fixup renderer as first renderer.
- renderEvent.getRenderers().add(0, fixup);
- }
+ // Add fixup renderer as first renderer.
+ renderEvent.getRenderers().add(0, fixup);
// Continue processing
return true;
Modified: trunk/esigate-core/src/main/java/org/esigate/util/PropertiesUtil.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/util/PropertiesUtil.java 2014-01-27 21:12:11 UTC (rev 1552)
+++ trunk/esigate-core/src/main/java/org/esigate/util/PropertiesUtil.java 2014-01-27 22:17:19 UTC (rev 1553)
@@ -61,12 +61,15 @@
* @param list
* @return Ordered collection
*/
- private static Collection<String> toCollection(String list) {
+ static Collection<String> toCollection(String list) {
Collection<String> result = new ArrayList<String>();
if (list != null) {
String[] values = list.split(",");
for (String value : values) {
- result.add(value.trim());
+ String trimmed = value.trim();
+ if (!trimmed.isEmpty()) {
+ result.add(trimmed);
+ }
}
}
return result;
Added: trunk/esigate-core/src/test/java/org/esigate/util/PropertiesUtilTest.java
===================================================================
--- trunk/esigate-core/src/test/java/org/esigate/util/PropertiesUtilTest.java (rev 0)
+++ trunk/esigate-core/src/test/java/org/esigate/util/PropertiesUtilTest.java 2014-01-27 22:17:19 UTC (rev 1553)
@@ -0,0 +1,30 @@
+package org.esigate.util;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import junit.framework.TestCase;
+
+public class PropertiesUtilTest extends TestCase {
+
+ public void testEmptyList() {
+ Collection<String> values = PropertiesUtil.toCollection("");
+ assertNotNull(values);
+ assertTrue(values.isEmpty());
+ }
+
+ public void testSingleValueList() {
+ Collection<String> values = PropertiesUtil.toCollection("test ");
+ assertEquals(1, values.size());
+ assertEquals("test", values.iterator().next());
+ }
+
+ public void testDoubleList() {
+ Collection<String> values = PropertiesUtil.toCollection(" test1,test2");
+ assertEquals(2, values.size());
+ Iterator<String> it = values.iterator();
+ assertEquals("test1", it.next());
+ assertEquals("test2", it.next());
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fxb...@us...> - 2014-01-27 21:12:14
|
Revision: 1552
http://sourceforge.net/p/webassembletool/code/1552
Author: fxbonnet
Date: 2014-01-27 21:12:11 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
0000258: Change esigate default settings.
https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=258
Forward WWW-Authenticate response header
Modified Paths:
--------------
trunk/esigate-app-aggregator/src/test/java/org/esigate/test/cases/ResponseHeadersTest.java
trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java
Modified: trunk/esigate-app-aggregator/src/test/java/org/esigate/test/cases/ResponseHeadersTest.java
===================================================================
--- trunk/esigate-app-aggregator/src/test/java/org/esigate/test/cases/ResponseHeadersTest.java 2014-01-27 20:51:11 UTC (rev 1551)
+++ trunk/esigate-app-aggregator/src/test/java/org/esigate/test/cases/ResponseHeadersTest.java 2014-01-27 21:12:11 UTC (rev 1552)
@@ -19,6 +19,7 @@
import org.apache.commons.lang3.StringUtils;
+import com.meterware.httpunit.AuthorizationRequiredException;
import com.meterware.httpunit.GetMethodWebRequest;
import com.meterware.httpunit.WebConversation;
import com.meterware.httpunit.WebRequest;
@@ -109,9 +110,8 @@
/**
* Content-encoding should not be forwarded as EsiGate will decompress gzip responses
*
- * @throws Exception
*/
- public void testContentEncoding() throws Exception {
+ public void testContentEncoding() {
// FIXME not easy to test as adding this header without really gzipping
// response body makes the response invalid
// assertHeaderDiscarded("Content-Encoding", "gzip");
@@ -124,9 +124,8 @@
/**
* Keep-alive is managed by the servlet container, we must not try to set it
*
- * @throws Exception
*/
- public void testContentLength() throws Exception {
+ public void testContentLength() {
// Cannot test it
}
@@ -198,9 +197,8 @@
/**
* Keep-alive is managed by the servlet container, we must not try to change it
*
- * @throws Exception
*/
- public void testKeepAlive() throws Exception {
+ public void testKeepAlive() {
// Cannot test it
}
@@ -295,9 +293,8 @@
* Transfer-Encoding Ignored (chunked encoding managed by the container). We cannot really test it live as setting
* this header generates invalid responses.
*
- * @throws Exception
*/
- public void testTransferEncoding() throws Exception {
+ public void testTransferEncoding() {
// Cannot test it
}
@@ -320,8 +317,13 @@
}
public void testWWWAuthenticate() throws Exception {
- // Default ignored, see authentication
- assertHeaderDiscarded("WWW-Authenticate");
+ try {
+ assertHeaderForwarded("WWW-Authenticate");
+ } catch (AuthorizationRequiredException e) {
+ // What we expected
+ return;
+ }
+ fail("Header WWW-Authenticate should be forwarded");
}
public void testXPoweredBy() throws Exception {
Modified: trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java 2014-01-27 20:51:11 UTC (rev 1551)
+++ trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java 2014-01-27 21:12:11 UTC (rev 1552)
@@ -71,7 +71,6 @@
responseHeadersFilterList.remove("Set-Cookie");
responseHeadersFilterList.remove("Trailer");
responseHeadersFilterList.remove("Transfer-Encoding");
- responseHeadersFilterList.remove("WWW-Authenticate");
}
protected boolean isForwardedRequestHeader(String headerName) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fxb...@us...> - 2014-01-27 20:51:14
|
Revision: 1551
http://sourceforge.net/p/webassembletool/code/1551
Author: fxbonnet
Date: 2014-01-27 20:51:11 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
0000258: Change esigate default settings.
https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=258
Forward Authorization header
Modified Paths:
--------------
trunk/esigate-app-aggregator/src/test/java/org/esigate/test/cases/RequestHeadersTest.java
trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java
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-01-27 11:00:59 UTC (rev 1550)
+++ trunk/esigate-app-aggregator/src/test/java/org/esigate/test/cases/RequestHeadersTest.java 2014-01-27 20:51:11 UTC (rev 1551)
@@ -83,7 +83,7 @@
* @throws Exception
*/
public void testAuthorization() throws Exception {
- assertHeaderDiscarded("Authorization");
+ assertHeaderForwarded("Authorization");
}
public void testConnection() throws Exception {
Modified: trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java 2014-01-27 11:00:59 UTC (rev 1550)
+++ trunk/esigate-core/src/main/java/org/esigate/http/HeaderManager.java 2014-01-27 20:51:11 UTC (rev 1551)
@@ -46,7 +46,6 @@
// By default all request headers are forwarded
requestHeadersFilterList.add("*");
// Except hop-by-hop headers
- requestHeadersFilterList.remove("Authorization");
requestHeadersFilterList.remove("Connection");
requestHeadersFilterList.remove("Content-Length");
requestHeadersFilterList.remove("Cache-control");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fxb...@us...> - 2014-01-27 11:01:02
|
Revision: 1550
http://sourceforge.net/p/webassembletool/code/1550
Author: fxbonnet
Date: 2014-01-27 11:00:59 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
0000258: Change esigate default settings.
https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=258
Cleaned logs
Modified Paths:
--------------
trunk/esigate-core/src/test/resources/simplelogger.properties
Modified: trunk/esigate-core/src/test/resources/simplelogger.properties
===================================================================
--- trunk/esigate-core/src/test/resources/simplelogger.properties 2014-01-27 10:56:35 UTC (rev 1549)
+++ trunk/esigate-core/src/test/resources/simplelogger.properties 2014-01-27 11:00:59 UTC (rev 1550)
@@ -2,3 +2,4 @@
org.slf4j.simpleLogger.log.org.esigate.Driver=warn
org.slf4j.simpleLogger.log.org.esigate.cache.CacheStorage=warn
org.slf4j.simpleLogger.log.org.apache.http.impl.client.cache.CachingExec=info
+org.slf4j.simpleLogger.log.net.spy.memcached.MemcachedConnection=error
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
