geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: rev 56771 - in geronimo/trunk/modules: assembly assembly/src/plan client-builder connector-builder j2ee j2ee-builder j2ee-builder/src j2ee-builder/src/java j2ee-builder/src/java/org j2ee-builder/src/java/org/apache j2ee-builder/src/java/org/apache/geronimo j2ee-builder/src/java/org/apache/geronimo/j2ee j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment j2ee-builder/src/schema j2ee-builder/src/test j2ee-builder/src/test-ear j2ee-builder/src/test-ear/META-INF j2ee-builder/src/test-ear/test-ejb-jar j2ee-builder/src/test-ear/test-rar j2ee-builder/src/test-ear/test-war j2ee-builder/src/test-ear13 j2ee-builder/src/test-ear13/META-INF j2ee-builder/src/test-ear13/test-ejb-jar j2ee-builder/src/test-ear13/test-rar j2ee-builder/src/test-ear13/test-war j2ee-builder/src/test-unpacked-ear j2ee-builder/src/test-unpacked-ear/META-INF j2ee-builder/src/test/org j2ee-builder/src/test/org/apache j2ee-builder/src/test/org/apache/geronimo j2ee-builder/src/test/org/apache/geronimo/j2ee j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment j2ee/src/java/org/apache/geronimo/j2ee/deployment j2ee/src/schema j2ee/src/test-ear j2ee/src/test-ear13 j2ee/src/test-unpacked-ear j2ee/src/test/org/apache/geronimo/j2ee/deployment jetty jetty-builder jetty-builder/src jetty-builder/src/java jetty-builder/src/java/org jetty-builder/src/java/org/apache jetty-builder/src/java/org/apache/geronimo jetty-builder/src/java/org/apache/geronimo/jetty jetty-builder/src/java/org/apache/geronimo/jetty/deployment jetty-builder/src/schema jetty-builder/src/test jetty-builder/src/test-resources jetty-builder/src/test-resources/data jetty-builder/src/test-resources/deployables jetty-builder/src/test-resources/plans jetty-builder/src/test-resources/services jetty-builder/src/test/org jetty-builder/src/test/org/apache jetty-builder/src/test/org/apache/geronimo jetty-builder/src/test/org/apache/geronimo/jetty jetty-builder/src/test/org/apache/geronimo/jetty/deployment jetty/src/java/org/apache/geronimo/jetty/deployment jetty/src/schema jetty/src/test-resources/plans jetty/src/test/org/apache/geronimo/jetty/deployment naming naming-builder naming-builder/src naming-builder/src/java naming-builder/src/java/org naming-builder/src/java/org/apache naming-builder/src/java/org/apache/geronimo naming-builder/src/java/org/apache/geronimo/naming naming-builder/src/java/org/apache/geronimo/naming/deployment naming-builder/src/schema naming-builder/src/test naming-builder/src/test/org naming-builder/src/test/org/apache naming-builder/src/test/org/apache/geronimo naming-builder/src/test/org/apache/geronimo/naming naming/src/java/org/apache/geronimo/naming/deployment naming/src/schema
Date Sat, 06 Nov 2004 19:58:56 GMT
Author: djencks
Date: Sat Nov  6 11:58:54 2004
New Revision: 56771

Added:
   geronimo/trunk/modules/j2ee-builder/
   geronimo/trunk/modules/j2ee-builder/locator.ent
      - copied unchanged from rev 56717, geronimo/trunk/modules/j2ee/locator.ent
   geronimo/trunk/modules/j2ee-builder/maven.xml
      - copied unchanged from rev 56717, geronimo/trunk/modules/j2ee/maven.xml
   geronimo/trunk/modules/j2ee-builder/project.properties
      - copied unchanged from rev 56717, geronimo/trunk/modules/j2ee/project.properties
   geronimo/trunk/modules/j2ee-builder/project.xml
      - copied, changed from rev 56717, geronimo/trunk/modules/j2ee/project.xml
   geronimo/trunk/modules/j2ee-builder/src/
   geronimo/trunk/modules/j2ee-builder/src/java/
   geronimo/trunk/modules/j2ee-builder/src/java/org/
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/
      - copied from rev 56717, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBRefInfo.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EJBRefInfo.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/GerGBeanAdapter.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/GerGBeanAdapter.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/Module.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/UnresolvedEJBRefException.java
   geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
   geronimo/trunk/modules/j2ee-builder/src/schema/
      - copied from rev 56717, geronimo/trunk/modules/j2ee/src/schema/
   geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/schema/geronimo-application.xsd
   geronimo/trunk/modules/j2ee-builder/src/schema/xmlconfig.xml
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/schema/xmlconfig.xml
   geronimo/trunk/modules/j2ee-builder/src/test/
   geronimo/trunk/modules/j2ee-builder/src/test-ear/
      - copied from rev 56717, geronimo/trunk/modules/j2ee/src/test-ear/
   geronimo/trunk/modules/j2ee-builder/src/test-ear/META-INF/
      - copied from rev 56770, geronimo/trunk/modules/j2ee/src/test-ear/META-INF/
   geronimo/trunk/modules/j2ee-builder/src/test-ear/test-ejb-jar/
      - copied from rev 56770, geronimo/trunk/modules/j2ee/src/test-ear/test-ejb-jar/
   geronimo/trunk/modules/j2ee-builder/src/test-ear/test-rar/
      - copied from rev 56770, geronimo/trunk/modules/j2ee/src/test-ear/test-rar/
   geronimo/trunk/modules/j2ee-builder/src/test-ear/test-war/
      - copied from rev 56770, geronimo/trunk/modules/j2ee/src/test-ear/test-war/
   geronimo/trunk/modules/j2ee-builder/src/test-ear13/
      - copied from rev 56717, geronimo/trunk/modules/j2ee/src/test-ear13/
   geronimo/trunk/modules/j2ee-builder/src/test-ear13/META-INF/
      - copied from rev 56770, geronimo/trunk/modules/j2ee/src/test-ear13/META-INF/
   geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-ejb-jar/
      - copied from rev 56770, geronimo/trunk/modules/j2ee/src/test-ear13/test-ejb-jar/
   geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-rar/
      - copied from rev 56770, geronimo/trunk/modules/j2ee/src/test-ear13/test-rar/
   geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-war/
      - copied from rev 56770, geronimo/trunk/modules/j2ee/src/test-ear13/test-war/
   geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/
      - copied from rev 56717, geronimo/trunk/modules/j2ee/src/test-unpacked-ear/
   geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/
      - copied from rev 56770, geronimo/trunk/modules/j2ee/src/test-unpacked-ear/META-INF/
   geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ejb-jar.xml
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/test-unpacked-ear/alt-ger-ejb-jar.xml
   geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ra.xml
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/test-unpacked-ear/alt-ger-ra.xml
   geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-war.xml
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/test-unpacked-ear/alt-ger-war.xml
   geronimo/trunk/modules/j2ee-builder/src/test/org/
   geronimo/trunk/modules/j2ee-builder/src/test/org/apache/
   geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/
   geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/
   geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/
      - copied from rev 56717, geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/
   geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
   geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
   geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
   geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
   geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
   geronimo/trunk/modules/jetty-builder/
   geronimo/trunk/modules/jetty-builder/locator.ent
      - copied unchanged from rev 56717, geronimo/trunk/modules/jetty/locator.ent
   geronimo/trunk/modules/jetty-builder/maven.xml
      - copied unchanged from rev 56717, geronimo/trunk/modules/jetty/maven.xml
   geronimo/trunk/modules/jetty-builder/project.properties
      - copied unchanged from rev 56717, geronimo/trunk/modules/jetty/project.properties
   geronimo/trunk/modules/jetty-builder/project.xml
      - copied, changed from rev 56717, geronimo/trunk/modules/jetty/project.xml
   geronimo/trunk/modules/jetty-builder/src/
   geronimo/trunk/modules/jetty-builder/src/java/
   geronimo/trunk/modules/jetty-builder/src/java/org/
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/
      - copied from rev 56717, geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyGBeanAdapter.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyGBeanAdapter.java
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/WARConfiguration.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfiguration.java
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/WARConfigurer.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigurer.java
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigBean.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigBean.java
   geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigRoot.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigRoot.java
   geronimo/trunk/modules/jetty-builder/src/schema/
      - copied from rev 56717, geronimo/trunk/modules/jetty/src/schema/
   geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd
      - copied unchanged from rev 56770, geronimo/trunk/modules/jetty/src/schema/geronimo-jetty.xsd
   geronimo/trunk/modules/jetty-builder/src/schema/xmlconfig.xml
      - copied unchanged from rev 56770, geronimo/trunk/modules/jetty/src/schema/xmlconfig.xml
   geronimo/trunk/modules/jetty-builder/src/test/
   geronimo/trunk/modules/jetty-builder/src/test-resources/
      - copied from rev 56717, geronimo/trunk/modules/jetty/src/test-resources/
   geronimo/trunk/modules/jetty-builder/src/test-resources/data/
      - copied from rev 56770, geronimo/trunk/modules/jetty/src/test-resources/data/
   geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/
      - copied from rev 56770, geronimo/trunk/modules/jetty/src/test-resources/deployables/
   geronimo/trunk/modules/jetty-builder/src/test-resources/plans/
      - copied from rev 56770, geronimo/trunk/modules/jetty/src/test-resources/plans/
   geronimo/trunk/modules/jetty-builder/src/test-resources/services/
      - copied from rev 56770, geronimo/trunk/modules/jetty/src/test-resources/services/
   geronimo/trunk/modules/jetty-builder/src/test/org/
   geronimo/trunk/modules/jetty-builder/src/test/org/apache/
   geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/
   geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/
   geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/
      - copied from rev 56717, geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/deployment/
   geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
   geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/WebAppDConfigTest.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/deployment/WebAppDConfigTest.java
   geronimo/trunk/modules/naming-builder/
   geronimo/trunk/modules/naming-builder/locator.ent
      - copied unchanged from rev 56717, geronimo/trunk/modules/naming/locator.ent
   geronimo/trunk/modules/naming-builder/maven.xml
      - copied unchanged from rev 56717, geronimo/trunk/modules/naming/maven.xml
   geronimo/trunk/modules/naming-builder/project.properties
      - copied unchanged from rev 56717, geronimo/trunk/modules/naming/project.properties
   geronimo/trunk/modules/naming-builder/project.xml
      - copied, changed from rev 56717, geronimo/trunk/modules/naming/project.xml
   geronimo/trunk/modules/naming-builder/src/
   geronimo/trunk/modules/naming-builder/src/java/
   geronimo/trunk/modules/naming-builder/src/java/org/
   geronimo/trunk/modules/naming-builder/src/java/org/apache/
   geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/
   geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/
   geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/
      - copied from rev 56717, geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/deployment/
   geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
   geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCHelper.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/deployment/ENCHelper.java
   geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/GBeanResourceEnvironmentBuilder.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/deployment/GBeanResourceEnvironmentBuilder.java
   geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/LocalRefDConfigBean.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/deployment/LocalRefDConfigBean.java
   geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/RemoteRefDConfigBean.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/deployment/RemoteRefDConfigBean.java
   geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ResourceEnvironmentBuilder.java
      - copied unchanged from rev 56770, geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/deployment/ResourceEnvironmentBuilder.java
   geronimo/trunk/modules/naming-builder/src/schema/
      - copied from rev 56717, geronimo/trunk/modules/naming/src/schema/
   geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd
      - copied unchanged from rev 56770, geronimo/trunk/modules/naming/src/schema/geronimo-naming.xsd
   geronimo/trunk/modules/naming-builder/src/schema/xmlconfig.xml
      - copied unchanged from rev 56770, geronimo/trunk/modules/naming/src/schema/xmlconfig.xml
   geronimo/trunk/modules/naming-builder/src/test/
   geronimo/trunk/modules/naming-builder/src/test/org/
   geronimo/trunk/modules/naming-builder/src/test/org/apache/
   geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/
   geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/
Removed:
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/
   geronimo/trunk/modules/j2ee/src/schema/
   geronimo/trunk/modules/j2ee/src/test-ear/
   geronimo/trunk/modules/j2ee/src/test-ear13/
   geronimo/trunk/modules/j2ee/src/test-unpacked-ear/
   geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/
   geronimo/trunk/modules/jetty/src/schema/
   geronimo/trunk/modules/jetty/src/test-resources/plans/
   geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/deployment/
   geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/deployment/
   geronimo/trunk/modules/naming/src/schema/
Modified:
   geronimo/trunk/modules/assembly/maven.xml
   geronimo/trunk/modules/assembly/project.xml
   geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
   geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
   geronimo/trunk/modules/client-builder/project.xml
   geronimo/trunk/modules/connector-builder/project.xml
   geronimo/trunk/modules/j2ee/maven.xml
   geronimo/trunk/modules/jetty/maven.xml
   geronimo/trunk/modules/naming/maven.xml
Log:
GERONIMO-403/405/418 Split builders out of j2ee, naming, and jetty

Modified: geronimo/trunk/modules/assembly/maven.xml
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml	(original)
+++ geronimo/trunk/modules/assembly/maven.xml	Sat Nov  6 11:58:54 2004
@@ -94,16 +94,16 @@
             <ant:fileset dir="${project.root}/modules/deployment">
                 <ant:include name="src/schema/*.xsd"/>
             </ant:fileset>
-            <ant:fileset dir="${project.root}/modules/j2ee">
+            <ant:fileset dir="${project.root}/modules/j2ee-builder">
                 <ant:include name="src/schema/*.xsd"/>
             </ant:fileset>
-            <ant:fileset dir="${project.root}/modules/jetty">
+            <ant:fileset dir="${project.root}/modules/jetty-builder">
                 <ant:include name="src/schema/*.xsd"/>
             </ant:fileset>
             <ant:fileset dir="${project.root}/modules/connector-builder">
                 <ant:include name="src/schema/*.xsd"/>
             </ant:fileset>
-            <ant:fileset dir="${project.root}/modules/naming">
+            <ant:fileset dir="${project.root}/modules/naming-builder">
                 <ant:include name="src/schema/*.xsd"/>
             </ant:fileset>
             <ant:fileset dir="${project.root}/modules/security">

Modified: geronimo/trunk/modules/assembly/project.xml
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml	(original)
+++ geronimo/trunk/modules/assembly/project.xml	Sat Nov  6 11:58:54 2004
@@ -154,6 +154,15 @@
 
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-jetty</artifactId>
             <version>${pom.currentVersion}</version>
             <properties>
@@ -163,6 +172,15 @@
 
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-jetty-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-jmxremoting</artifactId>
             <version>${pom.currentVersion}</version>
             <properties>
@@ -187,6 +205,15 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-naming</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
             <version>${pom.currentVersion}</version>
             <properties>
                 <repository>true</repository>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml	(original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml	Sat Nov  6 11:58:54 2004
@@ -28,13 +28,35 @@
     >
 
     <dependency>
-        <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
+        <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
+        <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
         <uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-j2ee-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-client-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
+    </dependency>
+
+    <dependency>
+        <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
         <uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml	(original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml	Sat Nov  6 11:58:54 2004
@@ -30,6 +30,34 @@
     parentId="org/apache/geronimo/System"
     >
 
+    <!-- needed for online deployment -->
+    <!-- should be removed once openejb gets a separate builder module-->
+    <dependency>
+        <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-j2ee-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-client-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
+    </dependency>
+ 
+    <!--runtime dependencies-->
     <dependency>
         <uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
     </dependency>
@@ -43,9 +71,6 @@
         <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
         <uri>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
     </dependency>
     <dependency>
@@ -89,24 +114,11 @@
         <uri>xpp3/jars/xpp3-${xpp3_version}.jar</uri>
     </dependency>
 
-    <!-- needed for online deployment -->
-    <dependency>
-        <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
-    </dependency>
     <dependency>
         <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
-    </dependency>
-    <dependency>
         <uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-client-builder-${geronimo_version}.jar</uri>
     </dependency>
 
 

Modified: geronimo/trunk/modules/client-builder/project.xml
==============================================================================
--- geronimo/trunk/modules/client-builder/project.xml	(original)
+++ geronimo/trunk/modules/client-builder/project.xml	Sat Nov  6 11:58:54 2004
@@ -98,6 +98,12 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.currentVersion}</version>   
+        </dependency>
+ 
+       <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
 
@@ -117,11 +123,17 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${pom.currentVersion}</version>
+        </dependency>
+           
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.currentVersion}</version>
             <properties>
                 <xmlbeans>true</xmlbeans>
             </properties>
         </dependency>
-
+ 
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>

Modified: geronimo/trunk/modules/connector-builder/project.xml
==============================================================================
--- geronimo/trunk/modules/connector-builder/project.xml	(original)
+++ geronimo/trunk/modules/connector-builder/project.xml	Sat Nov  6 11:58:54 2004
@@ -77,6 +77,12 @@
 
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+    
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-deployment</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency> 
@@ -91,6 +97,12 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+      <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
 

Copied: geronimo/trunk/modules/j2ee-builder/project.xml (from rev 56717, geronimo/trunk/modules/j2ee/project.xml)
==============================================================================
--- geronimo/trunk/modules/j2ee/project.xml	(original)
+++ geronimo/trunk/modules/j2ee-builder/project.xml	Sat Nov  6 11:58:54 2004
@@ -33,9 +33,9 @@
     <!-- ===================== -->
 
     <name>Geronimo :: J2EE</name>
-    <id>geronimo-j2ee</id>
-    <shortDescription>J2EE Services</shortDescription>
-    <description>Geronimo J2EE Services</description>
+    <id>geronimo-j2ee-builder</id>
+    <shortDescription>J2EE Deployment Services</shortDescription>
+    <description>Geronimo Deployment J2EE Services</description>
     <url>http://geronimo.apache.org/modules/j2ee/</url>
     <siteDirectory>/www/geronimo.apache.org/modules/j2ee</siteDirectory>
     <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/j2ee</distributionDirectory>
@@ -69,6 +69,11 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
         <dependency>

Modified: geronimo/trunk/modules/j2ee/maven.xml
==============================================================================
--- geronimo/trunk/modules/j2ee/maven.xml	(original)
+++ geronimo/trunk/modules/j2ee/maven.xml	Sat Nov  6 11:58:54 2004
@@ -22,142 +22,6 @@
 <project default="default"
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
-    xmlns:maven="jelly:maven"
-    xmlns:xmlbeans="geronimo:xmlbeans">
-
-    <preGoal name="java:compile">
-        <xmlbeans:schema2java
-            sourcedir="${basedir}/src"
-            sourceschema="schema/geronimo-application.xsd"
-            xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
-    </preGoal>
-
-    <preGoal name="test:compile">
-        <!-- Build test-ejb-jar -->
-        <j:set var="ear.src.base.dir" value="${basedir}/src/test-ear"/>
-        <j:set var="ear.target.base.dir" value="${basedir}/target/test-ear14"/>
-
-        <attainGoal name="setupEar"/>
-        <!-- Build test-ejb-jar -->
-        <j:set var="ear.src.base.dir" value="${basedir}/src/test-ear13"/>
-        <j:set var="ear.target.base.dir" value="${basedir}/target/test-ear13"/>
-
-        <attainGoal name="setupEar"/>
-        
-        <attainGoal name="setupUnpackedEar"/>
-    </preGoal>
-
-    <goal name="setupEar">
-        <ant:mkdir dir="${ear.target.base.dir}/test-ejb-jar/META-INF"/>
-        
-        <ant:mkdir dir="${ear.target.base.dir}/test-ejb-jar/META-INF"/>
-        <copy todir="${ear.target.base.dir}/test-ejb-jar/META-INF">
-            <fileset dir="${ear.src.base.dir}/test-ejb-jar/META-INF"/>
-        </copy>
-
-        <ant:javac srcdir="${ear.src.base.dir}/test-ejb-jar"
-            destdir="${ear.target.base.dir}/test-ejb-jar"
-            source="${maven.compile.source}"
-            target="${maven.compile.target}"
-            debug="on"
-            fork="true">
-            <ant:classpath>
-                <ant:path refid="maven.dependency.classpath"/>
-                <ant:pathelement path="${maven.build.dest}"/>
-            </ant:classpath>
-        </ant:javac>
-
-        <ant:jar destfile="${ear.target.base.dir}/test-ejb-jar.jar"
-            basedir="${ear.target.base.dir}/test-ejb-jar"/>
-
-
-        <!-- Build test-war -->
-        <ant:jar destfile="${ear.target.base.dir}/test-war.war"
-            basedir="${ear.src.base.dir}/test-war"/>
-
-        <!-- Build test-rar -->
-        <ant:jar destfile="${ear.target.base.dir}/test-rar.rar"
-            basedir="${ear.src.base.dir}/test-rar"/>
-
-        <!-- Build test-ear -->
-        <ant:jar destfile="${ear.target.base.dir}/test-ear.ear">
-            <fileset dir="${ear.target.base.dir}">
-                <include name="test-ejb-jar.jar"/>
-                <include name="test-war.war"/>
-                <include name="test-rar.rar"/>
-            </fileset>
-            <fileset dir="${ear.src.base.dir}">
-                <include name="META-INF/*"/>
-            </fileset>
-        </ant:jar>
-
-        <!-- Build test-naked-ear -->
-        <ant:jar destfile="${ear.target.base.dir}/test-naked-ear.ear">
-            <fileset dir="${ear.target.base.dir}">
-                <include name="test-ejb-jar.jar"/>
-                <include name="test-war.war"/>
-                <include name="test-rar.rar"/>
-            </fileset>
-            <fileset dir="${ear.src.base.dir}">
-                <include name="META-INF/*"/>
-                <exclude name="META-INF/geronimo-application.xml"/>
-            </fileset>
-        </ant:jar>
-    </goal>
-
-    <goal name="setupUnpackedEar">
-        <j:set var="ear.unpacked.relative" value="full"/>
-        <attainGoal name="setupBaseUnpackedEar"/>
-        <copy todir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/META-INF">
-            <fileset dir="${basedir}/src/test-unpacked-ear/META-INF">
-                <include name="application.xml"/>
-                <include name="geronimo-application.xml"/>
-            </fileset>
-        </copy>
-
-
-        <j:set var="ear.unpacked.relative" value="naked"/>
-        <attainGoal name="setupBaseUnpackedEar"/>
-        <copy todir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/META-INF">
-            <fileset dir="${basedir}/src/test-unpacked-ear/META-INF">
-                <include name="application.xml"/>
-            </fileset>
-        </copy>
-
-
-
-        <j:set var="ear.unpacked.relative" value="alt-dd"/>
-        <attainGoal name="setupBaseUnpackedEar"/>
-        <copy todir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/META-INF">
-            <fileset dir="${basedir}/src/test-unpacked-ear/META-INF">
-                <include name="application-alt-dd.xml"/>
-            </fileset>
-            <mapper type="merge" to="application.xml"/>
-        </copy>
-        <copy todir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/META-INF">
-            <fileset dir="${basedir}/src/test-unpacked-ear/META-INF">
-                <include name="geronimo-application-alt-dd.xml"/>
-            </fileset>
-            <mapper type="merge" to="geronimo-application.xml"/>
-        </copy>
-        <copy todir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}">
-            <fileset dir="${basedir}/src/test-unpacked-ear">
-                <include name="*.xml"/>
-            </fileset>
-        </copy>
-
-        <ant:jar destfile="${basedir}/target/test-unpacked-ear/alt-dd.ear">
-            <fileset dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}"/>
-        </ant:jar>
-    </goal>
-    
-    <goal name="setupBaseUnpackedEar">
-        <ant:mkdir dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/META-INF"/>
-        <ant:mkdir dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/test-ejb-jar"/>
-        <ant:mkdir dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/test-war"/>
-        <ant:mkdir dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/test-rar"/>
-    </goal>
+    xmlns:maven="jelly:maven">
 
 </project>

Copied: geronimo/trunk/modules/jetty-builder/project.xml (from rev 56717, geronimo/trunk/modules/jetty/project.xml)
==============================================================================
--- geronimo/trunk/modules/jetty/project.xml	(original)
+++ geronimo/trunk/modules/jetty-builder/project.xml	Sat Nov  6 11:58:54 2004
@@ -33,12 +33,12 @@
     <!-- ===================== -->
 
     <name>Geronimo :: Jetty</name>
-    <id>geronimo-jetty</id>
-    <shortDescription>Jetty Integration</shortDescription>
-    <description>Geronimo Jetty Integration</description>
-    <url>http://geronimo.apache.org/modules/jetty/</url>
-    <siteDirectory>/www/geronimo.apache.org/modules/jetty</siteDirectory>
-    <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/jetty</distributionDirectory>
+    <id>geronimo-jetty-builder</id>
+    <shortDescription>Jetty Deployer</shortDescription>
+    <description>Geronimo Jetty Deployer</description>
+    <url>http://geronimo.apache.org/modules/jetty-builder/</url>
+    <siteDirectory>/www/geronimo.apache.org/modules/jetty-builder</siteDirectory>
+    <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/jetty-builder</distributionDirectory>
 
     <package>org.apache.geronimo.jetty</package>
 
@@ -77,14 +77,32 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.currentVersion}</version>
             <properties>
                 <xmlbeans>true</xmlbeans>
             </properties>
         </dependency>
-
-        <dependency>
+        
+       <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-jetty</artifactId>
+            <version>${pom.currentVersion}</version>           
+        </dependency>
+        
+       <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.currentVersion}</version>           
+        </dependency>
+        
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
 

Modified: geronimo/trunk/modules/jetty/maven.xml
==============================================================================
--- geronimo/trunk/modules/jetty/maven.xml	(original)
+++ geronimo/trunk/modules/jetty/maven.xml	Sat Nov  6 11:58:54 2004
@@ -22,16 +22,6 @@
 <project default="default"
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
-    xmlns:maven="jelly:maven"
-    xmlns:xmlbeans="geronimo:xmlbeans">
-
-    <preGoal name="java:compile">
-        <xmlbeans:schema2java
-            sourcedir="${basedir}/src"
-            sourceschema="schema/geronimo-jetty.xsd"
-            xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
-    </preGoal>
+    xmlns:maven="jelly:maven">
 
 </project>

Copied: geronimo/trunk/modules/naming-builder/project.xml (from rev 56717, geronimo/trunk/modules/naming/project.xml)
==============================================================================
--- geronimo/trunk/modules/naming/project.xml	(original)
+++ geronimo/trunk/modules/naming-builder/project.xml	Sat Nov  6 11:58:54 2004
@@ -33,9 +33,9 @@
     <!-- ===================== -->
 
     <name>Geronimo :: Naming</name>
-    <id>geronimo-naming</id>
-    <shortDescription>Geronimo Naming</shortDescription>
-    <description>Geronimo Naming</description>
+    <id>geronimo-naming-builder</id>
+    <shortDescription>Geronimo Naming Builder</shortDescription>
+    <description>Geronimo Naming Builder</description>
     <url>http://incubator.apache.org/projects/geronimo/naming/</url>
     <siteDirectory>/www/incubator.apache.org/projects/geronimo/naming</siteDirectory>
     <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/naming</distributionDirectory>
@@ -80,7 +80,13 @@
             <version>${pom.currentVersion}</version>
         </dependency>
 
-        <dependency>
+       <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+         <dependency>
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-j2ee-deployment</artifactId>
             <version>&geronimo-spec-j2ee-deployment-version;</version>
@@ -95,6 +101,12 @@
             </properties>
         </dependency>
 
+       <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+            
         <dependency>
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-jta</artifactId>

Modified: geronimo/trunk/modules/naming/maven.xml
==============================================================================
--- geronimo/trunk/modules/naming/maven.xml	(original)
+++ geronimo/trunk/modules/naming/maven.xml	Sat Nov  6 11:58:54 2004
@@ -19,16 +19,5 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="default"
-    xmlns:xmlbeans="geronimo:xmlbeans">
-
-    <preGoal name="java:compile">
-        <xmlbeans:schema2java
-            sourcedir="${basedir}/src"
-            sourceschema="schema/geronimo-naming.xsd"
-            xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
-    </preGoal>
-
+<project default="default">
 </project>

Mime
View raw message