David, There is something wrong with these changes or something else is going on but all the index pages are not showing anymore on Jetty. For example, http://localhost:8080/console shows list of files but http://localhost:8080/console/login.jsp works as expected. Interestingly enough all is good on Tomcat. I guess that's why the Jetty tests keep failing in trunk.
Jarek On Mon, Mar 2, 2009 at 3:06 AM, <[email protected]> wrote: > Author: djencks > Date: Mon Mar 2 08:06:01 2009 > New Revision: 749226 > > URL: http://svn.apache.org/viewvc?rev=749226&view=rev > Log: > GERONIMO-4560 fix build problems from previous commit. Not sure if testsuite > is completely stable > > Modified: > geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml > geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml > geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml > geronimo/server/trunk/plugins/activemq/activemq-webconsole/pom.xml > geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml > geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml > geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml > geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml > geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml > geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml > geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml > geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml > geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml > geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml > geronimo/server/trunk/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml > geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml > geronimo/server/trunk/pom.xml > > Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml > (original) > +++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Mon Mar > 2 08:06:01 2009 > @@ -118,11 +118,7 @@ > <artifactId>maven-war-plugin</artifactId> > <configuration> > <webXml>${project.build.directory}/jspweb.xml</webXml> > - <archiveClasses>true</archiveClasses> > - <archive> > - <!-- Do not include META-INF/maven to avoid long > file problems on windows --> > - <addMavenDescriptor>false</addMavenDescriptor> > - </archive> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > </configuration> > </plugin> > </plugins> > > Modified: > geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml > (original) > +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml > Mon Mar 2 08:06:01 2009 > @@ -1,5 +1,24 @@ > <?xml version="1.0" encoding="UTF-8"?> > -<project> > +<!-- > + Licensed to the Apache Software Foundation (ASF) under one or more > + contributor license agreements. See the NOTICE file distributed with > + this work for additional information regarding copyright ownership. > + The ASF licenses this file to You 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. > +--> > + > +<!-- $Rev$ $Date$ --> > + > +<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";> > <parent> > <artifactId>activemq</artifactId> > <groupId>org.apache.geronimo.plugins > > Modified: > geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml > (original) > +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml > Mon Mar 2 08:06:01 2009 > @@ -1,5 +1,24 @@ > <?xml version="1.0" encoding="UTF-8"?> > -<project> > +<!-- > + Licensed to the Apache Software Foundation (ASF) under one or more > + contributor license agreements. See the NOTICE file distributed with > + this work for additional information regarding copyright ownership. > + The ASF licenses this file to You 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. > +--> > + > +<!-- $Rev: 650968 $ $Date: 2008-04-23 10:59:20 -0700 (Wed, 23 Apr 2008) $ --> > + > +<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";> > <parent> > <artifactId>activemq</artifactId> > <groupId>org.apache.geronimo.plugins > > Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/activemq/activemq-webconsole/pom.xml > (original) > +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole/pom.xml Mon > Mar 2 08:06:01 2009 > @@ -1,5 +1,24 @@ > <?xml version="1.0" encoding="UTF-8"?> > -<project> > +<!-- > + Licensed to the Apache Software Foundation (ASF) under one or more > + contributor license agreements. See the NOTICE file distributed with > + this work for additional information regarding copyright ownership. > + The ASF licenses this file to You 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. > +--> > + > +<!-- $Rev$ $Date$ --> > + > +<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";> > <parent> > <artifactId>activemq</artifactId> > <groupId>org.apache.geronimo.plugins</groupId> > @@ -24,9 +43,8 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > - <inherited>false</inherited> > <configuration> > - <failOnMissingWebXml>false</failOnMissingWebXml> > + <archiveClasses>false</archiveClasses> > <overlays> > <overlay> > <id>activemq-webconsole</id> > > Modified: geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml > (original) > +++ geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml Mon > Mar 2 08:06:01 2009 > @@ -75,6 +75,10 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > + <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > + </configuration> > </plugin> > </plugins> > </build> > > Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml > (original) > +++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Mon > Mar 2 08:06:01 2009 > @@ -1,22 +1,12 @@ > <?xml version="1.0" encoding="UTF-8"?> > -<!-- > - Licensed to the Apache Software Foundation (ASF) under one or more > - contributor license agreements. See the NOTICE file distributed with > - this work for additional information regarding copyright ownership. > - The ASF licenses this file to You 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. > ---> > + <!-- > + Licensed to the Apache Software Foundation (ASF) under one or more > contributor license agreements. See the NOTICE file distributed with this > work for additional information regarding copyright ownership. The ASF > licenses this file to You > + 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. > + --> > > -<!-- $Rev$ $Date$ --> > + <!-- $Rev$ $Date$ --> > > <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";> > > @@ -56,14 +46,14 @@ > <version>${version}</version> > <scope>provided</scope> > </dependency> > - > + > <dependency> > <groupId>org.apache.geronimo.modules</groupId> > <artifactId>geronimo-j2ee</artifactId> > <version>${version}</version> > <scope>provided</scope> > </dependency> > - > + > <dependency> > <groupId>org.apache.geronimo.framework</groupId> > <artifactId>geronimo-security</artifactId> > @@ -76,14 +66,14 @@ > <artifactId>geronimo-servlet_2.5_spec</artifactId> > <scope>provided</scope> > </dependency> > - > + > <dependency> > <groupId>org.apache.geronimo.plugins</groupId> > <artifactId>console-core</artifactId> > <version>${version}</version> > <scope>provided</scope> > </dependency> > - > + > <dependency> > <groupId>javax.portlet</groupId> > <artifactId>portlet-api</artifactId> > @@ -109,66 +99,40 @@ > </dependency> > > </dependencies> > - > - <!-- Build configuration --> > - <build> > - <resources> > - <resource> > - <directory>src/main/resources</directory> > - <filtering>true</filtering> > - </resource> > - </resources> > - > - <plugins> > - > -<!-- > - > - The pluto-maven-plugin doesn't retain the xmlns for <web-app> which makes > - geronimo angry. so for now we can't use this plugin. so for now the > web.xml > - has to be updated by hand when a portlet is added/removed from portlet.xml. > - See GERONIMO-3252 for an idea about a module builder extension in Geronimo > - that would eliminate the need for updating the web.xml at build time. > - > - configure maven-war-plugin to use updated web.xml > - <plugin> > - <artifactId>maven-war-plugin</artifactId> > - <configuration> > - <webXml>${project.build.directory}/pluto-resources/web.xml</webXml> > - <resource> > - <directory>${pom.basedir}</directory> > - <includes> > - <include>LICENSE.txt</include> > - <include>NOTICE.txt</include> > - </includes> > - <targetPath>META-INF</targetPath> > - </resource> > - </configuration> > - </plugin> > - > - bind 'pluto:assemble' goal to 'process-resources' lifecycle > - <plugin> > - <groupId>org.apache.pluto</groupId> > - <artifactId>maven-pluto-plugin</artifactId> > - <executions> > - <execution> > - <phase>generate-resources</phase> > - <goals> > - <goal>assemble</goal> > - </goals> > - </execution> > - </executions> > - </plugin> > ---> > - > - <plugin> > - <groupId>org.codehaus.mojo.jspc</groupId> > - <artifactId>jspc-maven-plugin</artifactId> > - </plugin> > - <plugin> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-war-plugin</artifactId> > - </plugin> > - </plugins> > - </build> > - > + > + <!-- Build configuration --> > + <build> > + <resources> > + <resource> > + <directory>src/main/resources</directory> > + <filtering>true</filtering> > + </resource> > + </resources> > + > + <plugins> > + > + <!-- > + > + The pluto-maven-plugin doesn't retain the xmlns for > <web-app> which makes geronimo angry. so for now we can't use this plugin. so > for now the web.xml has to be updated by hand when a portlet is added/removed > from portlet.xml. See > + GERONIMO-3252 for an idea about a module builder extension > in Geronimo that would eliminate the need for updating the web.xml at build > time. configure maven-war-plugin to use updated web.xml <plugin> > + <artifactId>maven-war-plugin</artifactId> <configuration> > <webXml>${project.build.directory}/pluto-resources/web.xml</webXml> > <resource> <directory>${pom.basedir}</directory> <includes> > <include>LICENSE.txt</include> > + <include>NOTICE.txt</include> </includes> > <targetPath>META-INF</targetPath> </resource> </configuration> </plugin> bind > 'pluto:assemble' goal to 'process-resources' lifecycle <plugin> > <groupId>org.apache.pluto</groupId> > + <artifactId>maven-pluto-plugin</artifactId> <executions> > <execution> <phase>generate-resources</phase> <goals> <goal>assemble</goal> > </goals> </execution> </executions> </plugin> > + --> > + > + <plugin> > + <groupId>org.codehaus.mojo.jspc</groupId> > + <artifactId>jspc-maven-plugin</artifactId> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-war-plugin</artifactId> > + <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > + </configuration> > + </plugin> > + </plugins> > + </build> > + > </project> > > Modified: geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml > (original) > +++ geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml Mon > Mar 2 08:06:01 2009 > @@ -87,6 +87,8 @@ > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > <webResources> > <resource> > <filtering>true</filtering> > > Modified: geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml (original) > +++ geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml Mon Mar 2 > 08:06:01 2009 > @@ -183,6 +183,10 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > + <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > + </configuration> > </plugin> > </plugins> > </build> > > Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml > (original) > +++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml Mon > Mar 2 08:06:01 2009 > @@ -124,6 +124,10 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > + <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > + </configuration> > </plugin> > </plugins> > </build> > > Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml (original) > +++ geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml Mon Mar 2 > 08:06:01 2009 > @@ -110,6 +110,10 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > + <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > + </configuration> > </plugin> > </plugins> > </build> > > Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml (original) > +++ geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml Mon Mar 2 > 08:06:01 2009 > @@ -153,6 +153,10 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > + <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > + </configuration> > </plugin> > </plugins> > </build> > > Modified: > geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml > (original) > +++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml > Mon Mar 2 08:06:01 2009 > @@ -160,6 +160,10 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > + <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > + </configuration> > </plugin> > </plugins> > </build> > > Modified: > geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- > geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml > (original) > +++ > geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml > Mon Mar 2 08:06:01 2009 > @@ -63,6 +63,10 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > + <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > + </configuration> > </plugin> > </plugins> > </build> > > Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml > (original) > +++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml Mon > Mar 2 08:06:01 2009 > @@ -151,6 +151,10 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > + <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > + </configuration> > </plugin> > </plugins> > </build> > > Modified: > geronimo/server/trunk/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- > geronimo/server/trunk/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml > (original) > +++ > geronimo/server/trunk/plugins/uddi/uddi-server/geronimo-uddi-server/pom.xml > Mon Mar 2 08:06:01 2009 > @@ -56,6 +56,10 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > + <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > + </configuration> > </plugin> > </plugins> > </build> > > Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml (original) > +++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml Mon Mar 2 > 08:06:01 2009 > @@ -69,6 +69,10 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > + <configuration> > + <webXml>${project.build.directory}/jspweb.xml</webXml> > + <warSourceExcludes>**/*.jsp</warSourceExcludes> > + </configuration> > </plugin> > </plugins> > </build> > > Modified: geronimo/server/trunk/pom.xml > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=749226&r1=749225&r2=749226&view=diff > ============================================================================== > --- geronimo/server/trunk/pom.xml (original) > +++ geronimo/server/trunk/pom.xml Mon Mar 2 08:06:01 2009 > @@ -2834,10 +2834,11 @@ > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-war-plugin</artifactId> > - <version>2.0.2</version> > + <version>2.1-alpha-2</version> > <configuration> > - > <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory> > + <!-- > <webXml>${project.build.directory}/jspweb.xml</webXml> > + --> > <archiveClasses>true</archiveClasses> > <archive> > <!-- Do not include META-INF/maven to avoid long > file problems on windows --> > > >
