You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/06/17 23:08:01 UTC

svn commit: r955748 [4/7] - in /geronimo/server/branches/2.1.6: ./ assemblies/ assemblies/geronimo-boilerplate-minimal/ assemblies/geronimo-framework/ assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-jetty6-minimal/ assemblies/geronimo-tomcat6-j...

Modified: geronimo/server/branches/2.1.6/plugins/monitoring/agent-jmx/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/monitoring/agent-jmx/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/monitoring/agent-jmx/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/monitoring/agent-jmx/pom.xml Thu Jun 17 21:07:52 2010
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>agent-jmx</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/monitoring/agent-sql/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/monitoring/agent-sql/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/monitoring/agent-sql/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/monitoring/agent-sql/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <artifactId>agent-sql</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-ds/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-ds/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-ds/pom.xml Thu Jun 17 21:07:52 2010
@@ -1,79 +1,79 @@
-<?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: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
-
-<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.plugins.monitoring</groupId>
-        <artifactId>monitoring</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>mconsole-ds</artifactId>
-    <name>Geronimo Plugins, Monitoring :: Console DataSource</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-local</artifactId>
-            <type>rar</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
-                    <category>Monitoring</category>
-                    <module>
-                        <groupId>org.tranql</groupId>
-                        <artifactId>tranql-connector-derby-embed-local</artifactId>
-                        <type>rar</type>
-                    </module>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+<?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: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
+
+<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.plugins.monitoring</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>2.1.6-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>mconsole-ds</artifactId>
+    <name>Geronimo Plugins, Monitoring :: Console DataSource</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-local</artifactId>
+            <type>rar</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <category>Monitoring</category>
+                    <module>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector-derby-embed-local</artifactId>
+                        <type>rar</type>
+                    </module>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Modified: geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-jetty/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-jetty/pom.xml Thu Jun 17 21:07:52 2010
@@ -1,123 +1,123 @@
-<?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: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
-
-<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.plugins.monitoring</groupId>
-        <artifactId>monitoring</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>mconsole-jetty</artifactId>
-    <name>Geronimo Plugins, Monitoring :: Console (Jetty)</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>mconsole-ds</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-jetty</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-            <artifactId>mconsole-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-            <scope>provided</scope>
-        </dependency>
-	
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-legacy-jetty6</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
-                    <module>
-                        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-                        <artifactId>mconsole-war</artifactId>
-                        <version>${version}</version>
-                        <type>war</type>
-                    </module>
-                    <category>Monitoring</category>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+<?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: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
+
+<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.plugins.monitoring</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>2.1.6-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>mconsole-jetty</artifactId>
+    <name>Geronimo Plugins, Monitoring :: Console (Jetty)</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>mconsole-ds</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-jetty</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>mconsole-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+            <scope>provided</scope>
+        </dependency>
+	
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>dojo-legacy-jetty6</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+                        <artifactId>mconsole-war</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
+                    </module>
+                    <category>Monitoring</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Modified: geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-tomcat/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-tomcat/pom.xml Thu Jun 17 21:07:52 2010
@@ -1,131 +1,131 @@
-<?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: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
-
-<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.plugins.monitoring</groupId>
-        <artifactId>monitoring</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>mconsole-tomcat</artifactId>
-    <name>Geronimo Plugins, Monitoring :: Console (Tomcat)</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>mconsole-ds</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-tomcat</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-            <artifactId>mconsole-war</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-            <scope>provided</scope>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>j2ee-security</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-legacy-tomcat</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <!-- see if openejb-client can be used -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
-                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
-                    <module>
-                        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-                        <artifactId>mconsole-war</artifactId>
-                        <version>${version}</version>
-                        <type>war</type>
-                    </module>
-                    <category>Monitoring</category>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+<?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: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
+
+<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.plugins.monitoring</groupId>
+        <artifactId>monitoring</artifactId>
+        <version>2.1.6-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>mconsole-tomcat</artifactId>
+    <name>Geronimo Plugins, Monitoring :: Console (Tomcat)</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat6-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>mconsole-ds</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-tomcat</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>mconsole-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+            <scope>provided</scope>
+        </dependency>
+		
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+		
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>dojo-legacy-tomcat</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <!-- see if openejb-client can be used -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+                        <artifactId>mconsole-war</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
+                    </module>
+                    <category>Monitoring</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Modified: geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-war/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-war/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/monitoring/mconsole-war/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>mconsole-war</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/monitoring/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/monitoring/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/monitoring/pom.xml Thu Jun 17 21:07:52 2010
@@ -1,86 +1,86 @@
-<?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$ -->
-
-<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.plugins</groupId>
-        <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-    <artifactId>monitoring</artifactId>
-    <name>Geronimo Plugins, Monitoring</name>
-    <packaging>pom</packaging>
-
-    <description> Geronimo Monitoring and Management </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <modules>
-        <module>agent-ds</module>
-        <module>agent-jar</module>
-        <module>agent-ejb</module>
-        <module>agent-car-ejb</module>
-        <module>agent-jmx</module>
-        <module>agent-car-jmx</module>
-        <module>agent-sql</module>
-        <module>mconsole-ds</module>
-        <module>mconsole-jetty</module>
-        <module>mconsole-tomcat</module>
-        <module>mconsole-war</module>
-    </modules>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        
-        <pluginManagement>
-            <plugins>
-                <!-- inheriting configration for war plugin, i,e, precompile JSPs -->
-                <!-- inherits car configuration from parent -->
-                <plugin>
-                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                    <artifactId>car-maven-plugin</artifactId>
-                    <configuration>
-                        <useMavenDependencies>
-                            <value>true</value>
-                            <includeVersion>true</includeVersion>
-                        </useMavenDependencies>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-</project>
+<?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$ -->
+
+<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.plugins</groupId>
+        <artifactId>plugins</artifactId>
+        <version>2.1.6-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+    <artifactId>monitoring</artifactId>
+    <name>Geronimo Plugins, Monitoring</name>
+    <packaging>pom</packaging>
+
+    <description> Geronimo Monitoring and Management </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
+    <modules>
+        <module>agent-ds</module>
+        <module>agent-jar</module>
+        <module>agent-ejb</module>
+        <module>agent-car-ejb</module>
+        <module>agent-jmx</module>
+        <module>agent-car-jmx</module>
+        <module>agent-sql</module>
+        <module>mconsole-ds</module>
+        <module>mconsole-jetty</module>
+        <module>mconsole-tomcat</module>
+        <module>mconsole-war</module>
+    </modules>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
+        <pluginManagement>
+            <plugins>
+                <!-- inheriting configration for war plugin, i,e, precompile JSPs -->
+                <!-- inherits car configuration from parent -->
+                <plugin>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
+                    <artifactId>car-maven-plugin</artifactId>
+                    <configuration>
+                        <useMavenDependencies>
+                            <value>true</value>
+                            <includeVersion>true</includeVersion>
+                        </useMavenDependencies>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+</project>

Modified: geronimo/server/branches/2.1.6/plugins/myfaces/geronimo-myfaces-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/myfaces/geronimo-myfaces-builder/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/myfaces/geronimo-myfaces-builder/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/myfaces/geronimo-myfaces-builder/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>myfaces</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/myfaces/geronimo-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/myfaces/geronimo-myfaces/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/myfaces/geronimo-myfaces/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/myfaces/geronimo-myfaces/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>myfaces</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/myfaces/myfaces-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/myfaces/myfaces-deployer/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/myfaces/myfaces-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/myfaces/myfaces-deployer/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>myfaces</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/myfaces/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/myfaces/myfaces/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/myfaces/myfaces/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/myfaces/myfaces/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>myfaces</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/myfaces/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/myfaces/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/myfaces/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>myfaces</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/openejb/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/openejb/geronimo-openejb-builder/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/openejb/geronimo-openejb-builder/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/openejb/geronimo-openejb/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/openejb/geronimo-openejb/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/openejb/openejb-deployer/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/openejb/openejb-deployer/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/openejb/openejb/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/openejb/openejb/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/openejb/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/openejb/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/openejb/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>openejb</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-openjpa/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-openjpa/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-openjpa/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-persistence-jpa10/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/openjpa/geronimo-persistence-jpa10/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/openjpa/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/openjpa/openjpa/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/openjpa/openjpa/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/openjpa/openjpa/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/openjpa/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/openjpa/persistence-jpa10-deployer/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/openjpa/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/openjpa/persistence-jpa10-deployer/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/openjpa/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/openjpa/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/openjpa/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-console-jetty/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-console-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-console-jetty/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plancreator</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>plancreator-console-jetty</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-console-tomcat/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-console-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-console-tomcat/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plancreator</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>plancreator-console-tomcat</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-portlets/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-portlets/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/plancreator/plancreator-portlets/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plancreator</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>plancreator-portlets</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/plancreator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/plancreator/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/plancreator/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/plancreator/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>plancreator</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/pluto/geronimo-pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/pluto/geronimo-pluto/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/pluto/geronimo-pluto/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/pluto/geronimo-pluto/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>pluto</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <artifactId>geronimo-pluto</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/pluto/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/pluto/pluto-support/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/pluto/pluto-support/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/pluto/pluto-support/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>pluto</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <artifactId>pluto-support</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/pluto/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/pluto/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/pluto/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>pluto</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/procrun/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/procrun/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/procrun/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/procrun/pom.xml Thu Jun 17 21:07:52 2010
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/remote-deploy/geronimo-remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/remote-deploy/geronimo-remote-deploy/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/remote-deploy/geronimo-remote-deploy/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/remote-deploy/geronimo-remote-deploy/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>remote-deploy</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-remote-deploy</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/remote-deploy/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/remote-deploy/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/remote-deploy/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>remote-deploy</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/remote-deploy/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/remote-deploy/remote-deploy-jetty/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/remote-deploy/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/remote-deploy/remote-deploy-jetty/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>remote-deploy</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/remote-deploy/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/remote-deploy/remote-deploy-tomcat/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/remote-deploy/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/remote-deploy/remote-deploy-tomcat/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>remote-deploy</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/sharedlib/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/sharedlib/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/sharedlib/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/spring/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/spring/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/spring/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/system-database/geronimo-derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/system-database/geronimo-derby/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/system-database/geronimo-derby/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/system-database/geronimo-derby/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/system-database/geronimo-timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/system-database/geronimo-timer/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/system-database/geronimo-timer/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/system-database/geronimo-timer/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/system-database/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/system-database/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/system-database/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <artifactId>system-database</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/system-database/sysdb-console-jetty/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/system-database/sysdb-console-jetty/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>sysdb-console-jetty</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/system-database/sysdb-console-tomcat/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>sysdb-console-tomcat</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/system-database/sysdb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/system-database/sysdb-portlets/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/system-database/sysdb-portlets/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/system-database/sysdb-portlets/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>sysdb-portlets</artifactId>

Modified: geronimo/server/branches/2.1.6/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/system-database/system-database/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/system-database/system-database/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml Thu Jun 17 21:07:52 2010
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    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: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 2007) $ -->
-
-<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.plugins</groupId>
-        <artifactId>tomcat</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
-    </parent>
-    
-    <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-tomcat6-clustering-builder-wadi</artifactId>
-    <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI Core</name>
-    
-    <dependencies>
-        <!-- xmlbeans, stax-api comes transitively via g-service-builder from this -->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-tomcat6-builder</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-web-2.5-builder</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 2007) $ -->
+
+<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.plugins</groupId>
+        <artifactId>tomcat</artifactId>
+        <version>2.1.6-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-tomcat6-clustering-builder-wadi</artifactId>
+    <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI Core</name>
+    
+    <dependencies>
+        <!-- xmlbeans, stax-api comes transitively via g-service-builder from this -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-tomcat6-builder</artifactId>
+            <version>${version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-web-2.5-builder</artifactId>
+            <version>${version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+

Modified: geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml Thu Jun 17 21:07:52 2010
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    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: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 2007) $ -->
-
-<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.plugins</groupId>
-        <artifactId>tomcat</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
-    </parent>
-    
-    <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
-    <name>Geronimo Plugins, Tomcat :: Clustering over WADI Core</name>
-    
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-clustering-wadi</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-tomcat6</artifactId>
-            <version>${version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 2007) $ -->
+
+<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.plugins</groupId>
+        <artifactId>tomcat</artifactId>
+        <version>2.1.6-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
+    <name>Geronimo Plugins, Tomcat :: Clustering over WADI Core</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-clustering-wadi</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-tomcat6</artifactId>
+            <version>${version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
+

Modified: geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1.6/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/plugins/tomcat/pom.xml?rev=955748&r1=955747&r2=955748&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/plugins/tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1.6/plugins/tomcat/pom.xml Thu Jun 17 21:07:52 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.6-SNAPSHOT</version>
     </parent>
     
     <artifactId>tomcat</artifactId>