geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r411333 [2/5] - in /geronimo/trunk: ./ m2-plugins/ m2-plugins/geronimo-packaging-plugin/ m2-plugins/geronimo-packaging-plugin/src/ m2-plugins/geronimo-packaging-plugin/src/java/ m2-plugins/geronimo-packaging-plugin/src/java/org/ m2-plugins/...
Date Fri, 02 Jun 2006 23:36:00 GMT
Propchange: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java (added)
+++ geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java Fri Jun  2 16:35:57 2006
@@ -0,0 +1,290 @@
+/**
+ *
+ * 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.plugin.packaging;
+
+import java.io.File;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Properties;
+
+import javax.xml.namespace.QName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.deployment.service.EnvironmentBuilder;
+import org.apache.geronimo.deployment.xbeans.ArtifactType;
+import org.apache.geronimo.deployment.xbeans.EnvironmentType;
+import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.model.Dependency;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
+
+/**
+ * Add dependencies to a plan and process with velocity 
+ * 
+ * @goal dependencies
+ * 
+ * @version $Rev$ $Date$
+ */
+public class PlanProcessorMojo extends AbstractPackagingMojo {
+	private static Log log = LogFactory.getLog(PlanProcessorMojo.class);
+
+	private static final String IMPORT_PROPERTY = "geronimo.import";
+	//private static final String INCLUDE_PROPERTY = "geronimo.include";
+	private static final String DEPENDENCY_PROPERTY = "geronimo.dependency";
+	private static final String KEEP_VERSION_PROPERTY = "geronimo.keep.version";
+    private static final String REFERENCE_PROPERTY = "geronimo.reference";
+    private static final String ENVIRONMENT_LOCAL_NAME = "environment";
+
+	private static final QName ENVIRONMENT_QNAME = new QName(
+			"http://geronimo.apache.org/xml/ns/deployment-1.1", "environment");
+	/**
+	 * POM
+	 * @parameter expression="${project}"
+	 * @readonly
+	 * @required
+     */
+	private MavenProject project;
+	/**
+     * @parameter expression="${basedir}/src/plan"
+     */
+	private String sourceDir;
+	/**
+     * @parameter expression="${project.build.directory}/plan"
+     */
+	private String targetDir;
+	/**
+     * @parameter expression="plan.xml"
+     */
+	private String planFile;
+	/**
+     * @parameter expression="${project.build.directory}/plan/plan.xml"
+     */
+	private String targetFile;
+    
+	private VelocityContext context;
+	
+	//private List artifacts;
+	
+	// This is needed for ${pom.currentVersion} and will be removed when 
+	// we move to a full m2 build
+	private VelocityContext createContext() {
+		VelocityContext context = new VelocityContext();
+		Map pom = new HashMap();
+		pom.put("groupId", project.getGroupId());
+		pom.put( "artifactId", project.getArtifactId());
+		pom.put("currentVersion", project.getVersion());
+		context.put("pom", pom);
+        // Load properties, It inherits them all!
+        Properties props = project.getProperties();        
+        for (Iterator iter = props.keySet().iterator(); iter.hasNext();) {
+            String key = (String)iter.next();
+            //System.out.println("**** key = " + key + "value = " + props.getProperty(key));
+            context.put(key, props.getProperty(key));
+        }
+        
+		return context;
+	}
+
+	public void execute() throws MojoExecutionException {
+
+		context = createContext();
+		try {
+			executePlanProcessor();
+		} catch (Exception e) {
+			handleError(e);
+		}
+	}
+
+	public void executePlanProcessor() throws Exception, XmlException {
+		try {
+			if (project == null) {
+				throw new RuntimeException("project not supplied");
+			}
+			if (targetDir == null) {
+				throw new RuntimeException("No target directory supplied");
+			}
+			if (planFile == null) {
+				throw new RuntimeException("No source plan supplied");
+			}
+			if (targetFile == null) {
+				throw new RuntimeException("No target plan supplied");
+			}
+
+			File sourceD = new File(sourceDir);
+			VelocityEngine velocity = new VelocityEngine();
+			velocity.setProperty(VelocityEngine.FILE_RESOURCE_LOADER_PATH,
+					sourceD.getAbsolutePath());
+			velocity.init();
+			Template template = velocity.getTemplate(planFile);
+			StringWriter writer = new StringWriter();
+			template.merge(context, writer);
+			
+			String plan = writer.toString();
+			
+			XmlObject doc = XmlObject.Factory.parse(plan);
+			XmlCursor xmlCursor = doc.newCursor();
+			LinkedHashSet dependencies = toDependencies();
+            org.apache.geronimo.kernel.repository.Artifact configId = new org.apache.geronimo.kernel.repository.Artifact(
+					project.getGroupId(), project.getArtifactId(), project.getVersion(), "car");
+            try {
+
+                mergeEnvironment(xmlCursor, configId, dependencies);
+				File targetDir = new File(this.targetDir);
+				if (targetDir.exists()) {
+					if (!targetDir.isDirectory()) {
+						throw new RuntimeException("TargetDir: "
+								+ this.targetDir
+								+ " exists and is not a directory");
+					}
+				} else {
+					targetDir.mkdirs();
+				}
+				File output = new File(targetFile);
+				XmlOptions xmlOptions = new XmlOptions();
+				xmlOptions.setSavePrettyPrint();
+				doc.save(output, xmlOptions);
+			} finally {
+				xmlCursor.dispose();
+			}
+		} catch (Exception e) {
+			log.error(e.getClass().getName() + ": " + e.getMessage(), e);
+			throw e;
+		}
+	}
+
+    void mergeEnvironment(XmlCursor xmlCursor, org.apache.geronimo.kernel.repository.Artifact configId, LinkedHashSet dependencies) {
+        xmlCursor.toFirstContentToken();
+        xmlCursor.toFirstChild();
+        QName childName = xmlCursor.getName();
+        Environment oldEnvironment;
+        if (childName != null && childName.getLocalPart().equals(ENVIRONMENT_LOCAL_NAME)) {
+            convertElement(xmlCursor, ENVIRONMENT_QNAME.getNamespaceURI());
+            XmlObject xmlObject = xmlCursor.getObject();
+            EnvironmentType environmentType = (EnvironmentType) xmlObject.copy().changeType(EnvironmentType.type);
+            oldEnvironment = EnvironmentBuilder.buildEnvironment(environmentType);
+            xmlCursor.removeXml();
+        } else {
+            oldEnvironment = new Environment();
+        }
+
+
+        Environment newEnvironment = new Environment();
+        newEnvironment.setConfigId(configId);
+        newEnvironment.setDependencies(dependencies);
+
+        EnvironmentBuilder.mergeEnvironments(oldEnvironment, newEnvironment);
+        EnvironmentType environmentType = EnvironmentBuilder.buildEnvironmentType(oldEnvironment);
+
+        xmlCursor.beginElement(ENVIRONMENT_QNAME);
+        XmlCursor element = environmentType.newCursor();
+        try {
+            element.copyXmlContents(xmlCursor);
+        } finally {
+            element.dispose();
+        }
+    }
+
+    private void convertElement(XmlCursor cursor, String namespace) {
+        cursor.push();
+        XmlCursor end = cursor.newCursor();
+        try {
+            end.toCursor(cursor);
+            end.toEndToken();
+            while (cursor.hasNextToken() && cursor.isLeftOf(end)) {
+                if (cursor.isStart()) {
+                    if (!namespace.equals(cursor.getName().getNamespaceURI())) {
+                        cursor.setName(new QName(namespace, cursor.getName().getLocalPart()));
+                    }
+                }
+                cursor.toNextToken();
+            }
+            cursor.pop();
+        } finally {
+            end.dispose();
+        }
+    }
+
+    private LinkedHashSet toDependencies() {
+    	List artifacts = project.getDependencies();
+        LinkedHashSet dependencies = new LinkedHashSet();
+        for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
+            //Artifact artifact = (Artifact) iterator.next();
+            Dependency dependency = (Dependency) iterator.next();
+            //Dependency dependency = artifact.getDependency();
+            org.apache.geronimo.kernel.repository.Dependency geronimoDependency = toGeronimoDependency(dependency);
+            if (geronimoDependency != null) {
+                dependencies.add(geronimoDependency);
+            }
+        }
+        return dependencies;
+    }
+
+    private static org.apache.geronimo.kernel.repository.Dependency toGeronimoDependency(Dependency dependency) {    	
+        org.apache.geronimo.kernel.repository.Artifact artifact = toGeronimoArtifact(dependency);
+        String type = dependency.getType();
+        String scope = dependency.getScope();
+        String groupId = dependency.getGroupId();
+        //!"org.apache.geronimo.specs".equals(groupId) jacc spec needed in plan.xml
+        if ("jar".equalsIgnoreCase(type)&& !"junit".equals(groupId)) {
+            if (dependency.getVersion() != null) {
+                artifact = new org.apache.geronimo.kernel.repository.Artifact(artifact.getGroupId(), artifact.getArtifactId(), dependency.getVersion(), artifact.getType());
+            }
+            return new org.apache.geronimo.kernel.repository.Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.CLASSES);
+//        } else if ("true".equals(dependency.getProperty(REFERENCE_PROPERTY))) {
+        } else if ("car".equalsIgnoreCase(type)&& ("runtime").equalsIgnoreCase(type)) {    
+           return new org.apache.geronimo.kernel.repository.Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.SERVICES);
+        } else if ("car".equalsIgnoreCase(type)&& ("compile".equalsIgnoreCase(scope))) {
+            return new org.apache.geronimo.kernel.repository.Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.CLASSES);  
+        } else if ("car".equalsIgnoreCase(type)&& (scope == null)) { //parent
+            return new org.apache.geronimo.kernel.repository.Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.ALL);
+        
+        } else {
+            // not one of ours
+            return null;
+        }
+    }
+
+    private static org.apache.geronimo.kernel.repository.Artifact toGeronimoArtifact(Dependency dependency) {
+        String groupId = dependency.getGroupId();
+        String artifactId = dependency.getArtifactId();
+        String version = null;
+        String type = dependency.getType();
+        return new org.apache.geronimo.kernel.repository.Artifact(groupId, artifactId, version, type);
+    }
+
+    interface Inserter {
+        ArtifactType insert(EnvironmentType environmentType);
+    }
+
+
+}

Propchange: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml (added)
+++ geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,24 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>car</role-hint>
+      <implementation>
+      org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <phases>
+          <process-resources>
+org.apache.geronimo.plugins:geronimo-packaging-plugin:dependencies
+</process-resources>
+          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+          <package>org.apache.geronimo.plugins:geronimo-packaging-plugin:package</package>
+          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+<!--          <install>org.apache.geronimo.plugins:geronimo-packaging-plugin:install</install>
+-->
+<!--      <deploy>org.apache.maven.plugins:geronimo-packaging-plugin:distribute
+</deploy> -->
+        </phases>
+      </configuration>
+    </component>
+  </components>
+</component-set> 

Propchange: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/m2-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/pom.xml (added)
+++ geronimo/trunk/m2-plugins/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,59 @@
+<?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.
+    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</groupId>
+        <artifactId>geronimo-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>plugins-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Geronimo Plugins</name>
+    <description>Geronimo Plugins</description>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>geronimo-packaging-plugin</module>
+            </modules>
+        </profile>
+
+        <profile>
+            <id>singleplugin</id>
+            <activation>
+                <property>
+                    <name>plugin</name>
+                </property>
+            </activation>
+            <modules>
+                <module>${plugin}</module>
+            </modules>
+        </profile>
+    </profiles>
+</project>
+

Propchange: geronimo/trunk/m2-plugins/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/m2-plugins/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/m2-plugins/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/modules/activation/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activation/pom.xml?rev=411333&r1=411332&r2=411333&view=diff
==============================================================================
--- geronimo/trunk/modules/activation/pom.xml (original)
+++ geronimo/trunk/modules/activation/pom.xml Fri Jun  2 16:35:57 2006
@@ -1,21 +1,48 @@
+<?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>
-  <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>geronimo-activation</artifactId>
-  <name>Geronimo Activation</name>
-  <version>${geronimoVersion}</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-    </dependency>    
-  </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-activation</artifactId>
+    <name>Geronimo :: Activation</name>
+    <version>${geronimoVersion}</version>
+    <description>Geronimo Activation implements Content Handlers for use in conjuction with the Java Activation Framework.</description>
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+        </dependency>
+    </dependencies>
 </project>
+

Modified: geronimo/trunk/modules/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-embedded-rar/pom.xml?rev=411333&r1=411332&r2=411333&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-embedded-rar/pom.xml (original)
+++ geronimo/trunk/modules/activemq-embedded-rar/pom.xml Fri Jun  2 16:35:57 2006
@@ -20,16 +20,19 @@
 
 <project>
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
+
   <artifactId>ge-activemq-rar</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>rar</packaging>
   <name>Geronimo :: ActiveMQ Embedded RAR</name>
   <description>Resource Adapter configuration for using ActiveMQ as a bundled JMS provider.</description>
+
   <build>
     <plugins>
       <plugin>
@@ -44,12 +47,13 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>incubator-activemq</groupId>
+      <groupId>activemq</groupId>
       <artifactId>activemq-core</artifactId>
       <version>${activeMqVersion}</version>
     </dependency>
+
     <dependency>
-      <groupId>incubator-activemq</groupId>
+      <groupId>activemq</groupId>
       <artifactId>activemq-ra</artifactId>
       <version>${activeMqVersion}</version>
       <!--  Can't be found anywhere -->

Added: geronimo/trunk/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis-builder/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/axis-builder/pom.xml (added)
+++ geronimo/trunk/modules/axis-builder/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    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.
+-->
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-axis-builder</artifactId>
+    <version>${geronimoVersion}</version>
+    <name>Geronimo :: Axis :: Builder</name>
+    <description>Geronimo Axis Builder</description>
+
+    <build>
+        <resources>
+<!-- This schema is NOT compiled to xmlobjects.  Do not remove!  Used by SchemaInfoBuilder -->
+            <resource>
+                <directory>src/schema</directory>
+                <includes>
+                    <include>soap_encoding_1_1.xsd</include>
+                </includes>
+                <targetPath>META-INF/schema</targetPath>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                    <!--<geronimo.run.external.webservicetest>true</geronimo.run.external.webservicetest> -->
+                    </systemProperties>
+
+                    <forkMode>once</forkMode>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <version>${xmlbeansMavenPluginVersion}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>xmlbeans</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <schemaDirectory>src/schema</schemaDirectory>
+                    <sourceSchemas>wsdl.xsd</sourceSchemas>
+                    <xmlConfigs>
+                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
+                    </xmlConfigs>
+                <!--          <download>true</download> -->
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <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>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <!-- commons-logging from kernel --> 
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis</artifactId>
+            <version>${axisVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>${wsdl4jVersion}</version>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/axis-builder/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/axis-builder/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/axis-builder/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/axis/pom.xml (added)
+++ geronimo/trunk/modules/axis/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,122 @@
+<?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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-axis</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>jar</packaging>
+    <name>Geronimo :: Axis</name>
+    <description>Geronimo Axis Integration</description>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+<!--
+Need to check in a manual -service.xml file before removing this.
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-dependency-plugin</artifactId>
+            <type>plugin</type>
+        </dependency>
+-->
+        <!-- cglib, mx4j, commons-logging -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-webservices</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asmVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis</artifactId>
+            <version>${axisVersion}</version>
+        </dependency>
+        <!-- this uses commons-logging 1.0.3 -->
+        <dependency>
+            <groupId>commons-discovery</groupId>
+            <artifactId>commons-discovery</artifactId>
+            <version>${commonsDiscoveryVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>${wsdl4jVersion}</version>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/axis/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/axis/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/axis/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/client-builder/pom.xml (added)
+++ geronimo/trunk/modules/client-builder/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,91 @@
+<?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 te License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>geronimo-client-builder</artifactId>
+  <name>Geronimo :: Client Builder</name>
+  <version>${geronimoVersion}</version>
+  <description>Geronimo :: Client Builder</description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>xmlbeans-maven-plugin</artifactId>
+        <version>${xmlbeansMavenPluginVersion}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>xmlbeans</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <download>true</download>
+          <sourceSchemas>geronimo-application-client-1.1.xsd</sourceSchemas>
+          <schemaDirectory>src/schema</schemaDirectory>
+          <xmlConfigs>
+            <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
+          </xmlConfigs>
+          <debug>true</debug>
+          <verbose>true</verbose>
+          <quiet>false</quiet>
+        </configuration>
+      </plugin>
+    </plugins>
+  </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>
+      <artifactId>geronimo-client</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.geronimo.modules</groupId>
+      <artifactId>geronimo-connector-builder</artifactId>
+    </dependency>
+
+      <!-- tranql uses 1.0.3 -->
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+  </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/client-builder/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/client-builder/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/client-builder/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/client/pom.xml (added)
+++ geronimo/trunk/modules/client/pom.xml Fri Jun  2 16:35:57 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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-client</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>jar</packaging>
+    <name>Geronimo :: Client</name>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+    <!--for GeronimoSecurityException-->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security</artifactId>
+        </dependency>
+        <!-- kernel, cglib, commons-logging, log4j from system -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/client/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/client/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/client/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/common/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/common/pom.xml (added)
+++ geronimo/trunk/modules/common/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,40 @@
+<?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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-common</artifactId>
+    <version>${geronimoVersion}</version>
+    <name>Geronimo :: Common</name>
+    <description>Geronimo Common</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/common/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/common/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/common/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/connector-builder/pom.xml (added)
+++ geronimo/trunk/modules/connector-builder/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,158 @@
+<?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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-connector-builder</artifactId>
+    <version>${geronimoVersion}</version>
+    <name>Geronimo :: Connector :: Builder</name>
+
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+    <build>
+    <!-- move this to parent pom -->
+        <resources>
+            <resource>
+                <directory>src/schema</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>geronimo-connector-1.1.xsd</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>process-test-resources</id>
+                        <phase>process-test-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <ant antfile="${basedir}/src/test/test-setup.xml" />
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <version>${xmlbeansMavenPluginVersion}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>xmlbeans</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
+                    <schemaDirectory>src/schema</schemaDirectory>
+                    <xmlConfigs>
+                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
+                    </xmlConfigs>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <java.security.auth.login.config>${basedir}/src/test-data/data/login.config</java.security.auth.login.config>
+                        <user.dir>${basedir}</user.dir>
+                    </systemProperties>
+                    <forkMode>once</forkMode>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <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>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-config</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql</artifactId>
+        </dependency>
+
+        <!-- tranql uses 1.0.3, force 1.0.4  -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/connector-builder/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/connector-builder/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/connector-builder/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/connector-builder/src/test/test-setup.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/test/test-setup.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/test-setup.xml (added)
+++ geronimo/trunk/modules/connector-builder/src/test/test-setup.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,94 @@
+<?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 name="test-setup" default="default" basedir=".">
+
+  <target name="default">
+    <!-- Build test-rar-10 -->
+    <mkdir dir="${basedir}/target/test-rar-10/META-INF"/>
+    <copy todir="${basedir}/target/test-rar-10/META-INF">
+      <fileset dir="${basedir}/src/test-data/connector_1_0"/>
+    </copy>
+    <jar destfile="${basedir}/target/test-rar-10.rar" basedir="${basedir}/target/test-rar-10"/>
+
+    <!-- Build test-rar-15 -->
+    <mkdir dir="${basedir}/target/test-rar-15/META-INF"/>
+    <copy todir="${basedir}/target/test-rar-15/META-INF">
+      <fileset dir="${basedir}/src/test-data/connector_1_5"/>
+    </copy>
+    <jar destfile="${basedir}/target/test-rar-15.rar" basedir="${basedir}/target/test-rar-15"/>
+    
+    <mkdir dir="${basedir}/target/test-rar-15-notx/META-INF"/>
+        <copy todir="${basedir}/target/test-rar-15-notx/META-INF">
+            <fileset dir="${basedir}/src/test-data/connector_1_5_notx"/>
+        </copy>
+
+        <jar destfile="${basedir}/target/test-rar-15-notx.rar"
+            basedir="${basedir}/target/test-rar-15-notx"/>
+
+        <mkdir dir="${basedir}/target/test-rar-15-localtx/META-INF"/>
+
+        <copy todir="${basedir}/target/test-rar-15-localtx/META-INF">
+            <fileset dir="${basedir}/src/test-data/connector_1_5_localtx"/>
+        </copy>
+
+        <jar destfile="${basedir}/target/test-rar-15-localtx.rar"
+            basedir="${basedir}/target/test-rar-15-localtx"/>
+
+    <!-- Build test-ear -->
+    <jar destfile="${basedir}/target/test-ear.ear">
+      <fileset dir="${basedir}/target">
+        <include name="test-rar-10.rar"/>
+        <include name="test-rar-15.rar"/>
+      </fileset>
+      <zipfileset dir="${basedir}/src/test-data/ear" prefix="META-INF"/>
+    </jar>
+    <!--do it again without geronimo dds-->
+    <!-- Build test-rar-10 -->
+    <mkdir dir="${basedir}/target/test-rar-10-noger/META-INF"/>
+    <copy todir="${basedir}/target/test-rar-10-noger/META-INF">
+      <fileset dir="${basedir}/src/test-data/connector_1_0">
+        <exclude name="geronimo-ra.xml"/>
+      </fileset>
+    </copy>
+    <jar destfile="${basedir}/target/test-rar-10-noger.rar" basedir="${basedir}/target/test-rar-10"/>
+
+    <!-- Build test-rar-15 -->
+    <mkdir dir="${basedir}/target/test-rar-15-noger/META-INF"/>
+    <copy todir="${basedir}/target/test-rar-15-noger/META-INF">
+      <fileset dir="${basedir}/src/test-data/connector_1_5">
+        <exclude name="geronimo-ra.xml"/>
+      </fileset>
+    </copy>
+    <jar destfile="${basedir}/target/test-rar-15-noger.rar" basedir="${basedir}/target/test-rar-15"/>
+
+    <!-- Build test-ear -->
+    <jar destfile="${basedir}/target/test-ear-noger.ear">
+      <fileset dir="${basedir}/target">
+        <include name="test-rar-10-noger.rar"/>
+        <include name="test-rar-15-noger.rar"/>
+      </fileset>
+      <zipfileset dir="${basedir}/src/test-data/ear" prefix="META-INF">
+        <exclude name="geronimo-application.xml"/>
+      </zipfileset>
+    </jar>
+
+  </target>
+</project>

Propchange: geronimo/trunk/modules/connector-builder/src/test/test-setup.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/connector-builder/src/test/test-setup.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/connector-builder/src/test/test-setup.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/connector/pom.xml (added)
+++ geronimo/trunk/modules/connector/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,115 @@
+<?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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-connector</artifactId>
+    <version>${geronimoVersion}</version>
+    <name>Geronimo :: Connector</name>
+    <description>Geronimo Connector</description>
+
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming</artifactId>
+        </dependency>
+
+        <!-- Needed only for DeploymentException in a test, from NameFactory which probably shouldn't be throwing it in the first place-->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+        </dependency>
+
+        <!--  test only -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- needed for passwordcredential realm-->
+        <dependency>
+            <groupId>regexp</groupId>
+            <artifactId>regexp</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/connector/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/connector/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/connector/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/converter/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/converter/pom.xml (added)
+++ geronimo/trunk/modules/converter/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,54 @@
+<?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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-converter</artifactId>
+    <name>Geronimo :: Configuration Converter</name>
+    <version>${geronimoVersion}</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/converter/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/converter/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/converter/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/core/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/core/pom.xml (added)
+++ geronimo/trunk/modules/core/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,61 @@
+<?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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-core</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>jar</packaging>
+    <name>Geronimo :: Core</name>
+    <description>Geronimo Core J2EE Utilities</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/core/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/core/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/core/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-config/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/deploy-config/pom.xml (added)
+++ geronimo/trunk/modules/deploy-config/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,54 @@
+<?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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-deploy-config</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>jar</packaging>
+    <name>Geronimo :: Deploy :: Common Config</name>
+    <description>The deployment module contains basic infrastructure and base classes for module builders / deployers. This module contains infrastructure and base classes for JSR-88 DConfigBeans.</description>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/deploy-config/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/deploy-config/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/deploy-config/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-jsr88/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/pom.xml (added)
+++ geronimo/trunk/modules/deploy-jsr88/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,100 @@
+<?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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-deploy-jsr88</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>jar</packaging>
+    <name>Geronimo :: Deploy :: JSR-88</name>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+        </dependency>
+
+        <!-- Module Dependencies -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+        </dependency>
+
+        <!-- only until we move out various DConfigBean trees -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-config</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/deploy-jsr88/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/deploy-jsr88/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/deploy-jsr88/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-tool/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/deploy-tool/pom.xml (added)
+++ geronimo/trunk/modules/deploy-tool/pom.xml Fri Jun  2 16:35:57 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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-deploy-tool</artifactId>
+    <version>${geronimoVersion}</version>
+    <name>Geronimo :: Deploy :: CLI Tool</name>
+
+    <dependencies>
+    <!-- Module Dependencies -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-util</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/deploy-tool/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/deploy-tool/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/deploy-tool/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deployment/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/deployment/pom.xml (added)
+++ geronimo/trunk/modules/deployment/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,64 @@
+<?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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-deployment</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>jar</packaging>
+    <name>Geronimo :: Deployment</name>
+    <description>Geronimo Deployment</description>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xml-resolver</groupId>
+            <artifactId>xml-resolver</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/deployment/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/deployment/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/deployment/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/derby/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/derby/pom.xml (added)
+++ geronimo/trunk/modules/derby/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,59 @@
+<?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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-derby</artifactId>
+    <version>${geronimoVersion}</version>
+    <name>Geronimo :: Derby</name>
+    <description>Wrapper for using Apache Derby as a bundled database.</description>
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+    <!-- this gets kernel, commons-logging -->
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbynet</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/modules/derby/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/derby/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/derby/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/directory/pom.xml?rev=411333&view=auto
==============================================================================
--- geronimo/trunk/modules/directory/pom.xml (added)
+++ geronimo/trunk/modules/directory/pom.xml Fri Jun  2 16:35:57 2006
@@ -0,0 +1,226 @@
+<?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.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-directory</artifactId>
+    <version>${geronimoVersion}</version>
+    <name>Geronimo :: Directory</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <version>${xmlbeansMavenPluginVersion}</version>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>xmlbeans</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/classes/schemaorg_apache_xmlbeans</outputDirectory>
+                            <defaultXmlConfigDir>src/schema/xmlconfig.xml</defaultXmlConfigDir>
+                            <verbose>true</verbose>
+                            <sourceSchemas>directory.xsd</sourceSchemas>
+                            <!-- <classGenerationDirectory>target/xmlbeans-classes</classGenerationDirectory> -->
+                            <schemaDirectory>src/schema</schemaDirectory>
+                            <!-- <sourceGenerationDirectory>target/xmlbeans-classes/schemaorg_apache_xmlbeans</sourceGenerationDirectory> -->
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <tstamp />
+                                <copy todir="target/var/" file="src/test-resources/directory.xml" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <!-- kernel, common, cglib, commons-logging, mx4j, concurrent -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+        </dependency>
+
+        <!-- Third Party Jars -->
+
+        <dependency>
+            <groupId>regexp</groupId>
+            <artifactId>regexp</artifactId>
+            <version>${regexpVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>directory</groupId>
+            <artifactId>apacheds-core</artifactId>
+            <version>${apachedsVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>directory</groupId>
+            <artifactId>apacheds-shared</artifactId>
+            <version>${apachedsVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>directory-asn1</groupId>
+            <artifactId>asn1-codec</artifactId>
+            <version>${asn1Version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>directory-asn1</groupId>
+            <artifactId>asn1-ber</artifactId>
+            <version>${asn1Version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>directory-asn1</groupId>
+            <artifactId>asn1-der</artifactId>
+            <version>${asn1Version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>directory-shared</groupId>
+            <artifactId>apache-ldapber-provider</artifactId>
+            <version>${apachedsVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>directory-shared</groupId>
+            <artifactId>ldap-common</artifactId>
+            <version>${apachedsVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>directory-shared</groupId>
+            <artifactId>kerberos-common</artifactId>
+            <version>${kerberosCommonVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>directory-network</groupId>
+            <artifactId>mina</artifactId>
+            <version>${minaVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>directory-protocols</groupId>
+            <artifactId>kerberos-protocol</artifactId>
+            <version>${kerberosProtocolVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>directory-protocols</groupId>
+            <artifactId>ldap-protocol</artifactId>
+            <version>${ldapProtocolVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jdbm</groupId>
+            <artifactId>jdbm</artifactId>
+            <version>${jdbmVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+            <version>${oroVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>${commonsLangVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>${commonsCollectionsVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-primitives</groupId>
+            <artifactId>commons-primitives</artifactId>
+            <version>${commonsPrimitivesVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>${antlrVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4jVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <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>
+

Propchange: geronimo/trunk/modules/directory/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/directory/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/directory/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message