Author: rwatler
Date: Mon May 19 16:57:16 2014
New Revision: 1595961
URL: http://svn.apache.org/r1595961
Log:
JS2-1274: Correct deployment filtering for Tomcat 7 context.xml files properly
inserting database urls including '&' with '&' entity
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml?rev=1595961&r1=1595960&r2=1595961&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
Mon May 19 16:57:16 2014
@@ -252,6 +252,26 @@
</plugin>
<plugin>
<groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+ <version>${org.apache.portals.jetspeed.version}</version>
+ <executions>
+ <execution>
+ <id>xml-encode-database-url</id>
+ <goals>
+ <goal>event</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+
<srcFilePath>${project.build.directory}/resources/tomcat/context.xml</srcFilePath>
+ <editPattern>%26</editPattern> <!-- use %26 for '&' -->
+ <replacePattern>%26amp;</replacePattern> <!-- use %26 for
'&' -->
+ <event>edit</event>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-deploy-maven-plugin</artifactId>
<version>${org.apache.portals.jetspeed.version}</version>
<executions>
@@ -474,6 +494,26 @@
</plugin>
<plugin>
<groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+ <version>${org.apache.portals.jetspeed.version}</version>
+ <executions>
+ <execution>
+ <id>xml-encode-database-url</id>
+ <goals>
+ <goal>event</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+
<srcFilePath>${project.build.directory}/resources/tomcat/context.xml</srcFilePath>
+ <editPattern>%26</editPattern> <!-- use %26 for '&' -->
+ <replacePattern>%26amp;</replacePattern> <!-- use %26 for
'&' -->
+ <event>edit</event>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-deploy-maven-plugin</artifactId>
<version>${org.apache.portals.jetspeed.version}</version>
<executions>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml?rev=1595961&r1=1595960&r2=1595961&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
Mon May 19 16:57:16 2014
@@ -201,6 +201,26 @@
</plugin>
<plugin>
<groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+ <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+ <executions>
+ <execution>
+ <id>xml-encode-database-url</id>
+ <goals>
+ <goal>event</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+
<srcFilePath>${dollar}{project.build.directory}/resources/context.xml</srcFilePath>
+ <editPattern>%26</editPattern> <!-- use %26 for '&' -->
+ <replacePattern>%26amp;</replacePattern> <!-- use %26 for
'&' -->
+ <event>edit</event>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-deploy-maven-plugin</artifactId>
<version>${dollar}{org.apache.portals.jetspeed.version}</version>
<executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
