geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r411465 [2/2] - in /geronimo/trunk: ./ configs/ configs/axis-deployer/ configs/axis/ configs/client-deployer/ configs/client-security/ configs/client-system/ configs/client/ configs/directory/ configs/geronimo-gbean-deployer/ configs/hot-de...
Date Sat, 03 Jun 2006 19:42:18 GMT
Added: geronimo/trunk/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat-deployer/pom.xml?rev=411465&view=auto
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/pom.xml (added)
+++ geronimo/trunk/configs/tomcat-deployer/pom.xml Sat Jun  3 12:42:16 2006
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tomcat-deployer</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Tomcat Deployer Configuration for performing J2EE deployments</name>
+    <build>
+        <plugins>
+            <plugin>
+                <!-- uses geronimo-gbean-deployer -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-tomcat-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/tomcat-deployer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/tomcat-deployer/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/tomcat-deployer/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat/pom.xml?rev=411465&view=auto
==============================================================================
--- geronimo/trunk/configs/tomcat/pom.xml (added)
+++ geronimo/trunk/configs/tomcat/pom.xml Sat Jun  3 12:42:16 2006
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tomcat</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Tomcat Configuration for the J2EE Server</name>
+    <properties>
+        <PlanHTTPPort2>8090</PlanHTTPPort2>
+        <PlanHTTPSPort2>8453</PlanHTTPSPort2>
+        <PlanAJPPort2>8019</PlanAJPPort2>
+        <PlanServerHostname>localhost</PlanServerHostname>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <!-- uses geronimo-gbean-deployer -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>rmi-naming</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <!-- this should go to g-parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-tomcat</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <!-- this should have come via g-tomcat -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-webservices</artifactId>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/unavailable-client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-client-deployer/pom.xml?rev=411465&view=auto
==============================================================================
--- geronimo/trunk/configs/unavailable-client-deployer/pom.xml (added)
+++ geronimo/trunk/configs/unavailable-client-deployer/pom.xml Sat Jun  3 12:42:16 2006
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>unavailable-client-deployer</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Configuration for no j2ee app clients</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent config -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/unavailable-client-deployer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/unavailable-client-deployer/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/unavailable-client-deployer/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml?rev=411465&view=auto
==============================================================================
--- geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml (added)
+++ geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml Sat Jun  3 12:42:16 2006
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>unavailable-ejb-deployer</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Configuration for no EJBs</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent config -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>        
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml?rev=411465&view=auto
==============================================================================
--- geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml (added)
+++ geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml Sat Jun  3 12:42:16 2006
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>unavailable-webservices-deployer</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Unavailable Web Services deployer</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent config -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/upgrade-cli/pom.xml?rev=411465&view=auto
==============================================================================
--- geronimo/trunk/configs/upgrade-cli/pom.xml (added)
+++ geronimo/trunk/configs/upgrade-cli/pom.xml Sat Jun  3 12:42:16 2006
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>upgrade-cli</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>System Configuration for the command line upgrade</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <!-- uses geronimo-gbean-deployer -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- needed to enforce build order -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+<!--            <scope>test</scope> -->
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-upgrade</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/upgrade-cli/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/upgrade-cli/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/upgrade-cli/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/upgrade/pom.xml?rev=411465&view=auto
==============================================================================
--- geronimo/trunk/configs/upgrade/pom.xml (added)
+++ geronimo/trunk/configs/upgrade/pom.xml Sat Jun  3 12:42:16 2006
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>upgrade</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Geronimo Configuration for upgrading plans</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <!-- uses geronimo-gbean-deployer -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- needed to enforce build order -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-upgrade</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/upgrade/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/upgrade/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/upgrade/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-packaging-plugin/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-packaging-plugin/pom.xml (original)
+++ geronimo/trunk/m2-plugins/geronimo-packaging-plugin/pom.xml Sat Jun  3 12:42:16 2006
@@ -202,7 +202,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-plugin-plugin</artifactId>
-
+                <version>2.1</version>
                 <configuration>
                     <goalPrefix>car</goalPrefix>
                 </configuration>

Modified: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java (original)
+++ geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java Sat Jun  3 12:42:16 2006
@@ -16,18 +16,20 @@
  */
 package org.apache.geronimo.plugin.packaging;
 
-import java.io.IOException;
-import java.util.Collection;
-
-import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GAttributeInfo;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GReferenceInfo;
+import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.kernel.config.ManageableAttributeStore;
 import org.apache.geronimo.kernel.repository.Artifact;
+
+import javax.management.ObjectName;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Set;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java (original)
+++ geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java Sat Jun  3 12:42:16 2006
@@ -57,7 +57,6 @@
             }
             // create the meta-inf dir
             File metaInf = new File(tmpFile, "META-INF");
-            System.out.println("********** creating file " + tmpFile);
             metaInf.mkdirs();
             return tmpFile;
         } catch (IOException e) {
@@ -73,7 +72,6 @@
         }
         Artifact configId = configurationData.getId();
         File targetFile = repository.getLocation(configId);
-        System.out.println("*************** creating from " + source + " to " + targetFile);
         ExecutableConfigurationUtil.createExecutableConfiguration(configurationData, null, targetFile);
     }
 

Modified: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java (original)
+++ geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java Sat Jun  3 12:42:16 2006
@@ -443,6 +443,7 @@
         configManagerGBean.setReferencePattern("ArtifactManager", artifactManagerGBean.getAbstractName());
         configManagerGBean.setReferencePattern("ArtifactResolver", artifactResolverGBean.getAbstractName());
         configManagerGBean.setReferencePatterns("Repositories", repoPatterns);
+
         ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, cl);
 
     }

Modified: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java (original)
+++ geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java Sat Jun  3 12:42:16 2006
@@ -30,7 +30,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.deployment.PluginBootstrap;
+import org.apache.geronimo.deployment.PluginBootstrap2;
 import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
 import org.apache.geronimo.system.repository.Maven2Repository;
 import org.apache.maven.artifact.Artifact;
@@ -165,7 +165,7 @@
 	}
 
 	public void executeBootShell() throws Exception {
-		PluginBootstrap boot = new PluginBootstrap();
+		PluginBootstrap2 boot = new PluginBootstrap2();
 		boot.setBuildDir(buildDir);
 		boot.setCarFile(packageFile);
 		boot.setLocalRepo(repository);

Modified: geronimo/trunk/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis-builder/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/pom.xml (original)
+++ geronimo/trunk/modules/axis-builder/pom.xml Sat Jun  3 12:42:16 2006
@@ -89,18 +89,6 @@
             <artifactId>stax-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!-- Module Dependencies -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/trunk/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/pom.xml (original)
+++ geronimo/trunk/modules/client-builder/pom.xml Sat Jun  3 12:42:16 2006
@@ -59,17 +59,6 @@
   </build>
 
   <dependencies>
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax</artifactId>
-      <version>1.1.1-dev</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xmlbeans</groupId>
-          <artifactId>xmlbeans-jsr173-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/trunk/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/pom.xml (original)
+++ geronimo/trunk/modules/connector-builder/pom.xml Sat Jun  3 12:42:16 2006
@@ -111,19 +111,6 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
         </dependency>

Added: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java?rev=411465&view=auto
==============================================================================
--- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java (added)
+++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java Sat Jun  3 12:42:16 2006
@@ -0,0 +1,103 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.deployment;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.jar.JarOutputStream;
+
+import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
+import org.apache.geronimo.deployment.xbeans.ModuleDocument;
+import org.apache.geronimo.deployment.xbeans.ModuleType;
+import org.apache.geronimo.kernel.Jsr77Naming;
+import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
+import org.apache.geronimo.kernel.config.ConfigurationData;
+import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.config.NullConfigurationStore;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.ArtifactManager;
+import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
+import org.apache.geronimo.kernel.repository.ArtifactResolver;
+import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
+import org.apache.geronimo.system.configuration.ExecutableConfigurationUtil;
+import org.apache.geronimo.system.repository.Maven2Repository;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class PluginBootstrap2 {
+    private File localRepo;
+    private File plan;
+    private File buildDir;
+    private File carFile;
+
+    public void setLocalRepo(File localRepo) {
+        this.localRepo = localRepo;
+    }
+
+    public void setPlan(File plan) {
+        this.plan = plan;
+    }
+
+    public void setBuildDir(File buildDir) {
+        this.buildDir = buildDir;
+    }
+
+    public void setCarFile(File carFile) {
+        this.carFile = carFile;
+    }
+
+    public void bootstrap() throws Exception {
+        System.out.println();
+        System.out.println("    Packaging configuration " + plan);
+        System.out.println();
+
+        ModuleType config = ModuleDocument.Factory.parse(plan).getModule();
+
+        Maven2Repository repository = new Maven2Repository(localRepo);
+        ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.singleton(repository), new Jsr77Naming());
+        ConfigurationStore targetConfigurationStore = new NullConfigurationStore() {
+            public File createNewConfigurationDir(Artifact configId) throws ConfigurationAlreadyExistsException {
+                return buildDir;
+            }
+        };
+
+        ArtifactManager artifactManager = new DefaultArtifactManager();
+        ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.singleton(repository), null);
+        DeploymentContext context = builder.buildConfiguration(false, builder.getConfigurationID(config, null, new ModuleIDBuilder()), config, null, Collections.singleton(targetConfigurationStore), artifactResolver, targetConfigurationStore);
+        JarOutputStream out = null;
+        try {
+            ConfigurationData configurationData = context.getConfigurationData();
+            out = new JarOutputStream(new FileOutputStream(carFile));
+            ExecutableConfigurationUtil.writeConfiguration(configurationData, out);
+            out.flush();
+        } finally {
+            if (out != null)
+            {
+                try {
+                    out.close();
+                } catch (IOException ignored) {
+                    // ignored
+                }
+            }
+            if (context != null)
+                context.close();
+        }
+    }
+}

Propchange: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/directory/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/pom.xml (original)
+++ geronimo/trunk/modules/directory/pom.xml Sat Jun  3 12:42:16 2006
@@ -208,19 +208,6 @@
             <artifactId>stax-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
     </dependencies>
 </project>
 

Modified: geronimo/trunk/modules/hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/hot-deploy/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/hot-deploy/pom.xml (original)
+++ geronimo/trunk/modules/hot-deploy/pom.xml Sat Jun  3 12:42:16 2006
@@ -85,19 +85,6 @@
             <artifactId>stax-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
     </dependencies>
 </project>
 

Modified: geronimo/trunk/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-builder/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/pom.xml Sat Jun  3 12:42:16 2006
@@ -88,19 +88,6 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
         </dependency>

Modified: geronimo/trunk/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-schema/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/pom.xml Sat Jun  3 12:42:16 2006
@@ -68,18 +68,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
     </dependencies>
 </project>
 

Modified: geronimo/trunk/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty-builder/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/pom.xml (original)
+++ geronimo/trunk/modules/jetty-builder/pom.xml Sat Jun  3 12:42:16 2006
@@ -65,20 +65,6 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-web-builder</artifactId>
         </dependency>

Modified: geronimo/trunk/modules/naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/naming-builder/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/pom.xml (original)
+++ geronimo/trunk/modules/naming-builder/pom.xml Sat Jun  3 12:42:16 2006
@@ -66,20 +66,6 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>

Modified: geronimo/trunk/modules/security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/security-builder/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/pom.xml (original)
+++ geronimo/trunk/modules/security-builder/pom.xml Sat Jun  3 12:42:16 2006
@@ -67,19 +67,6 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
         </dependency>

Modified: geronimo/trunk/modules/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/service-builder/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/pom.xml (original)
+++ geronimo/trunk/modules/service-builder/pom.xml Sat Jun  3 12:42:16 2006
@@ -66,18 +66,6 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
         </dependency>

Modified: geronimo/trunk/modules/test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/test-ddbean/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/test-ddbean/pom.xml (original)
+++ geronimo/trunk/modules/test-ddbean/pom.xml Sat Jun  3 12:42:16 2006
@@ -42,19 +42,6 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
         </dependency>

Modified: geronimo/trunk/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat-builder/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/pom.xml (original)
+++ geronimo/trunk/modules/tomcat-builder/pom.xml Sat Jun  3 12:42:16 2006
@@ -126,20 +126,6 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <scope>test</scope>

Modified: geronimo/trunk/modules/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/pom.xml (original)
+++ geronimo/trunk/modules/upgrade/pom.xml Sat Jun  3 12:42:16 2006
@@ -42,19 +42,6 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
         </dependency>

Modified: geronimo/trunk/modules/web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/pom.xml (original)
+++ geronimo/trunk/modules/web-builder/pom.xml Sat Jun  3 12:42:16 2006
@@ -67,19 +67,6 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>xmlbeans</groupId>
-                    <artifactId>xmlbeans-jsr173-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
         </dependency>

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=411465&r1=411464&r2=411465&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Sat Jun  3 12:42:16 2006
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  
+
     Copyright 2006 The Apache Software Foundation
-    
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    
+
        http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@
 <!-- $Rev$ $Date$ -->
 <project>
     <modelVersion>4.0.0</modelVersion>
-    
+
     <groupId>org.apache.geronimo</groupId>
     <artifactId>geronimo-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
@@ -26,12 +26,12 @@
     <name>Geronimo</name>
     <description>Geronimo parent</description>
     <url>http://geronimo.apache.org</url>
-    
+
     <issueManagement>
         <system>jira</system>
         <url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10220</url>
     </issueManagement>
-    
+
     <ciManagement>
         <system>continuum</system>
         <notifiers>
@@ -43,7 +43,7 @@
             </notifier>
         </notifiers>
     </ciManagement>
-    
+
     <mailingLists>
         <mailingList>
             <name>Geronimo User List</name>
@@ -64,7 +64,7 @@
             <archive>http://mail-archives.apache.org/mod_mbox/geronimo-scm/</archive>
         </mailingList>
     </mailingLists>
-    
+
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
@@ -72,18 +72,18 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
-    
+
     <scm>
         <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/</connection>
         <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/</developerConnection>
         <url>https://svn.apache.org/repos/asf/geronimo/</url>
     </scm>
-    
+
     <organization>
         <name>Geronimo</name>
         <url>http://geronimo.apache.org/</url>
     </organization>
-    
+
     <properties>
      <!--
       |
@@ -101,7 +101,7 @@
      |
      -->
     <geronimoVersion>1.2-SNAPSHOT</geronimoVersion>
-    
+
     <!--
          |
          | Geronimo specification versions
@@ -124,14 +124,14 @@
         <geronimoSpecQnameVersion>1.0</geronimoSpecQnameVersion>
         <geronimoSpecSaajVersion>1.0</geronimoSpecSaajVersion>
         <geronimoSpecServletVersion>1.0</geronimoSpecServletVersion>
-    
+
     <!--
          |
          | Geronimo plugin versions
          |
          -->
         <geronimoPackagingPluginVersion>1.2.0</geronimoPackagingPluginVersion>
-    
+
     <!--
          |
          | External dependency versions
@@ -195,7 +195,6 @@
         <slf4jVersion>1.0-beta7</slf4jVersion>
         <standardTaglibsVersion>1.1.1</standardTaglibsVersion>
         <staxApiVersion>1.0</staxApiVersion>
-        <staxVersion>1.1.1-dev</staxVersion>
         <tomcatAjpVersion>5.5.15</tomcatAjpVersion>
         <tomcatVersion>5.5.15</tomcatVersion>
         <tranqlConnectorVersion>1.2-SNAPSHOT</tranqlConnectorVersion>
@@ -205,7 +204,7 @@
         <wadiActiveClusterVersion>1.2-20051115174934</wadiActiveClusterVersion>
         <wadiSpringVersion>1.5.2</wadiSpringVersion>
         <wadiVersion>2.0M1</wadiVersion>
-        
+
         <wsdl4jVersion>1.5.2</wsdl4jVersion>
         <xercesVersion>2.6.2</xercesVersion>
         <xfireVersion>20050202</xfireVersion>
@@ -218,7 +217,7 @@
         <xpp3Version>1.1.3.3</xpp3Version>
         <xstreamVersion>1.1.3</xstreamVersion>
     </properties>
-    
+
     <dependencyManagement>
         <dependencies>
     <!--
@@ -231,103 +230,103 @@
                 <artifactId>geronimo-activation_1.0.2_spec</artifactId>
                 <version>${geronimoSpecActivationVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>geronimo-spec</groupId>
                 <artifactId>geronimo-spec-corba</artifactId>
                 <version>${geronimoSpecCorbaVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-ejb_2.1_spec</artifactId>
                 <version>${geronimoSpecEjbVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee_1.4_spec</artifactId>
                 <version>${geronimoSpecJ2eeVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
                 <version>${geronimoSpecJ2eeConnectorVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
                 <version>${geronimoSpecJ2eeDeploymentVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
                 <version>${geronimoSpecJ2eeJaccVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
                 <version>${geronimoSpecJ2eeManagementVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
                 <version>${geronimoSpecJavamailVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxr_1.0_spec</artifactId>
                 <version>${geronimoSpecJaxrVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
                 <version>${geronimoSpecJaxrpcVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jsp_2.0_spec</artifactId>
                 <version>${geronimoSpecJspVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jms_1.1_spec</artifactId>
                 <version>${geronimoSpecJmsVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
                 <version>${geronimoSpecJtaVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-qname_1.1_spec</artifactId>
                 <version>${geronimoSpecQnameVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-saaj_1.1_spec</artifactId>
                 <version>${geronimoSpecSaajVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.4_spec</artifactId>
                 <version>${geronimoSpecServletVersion}</version>
             </dependency>
-    
+
     <!--
             |
             | External dependency versions
@@ -338,127 +337,115 @@
                 <artifactId>activeio</artifactId>
                 <version>${activeIoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm</artifactId>
                 <version>${asmVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>backport-util-concurrent</groupId>
                 <artifactId>backport-util-concurrent</artifactId>
                 <version>${backportUtilConcurrentVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>castor</groupId>
                 <artifactId>castor</artifactId>
                 <version>${castorVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>
                 <version>${cglibVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
                 <version>${commonsLoggingVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>concurrent</groupId>
                 <artifactId>concurrent</artifactId>
                 <version>${concurrentVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>howl</groupId>
                 <artifactId>howl-logger</artifactId>
                 <version>${howlVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>hsqldb</groupId>
                 <artifactId>hsqldb</artifactId>
                 <version>${hsqldbVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>jdom</groupId>
                 <artifactId>jdom</artifactId>
                 <version>${jdomVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>${log4jVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>mx4j</groupId>
                 <artifactId>mx4j</artifactId>
                 <version>${mx4jVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>mx4j</groupId>
                 <artifactId>mx4j-remote</artifactId>
                 <version>${mx4jVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>mockobjects</groupId>
                 <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
                 <version>${mockobjectsVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>mockobjects</groupId>
                 <artifactId>mockobjects-core</artifactId>
                 <version>${mockobjectsVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
                 <version>${derbyVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derbynet</artifactId>
                 <version>${derbyVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>regexp</groupId>
                 <artifactId>regexp</artifactId>
                 <version>${regexpVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>scout</groupId>
                 <artifactId>scout</artifactId>
                 <version>${scoutVersion}</version>
             </dependency>
-    
-            <dependency>
-                <groupId>stax</groupId>
-                <artifactId>stax</artifactId>
-                <version>${staxVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>xmlbeans</groupId>
-                        <artifactId>xmlbeans-jsr173-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-    
+
             <dependency>
                 <groupId>stax</groupId>
                 <artifactId>stax-api</artifactId>
@@ -470,13 +457,13 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-    
+
             <dependency>
                 <groupId>tranql</groupId>
                 <artifactId>tranql</artifactId>
                 <version>${tranqlVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>wsdl4j</groupId>
                 <artifactId>wsdl4j</artifactId>
@@ -493,44 +480,44 @@
                 <artifactId>xmlParserAPIs</artifactId>
                 <version>${xmlParserApisVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>xfire</groupId>
                 <artifactId>xfire</artifactId>
                 <version>${xfireVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>xfire</groupId>
                 <artifactId>xfire-java</artifactId>
                 <version>${xfireVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>xmlbeans</groupId>
                 <artifactId>xbean</artifactId>
                 <version>${xmlbeansVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>xml-resolver</groupId>
                 <artifactId>xml-resolver</artifactId>
                 <version>${xmlResolverVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>xpp3</groupId>
                 <artifactId>xpp3</artifactId>
                 <version>${xpp3Version}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>xstream</groupId>
                 <artifactId>xstream</artifactId>
                 <version>${xstreamVersion}</version>
             </dependency>
-    
-    <!-- 
+
+    <!--
             |
             | Geronimo module versions
             |
@@ -540,7 +527,7 @@
                 <artifactId>geronimo-activation</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-client</artifactId>
@@ -552,145 +539,145 @@
                 <artifactId>geronimo-client-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-common</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-connector</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-connector-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-core</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-deploy-config</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-deploy-jsr88</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-deploy-tool</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-deployment</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-derby</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-directory</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-j2ee</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-j2ee-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-j2ee-schema</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-kernel</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-jmx-remoting</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-mail</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-management</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-naming</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-naming-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-security</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-security-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-service-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-system</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-test-ddbean</artifactId>
@@ -702,13 +689,13 @@
                 <artifactId>geronimo-timer</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-tomcat</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-transaction</artifactId>
@@ -720,31 +707,31 @@
                 <artifactId>geronimo-upgrade</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-util</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-web-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-webservices</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-axis</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-    
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-axis-builder</artifactId>
@@ -752,7 +739,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -761,37 +748,37 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <distributionManagement>
         <repository>
             <id>apache-repo</id>
             <name>Apache CVS Repository</name>
             <url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
         </repository>
-    
+
         <snapshotRepository>
             <id>apache-snapshots</id>
             <name>Apache CVS Development Repository</name>
             <url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
         </snapshotRepository>
-    
+
         <site>
             <id>geronimo-website</id>
             <url>scpexe://minotaur.apache.org/www/geronimo.apache.org/maven/</url>
         </site>
     </distributionManagement>
-    
+
     <build>
         <defaultGoal>install</defaultGoal>
         <sourceDirectory>src/java</sourceDirectory>
         <testSourceDirectory>src/test</testSourceDirectory>
-    
+
         <resources>
             <resource>
                 <directory>src/resources</directory>
             </resource>
         </resources>
-    
+
         <testResources>
             <testResource>
                 <directory>src/test-data</directory>
@@ -804,7 +791,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-    
+
     <!--        <version>2.1.3-SNAPSHOT</version> -->
                 <configuration>
                 <!-- Todo move these here -->
@@ -822,12 +809,12 @@
                     <workingDirectory>${basedir}</workingDirectory>
                 </configuration>
             </plugin>
-    
+
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.1</version>
             </plugin>
-    
+
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
@@ -835,9 +822,9 @@
                     <target>1.4</target>
                     <optimize>true</optimize>
                 </configuration>
-                <inherited>true</inherited>          
+                <inherited>true</inherited>
             </plugin>
-    
+
             <plugin>
                 <artifactId>maven-one-plugin</artifactId>
                 <executions>
@@ -875,7 +862,7 @@
                   <checksumPolicy>ignore</checksumPolicy>
               </snapshots>
           </repository>
-    
+
         <repository>
             <snapshots>
                 <enabled>true</enabled>
@@ -884,7 +871,7 @@
             <name>Apache CVS of the Central Repository</name>
             <url>http://people.apache.org/maven-snapshot-repository</url>
         </repository>
-    
+
         <repository>
             <releases>
                 <enabled>false</enabled>
@@ -893,7 +880,7 @@
             <name>Maven Central Development Repository</name>
             <url>http://snapshots.maven.codehaus.org/maven2</url>
         </repository>
-    
+
         <repository>
             <id>maven1-ibiblio</id>
             <name>Maven1 Repository on iBiblio</name>
@@ -905,7 +892,7 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </snapshots>
         </repository>
-    
+
         <repository>
             <id>maven2-central</id>
             <name>Maven2 Central Repository</name>
@@ -917,7 +904,7 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </snapshots>
         </repository>
-    
+
         <repository>
             <id>apache-cvs</id>
             <name>Apache CVS Repository</name>
@@ -930,7 +917,7 @@
             </snapshots>
         </repository>
     </repositories>
-    
+
     <pluginRepositories>
         <pluginRepository>
             <id>snapshots</id>
@@ -941,17 +928,17 @@
             </releases>
         </pluginRepository>
     </pluginRepositories>
-    
+
     <profiles>
         <profile>
             <id>default</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-    
+
             <modules>
                 <module>modules</module>
-                <module>m2-plugins</module>    
+                <module>m2-plugins</module>
                 <module>openejb/modules</module>
                 <module>configs</module>
 <!--            <module>applications</module>
@@ -970,7 +957,7 @@
                 <module>${all}</module>
             </modules>
         </profile>
-    
+
         <profile>
             <id>singlemodule</id>
             <activation>
@@ -982,7 +969,7 @@
                 <module>modules/${module}</module>
             </modules>
         </profile>
-    
+
         <profile>
             <id>singleplugin</id>
             <activation>
@@ -994,7 +981,7 @@
                 <module>m2-plugins/${plugin}</module>
             </modules>
         </profile>
-    
+
         <profile>
             <id>singleapp</id>
             <activation>
@@ -1008,4 +995,4 @@
         </profile>
     </profiles>
 </project>
-    
+



Mime
View raw message