Author: markt
Date: Fri Oct 17 19:31:00 2014
New Revision: 1632654
URL: http://svn.apache.org/r1632654
Log:
Further improvements from Pierre Viret to fix JSPs
Added:
tomcat/sandbox/trunk-maven-layout/tomcat-jasper/src/main/resources/ (with
props)
tomcat/sandbox/trunk-maven-layout/tomcat-websocket/src/main/resources/
(with props)
Modified:
tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml
tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/distrib.xml
tomcat/sandbox/trunk-maven-layout/tomcat-websocket/src/main/java/org/apache/tomcat/
(props changed)
Modified: tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml?rev=1632654&r1=1632653&r2=1632654&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml Fri Oct 17 19:31:00
2014
@@ -241,6 +241,10 @@
<goal>resources</goal>
</goals>
<phase>generate-resources</phase>
+ <configuration>
+ <!-- this does not work... workaround implemented
in distrib.xml -->
+ <includeEmptyDirs>true</includeEmptyDirs>
+ </configuration>
</execution>
</executions>
</plugin>
Modified:
tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/distrib.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/distrib.xml?rev=1632654&r1=1632653&r2=1632654&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/distrib.xml
(original)
+++ tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/distrib.xml
Fri Oct 17 19:31:00 2014
@@ -16,6 +16,8 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*</include>
+ <include>temp</include>
+ <include>logs</include>
</includes>
<excludes>
<exclude>bin/*.sh</exclude>
@@ -28,7 +30,16 @@
<include>bin/*.sh</include>
</includes>
<fileMode>0755</fileMode>
- </fileSet>
+ </fileSet>
+ <!-- forces logs & temp empty dirs to get created -->
+ <fileSet>
+ <directory>src/main/resources/logs</directory>
+ <outputDirectory>/logs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/temp</directory>
+ <outputDirectory>/temp</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
<!-- first get all libs whether name equals artifact's name -->
@@ -222,4 +233,4 @@
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-jasper/src/main/resources/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Fri Oct 17 19:31:00 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/res/META-INF/jasper.jar META-INF
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-websocket/src/main/java/org/apache/tomcat/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Oct 17 19:31:00 2014
@@ -1 +1 @@
-^/tomcat/trunk/java/javax/websocket websocket
+^/tomcat/trunk/java/org/apache/tomcat/websocket websocket
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-websocket/src/main/resources/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Fri Oct 17 19:31:00 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/res/META-INF/tomcat-websocket.jar META-INF
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
