Author: ptahchiev
Date: Thu Mar 6 10:14:23 2008
New Revision: 634373
URL: http://svn.apache.org/viewvc?rev=634373&view=rev
Log:
Added some changes to the test: the ear is not performed. Also the properties
are added to the file.
Modified:
jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/maven.xml
jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/project.properties
Modified:
jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/maven.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/maven.xml?rev=634373&r1=634372&r2=634373&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/maven.xml
(original)
+++
jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/maven.xml
Thu Mar 6 10:14:23 2008
@@ -20,7 +20,7 @@
<goal name="testPlugin" prereqs="clean">
<echo>NOTE: this test is only effective if you set at least one container
to run cactus tests</echo>
<echo>Set maven.compile.target as ${maven.compile.target}</echo>
- <attainGoal name="cactus:test-ear"/>
+ <!--attainGoal name="cactus:test-ear"/-->
<attainGoal name="cactus:test-war"/>
<attainGoal name="cactus:single"/>
<attainGoal name="cactus:match"/>
Modified:
jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/project.properties
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/project.properties?rev=634373&r1=634372&r2=634373&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/project.properties
(original)
+++
jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/project.properties
Thu Mar 6 10:14:23 2008
@@ -1,16 +1,11 @@
-# -------------------------------------------------------------------
-# Copyright 2005 The Apache Software Foundation.
-#
-# Licensed 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.
-# -------------------------------------------------------------------
-maven.ear.appxml.generate=true
+maven.war.src=${basedir}/src/web
+cactus.src.dir=${basedir}/src/test-cactus
+# properties to be tested
+cactus.sysproperties=prop1 prop2
+prop1=value1
+prop2=value2
+# set which test shoud be run by cactus:test and cactus:match
+testcase=org.apache.cactus.integration.maven.test.TestProperties
+testmatch=org.apache.cactus.integration.maven.test.TestProperties
+# makes sure test passes on JDK 5.0
+maven.compile.target=${java.specification.version}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
