Author: olamy
Date: Sat Nov 24 10:50:46 2007
New Revision: 597902
URL: http://svn.apache.org/viewvc?rev=597902&view=rev
Log:
fix MWAR-129 it
add missing license headers
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/pom.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/WEB-INF/web.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/index.jsp
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/param.jsp
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=597902&r1=597901&r2=597902&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Sat Nov 24 10:50:46 2007
@@ -1,5 +1,24 @@
-<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";>
+<?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.
+-->
+
+<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/pom.xml?rev=597902&r1=597901&r2=597902&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/pom.xml Sat Nov 24
10:50:46 2007
@@ -1,5 +1,23 @@
-<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";>
+<?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.
+-->
+<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
<groupId>testwar</groupId>
<artifactId>mwar_129</artifactId>
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/WEB-INF/web.xml?rev=597902&r1=597901&r2=597902&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/WEB-INF/web.xml
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/WEB-INF/web.xml
Sat Nov 24 10:50:46 2007
@@ -1,7 +1,24 @@
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd"; >
+<!--
+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.
+-->
<web-app>
<display-name>Archetype Created Web Application</display-name>
</web-app>
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/index.jsp?rev=597902&r1=597901&r2=597902&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/index.jsp
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/index.jsp
Sat Nov 24 10:50:46 2007
@@ -1,3 +1,21 @@
+<!--
+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.
+-->
<html>
<body>
<h2>Hello World!</h2>
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/param.jsp
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/param.jsp?rev=597902&r1=597901&r2=597902&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/param.jsp
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/param.jsp
Sat Nov 24 10:50:46 2007
@@ -1,3 +1,21 @@
+<!--
+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.
+-->
<c:set var="app_version" value="${pom.version}"/>
<c:set var="app_mainStyleSheet" value="${app.mainStyleSheet}"/>
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh?rev=597902&r1=597901&r2=597902&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh Sat Nov 24
10:50:46 2007
@@ -45,7 +45,7 @@
System.err.println( "param.jsp file is missing or a directory." );
return false;
}
-
+ System.out.println (" before reading param " );
FileInputStream fis = new FileInputStream ( param );
String paramContent = IOUtil.toString ( fis );
@@ -53,12 +53,12 @@
int indexOf = paramContent.indexOf( "<c:set var=\"app_version\"
value=\"1.0-SNAPSHOT\"/>" );
if ( indexOf < 0)
{
- System.err.println( "param.jsp not contains <c:set var=\"app_version\"
value="1.0-SNAPSHOT\"/>" );
+ System.err.println( "param.jsp not contains <c:set var=\"app_version\"
value=\"1.0-SNAPSHOT\"/>" );
return false;
}
}
-catch( Exception e )
+catch( Throwable e )
{
e.printStackTrace();
result = false;
