You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/05/05 19:10:06 UTC
svn commit: r653529 - in
/geronimo/server/trunk/testsuite/enterprise-testsuite: ./ ejb-tests/
ejb-tests/ejb-ear/ ejb-tests/ejb-ejb/ ejb-tests/ejb-war/
ejbcontainer-tests/ jms-tests/ jms-tests/jms-ear/ jms-tests/jms-ejb/
jms-tests/jms-war/ jpa-tests/ jp...
Author: jdillon
Date: Mon May 5 10:10:05 2008
New Revision: 653529
URL: http://svn.apache.org/viewvc?rev=653529&view=rev
Log:
(GERONIMO-3980) Use shitty-maven-plugin instead of maven-maven-plugin to drive test builds
Added:
geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/goals.txt (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/goals.txt (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/goals.txt (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/goals.txt (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/goals.txt (with props)
Modified:
geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml Mon May 5 10:10:05 2008
@@ -34,6 +34,10 @@
<name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Tests EAR</name>
<packaging>ear</packaging>
+ <!--
+ FIXME: Split this module up... one to build the ear, one to run the tests.
+ -->
+
<description>
Geronimo test EAR for EJB Tests
</description>
@@ -46,6 +50,7 @@
<type>war</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>ejb-ejb</artifactId>
@@ -53,11 +58,13 @@
<type>ejb</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
@@ -68,6 +75,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
<displayName>Geronimo EAR for EJB Tests</displayName>
@@ -93,7 +101,6 @@
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>testsuite-maven-plugin</artifactId>
- <version>${version}</version>
<executions>
<execution>
<id>generate-surefire-xml</id>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml Mon May 5 10:10:05 2008
@@ -32,7 +32,6 @@
<artifactId>ejb-ejb</artifactId>
<name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Tests EJB</name>
- <packaging>jar</packaging>
<description>
Geronimo test JAR for EJB Tests
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml Mon May 5 10:10:05 2008
@@ -45,6 +45,20 @@
<version>${version}</version>
<scope>provided</scope>
</dependency>
+
+ <!--
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ -->
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/goals.txt?rev=653529&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/goals.txt (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/goals.txt Mon May 5 10:10:05 2008
@@ -0,0 +1 @@
+clean install
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/goals.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/goals.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml Mon May 5 10:10:05 2008
@@ -1,22 +1,27 @@
<?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.
-->
-<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">
+
+<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -27,6 +32,7 @@
<artifactId>ejb-tests</artifactId>
<packaging>pom</packaging>
+
<name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Tests</name>
<dependencies>
@@ -35,6 +41,7 @@
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
@@ -42,15 +49,10 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>child</id>
- <modules>
- <module>ejb-ejb</module>
- <module>ejb-war</module>
- <module>ejb-ear</module>
- </modules>
- </profile>
- </profiles>
+ <modules>
+ <module>ejb-ejb</module>
+ <module>ejb-war</module>
+ <module>ejb-ear</module>
+ </modules>
</project>
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/goals.txt?rev=653529&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/goals.txt (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/goals.txt Mon May 5 10:10:05 2008
@@ -0,0 +1 @@
+clean install
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/goals.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/goals.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/goals.txt?rev=653529&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/goals.txt (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/goals.txt Mon May 5 10:10:05 2008
@@ -0,0 +1 @@
+clean install
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/goals.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/goals.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Mon May 5 10:10:05 2008
@@ -34,6 +34,10 @@
<name>Geronimo TestSuite :: Enterprise Testsuite :: JMS EAR</name>
<packaging>ear</packaging>
+ <!--
+ FIXME: Split this module up... one to build the ear, one to run the tests.
+ -->
+
<description>
Geronimo test EAR for JMS.
</description>
@@ -45,17 +49,20 @@
<version>${version}</version>
<type>war</type>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>jms-ejb</artifactId>
<version>${version}</version>
<type>ejb</type>
</dependency>
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml Mon May 5 10:10:05 2008
@@ -1,30 +1,37 @@
<?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
+ 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.
+-->
- http://www.apache.org/licenses/LICENSE-2.0
+<!-- $Rev$ $Date$ -->
- 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>
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<artifactId>jms-tests</artifactId>
<groupId>org.apache.geronimo.testsuite</groupId>
<version>2.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>jms-ejb</artifactId>
- <name>jms-ejb</name>
<packaging>ejb</packaging>
<dependencies>
@@ -40,12 +47,14 @@
<version>1.0.1</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml Mon May 5 10:10:05 2008
@@ -39,7 +39,7 @@
</description>
<dependencies>
- <!--
+ <!--
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml Mon May 5 10:10:05 2008
@@ -1,21 +1,27 @@
<?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$ -->
+
<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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -26,20 +32,13 @@
<artifactId>jms-tests</artifactId>
<packaging>pom</packaging>
- <name>Geronimo TestSuite :: Enterprise Testsuite :: JMS Tests</name>
- <profiles>
- <profile>
- <id>child</id>
- <modules>
- <module>jms-war</module>
- <module>jms-ear</module>
- </modules>
- </profile>
- </profiles>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: JMS Tests</name>
<modules>
<module>jms-ejb</module>
+ <module>jms-war</module>
+ <module>jms-ear</module>
</modules>
</project>
\ No newline at end of file
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/goals.txt?rev=653529&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/goals.txt (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/goals.txt Mon May 5 10:10:05 2008
@@ -0,0 +1 @@
+clean install
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/goals.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/goals.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml Mon May 5 10:10:05 2008
@@ -1,23 +1,27 @@
-<?xml version="1.0"?>
+<?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.
-->
-<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">
+<!-- $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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,6 +34,10 @@
<name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - EAR</name>
<packaging>ear</packaging>
+ <!--
+ FIXME: Split this module up... one to build the ear, one to run the tests.
+ -->
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
@@ -37,6 +45,7 @@
<version>${version}</version>
<type>ejb</type>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>jpa-war</artifactId>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Mon May 5 10:10:05 2008
@@ -1,23 +1,28 @@
-<?xml version="1.0"?>
+<?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.
-->
-<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">
- <modelVersion>4.0.0</modelVersion>
+
+<!-- $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">
+
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml Mon May 5 10:10:05 2008
@@ -1,23 +1,27 @@
-<?xml version="1.0"?>
+<?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.
-->
-<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">
+<!-- $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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml Mon May 5 10:10:05 2008
@@ -1,22 +1,27 @@
<?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.
-->
-<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">
+
+<!-- $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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -27,17 +32,13 @@
<artifactId>jpa-tests</artifactId>
<packaging>pom</packaging>
+
<name>Geronimo TestSuite :: Enterprise Testsuite :: JPA Tests</name>
- <profiles>
- <profile>
- <id>child</id>
- <modules>
- <module>jpa-ejb</module>
- <module>jpa-war</module>
- <module>jpa-ear</module>
- </modules>
- </profile>
- </profiles>
+ <modules>
+ <module>jpa-ejb</module>
+ <module>jpa-war</module>
+ <module>jpa-ear</module>
+ </modules>
</project>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml Mon May 5 10:10:05 2008
@@ -46,15 +46,107 @@
- JavaMail
</description>
- <build>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemProperties>
+ <property>
+ <name>geronimoVersion</name>
+ <value>${version}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
- <!-- This plugin is needed for all suite poms. -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <inherited>false</inherited>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>start</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <logOutput>true</logOutput>
+ <background>true</background>
+ <verifyTimeout>300</verifyTimeout>
+ <optionSets>
+ <optionSet>
+ <id>default</id>
+ <options>
+ <option>-XX:MaxPermSize=128m</option>
+ </options>
+ </optionSet>
+ </optionSets>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop</id>
+ <phase>install</phase>
+ <goals>
+ <goal>stop-server</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>shitty-maven-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <projects>
+ <fileset>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>*/pom.xml</include>
+ </includes>
+
+ <!--
+ FIXME: Why is this excluded? If its bunk, then delete it.
+ -->
+ <excludes>
+ <exclude>ejbcontainer-tests/pom.xml</exclude>
+ </excludes>
+ </fileset>
+ </projects>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>clean</goal>
+ <goal>install</goal>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>testsuite-maven-plugin</artifactId>
+ <inherited>false</inherited>
<executions>
<execution>
- <id>generate-surefire-xml</id>
<phase>install</phase>
<goals>
<goal>generate-surefire-xml</goal>
@@ -65,66 +157,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <!--
- TODO: Hook up m-m-p to allow child modules to be built early during this modules
- compile (or something) phase.
- -->
- <build>
- <plugins>
- <plugin>
- <!--
- One of the pom that this invokes using m-m-p has packaging set to "pom".
- That expects it's parent (this pom) to be installed already.
- So installing it ahead before we invoke it in the integration-test phase
- -->
- <artifactId>maven-install-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>install-ahead</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>maven-maven-plugin</artifactId>
- <configuration>
- <fileset>
- <excludes>
- <exclude>ejbcontainer-tests/pom.xml</exclude>
- </excludes>
- </fileset>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <id>child</id>
- </profile>
- </profiles>
-
-
</project>
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/goals.txt?rev=653529&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/goals.txt (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/goals.txt Mon May 5 10:10:05 2008
@@ -0,0 +1 @@
+clean install
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/goals.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/goals.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/pom.xml Mon May 5 10:10:05 2008
@@ -1,22 +1,27 @@
<?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.
-->
-<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">
+
+<!-- $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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -27,17 +32,13 @@
<artifactId>sec-tests</artifactId>
<packaging>pom</packaging>
+
<name>Geronimo TestSuite :: Enterprise Testsuite :: Security Tests</name>
- <profiles>
- <profile>
- <id>child</id>
- <modules>
- <module>sec-ejb</module>
- <module>sec-war</module>
- <module>sec-ear</module>
- </modules>
- </profile>
- </profiles>
+ <modules>
+ <module>sec-ejb</module>
+ <module>sec-war</module>
+ <module>sec-ear</module>
+ </modules>
</project>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml Mon May 5 10:10:05 2008
@@ -1,23 +1,27 @@
-<?xml version="1.0"?>
+<?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.
-->
-<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">
+<!-- $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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -25,10 +29,15 @@
<artifactId>sec-tests</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
+
<artifactId>sec-ear</artifactId>
<name>Geronimo TestSuite :: Enterprise Testsuite :: Security - EAR</name>
<packaging>ear</packaging>
-
+
+ <!--
+ FIXME: Split this module up... one to build the ear, one to run the tests.
+ -->
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
@@ -36,6 +45,7 @@
<version>${version}</version>
<type>ejb</type>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>sec-war</artifactId>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml Mon May 5 10:10:05 2008
@@ -1,23 +1,28 @@
-<?xml version="1.0"?>
+<?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.
-->
-<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">
- <modelVersion>4.0.0</modelVersion>
+
+<!-- $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">
+
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
@@ -54,13 +59,6 @@
<version>${version}</version>
<scope>provided</scope>
</dependency>
-
- <!-- the enhancer seems to need xerces -->
- <!--<dependency>-->
- <!--<groupId>xerces</groupId>-->
- <!--<artifactId>xercesImpl</artifactId>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
</dependencies>
<build>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml?rev=653529&r1=653528&r2=653529&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml Mon May 5 10:10:05 2008
@@ -1,23 +1,27 @@
-<?xml version="1.0"?>
+<?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.
-->
-<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">
+<!-- $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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -37,23 +41,27 @@
<version>${version}</version>
<optional>true</optional>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>