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 2006/09/15 23:25:13 UTC
svn commit: r446741 - in /geronimo/server/trunk/testsupport:
test-deployment-j2ee_1.3/test-ear-j2ee_1.3/
test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/
test-deployment-j2ee_1.4/test-ear-j2ee_1.4/
test-deployment-j2ee_1.4/test-e...
Author: jdillon
Date: Fri Sep 15 14:25:11 2006
New Revision: 446741
URL: http://svn.apache.org/viewvc?view=rev&rev=446741
Log:
Bring geronimo-applicationl.xml back, pulling all artifact details from the pom via filtering
Added:
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml (with props)
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml (with props)
Modified:
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml?view=diff&rev=446741&r1=446740&r2=446741
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml Fri Sep 15 14:25:11 2006
@@ -65,6 +65,13 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
Added: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml?view=auto&rev=446741
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml (added)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml Fri Sep 15 14:25:11 2006
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <moduleId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>${pom.artifactId}</artifactId>
+ <version>${pom.version}</version>
+ <type>ear</type>
+ </moduleId>
+ </environment>
+
+</application>
Propchange: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml?view=diff&rev=446741&r1=446740&r2=446741
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml Fri Sep 15 14:25:11 2006
@@ -65,6 +65,13 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
@@ -95,6 +102,7 @@
</configuration>
</plugin>
</plugins>
+
</build>
</project>
Added: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml?view=auto&rev=446741
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml (added)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml Fri Sep 15 14:25:11 2006
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <moduleId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>${pom.artifactId}</artifactId>
+ <version>${pom.version}</version>
+ <type>ear</type>
+ </moduleId>
+ </environment>
+
+</application>
Propchange: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml