Author: olamy
Date: Mon Sep 10 10:27:06 2012
New Revision: 1382739
URL: http://svn.apache.org/viewvc?rev=1382739&view=rev
Log:
improve it test to ensure Catalina/* directories are added too
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
(with props)
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1382739&r1=1382738&r2=1382739&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Sep 10 10:27:06 2012
@@ -660,6 +660,11 @@
</dependencies>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<version>1.5.5</version>
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml?rev=1382739&view=auto
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
(added)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
Mon Sep 10 10:27:06 2012
@@ -0,0 +1,18 @@
+<?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.
+-->
+<Context antiResourceLocking="false" privileged="true" useHttpOnly="true" />
Propchange:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh?rev=1382739&r1=1382738&r2=1382739&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
Mon Sep 10 10:27:06 2012
@@ -65,6 +65,16 @@ try
System.err.println( "conf/server.xml is missing." );
return false;
}
+ if (!contents.contains("conf/logging.properties") )
+ {
+ System.err.println( "conf/logging.properties is missing." );
+ return false;
+ }
+ if (!contents.contains("conf/Catalina/localhost/manager.xml") )
+ {
+ System.err.println( "conf/Catalina/localhost/manager.xml is missing."
);
+ return false;
+ }
if (!contents.contains("tomcat.standalone.properties") )
{
System.err.println( "tomcat.standalone.properties is missing." );
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
