dain 2004/05/19 13:54:01
Modified: modules/assembly maven.xml
modules/assembly/src/plan j2ee-deployer-plan.xml
j2ee-server-plan.xml
modules/deployment/src/java/org/apache/geronimo/deployment
Deployer.java DeploymentContext.java
modules/j2ee project.xml
modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl
Util.java
modules/j2ee/src/test/org/apache/geronimo/j2ee/management
Abstract77Test.java DomainTest.java ServerTest.java
modules/jetty project.xml
modules/jetty/src/etc/META-INF geronimo-service.xml
modules/jetty/src/schema geronimo-jetty.xsd
modules/kernel/src/java/org/apache/geronimo/gbean
GBeanContext.java
modules/kernel/src/java/org/apache/geronimo/gbean/jmx
GBeanMBeanReference.java
specs/schema maven.xml
Added: modules/j2ee maven.xml
modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment
AmbiguousEJBRefException.java ConnectorModule.java
EARConfigBuilder.java EARContext.java
EJBModule.java Module.java ModuleBuilder.java
UnknownEJBRefException.java WebModule.java
modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl
InvalidObjectNameException.java
J2EEApplicationImpl.java J2EEDomainImpl.java
J2EEServerImpl.java
modules/j2ee/src/schema geronimo-application.xsd
xmlconfig.xml
modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment
EARConfigBuilderTest.java EARContextTest.java
MockConnectorConfigBuilder.java
MockEJBConfigBuilder.java MockWARConfigBuilder.java
modules/j2ee/src/test-ear/META-INF application.xml
geronimo-application.xml
modules/j2ee/src/test-ear/test-ejb-jar/META-INF ejb-jar.xml
openejb-jar.xml
modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/bmp
SimpleBMPEntity.java SimpleBMPEntityEJB.java
SimpleBMPEntityHome.java SimpleBMPEntityLocal.java
SimpleBMPEntityLocalHome.java
modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/cmp
SimpleCMPEntity.java SimpleCMPEntityEJB.java
SimpleCMPEntityHome.java SimpleCMPEntityLocal.java
SimpleCMPEntityLocalHome.java
modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/sfsb
SimpleStatefulSession.java
SimpleStatefulSessionEJB.java
SimpleStatefulSessionHome.java
SimpleStatefulSessionLocal.java
SimpleStatefulSessionLocalHome.java
modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/slsb
SimpleStatelessSession.java
SimpleStatelessSessionEJB.java
SimpleStatelessSessionHome.java
SimpleStatelessSessionLocal.java
SimpleStatelessSessionLocalHome.java
modules/j2ee/src/test-ear/test-war hello.txt
modules/j2ee/src/test-ear/test-war/WEB-INF geronimo-web.xml
web.xml
modules/jetty/src/java/org/apache/geronimo/jetty/deployment
JettyModuleBuilder.java
Removed: modules/j2ee/src/java/org/apache/geronimo/j2ee/application
EARModule.java
modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl
DeployedObjectImpl.java DomainImpl.java
ServerImpl.java
modules/jetty/src/java/org/apache/geronimo/jetty/deployment
WARConfigBuilder.java
Log:
Added ear deployment
Supports web and ejb modules, but not connector modules
Revision Changes Path
1.12 +5 -4 incubator-geronimo/modules/assembly/maven.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/assembly/maven.xml.diff?r1=1.11&r2=1.12
1.14 +11 -5
incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml.diff?r1=1.13&r2=1.14
1.16 +3 -24
incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml.diff?r1=1.15&r2=1.16
1.19 +10 -11
incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java.diff?r1=1.18&r2=1.19
1.10 +61 -31
incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java.diff?r1=1.9&r2=1.10
1.5 +37 -1 incubator-geronimo/modules/j2ee/project.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/project.xml.diff?r1=1.4&r2=1.5
1.1 incubator-geronimo/modules/j2ee/maven.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/maven.xml?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/AmbiguousEJBRefException.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/Module.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/Module.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/UnknownEJBRefException.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java?rev=1.1
1.4 +18 -17
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/Util.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/Util.java.diff?r1=1.3&r2=1.4
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/InvalidObjectNameException.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/InvalidObjectNameException.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/schema/geronimo-application.xsd
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/schema/geronimo-application.xsd?rev=1.1
1.1 incubator-geronimo/modules/j2ee/src/schema/xmlconfig.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/schema/xmlconfig.xml?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/EARContextTest.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/EARContextTest.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?rev=1.1
1.4 +22 -35
incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java.diff?r1=1.3&r2=1.4
1.4 +4 -8
incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/DomainTest.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/DomainTest.java.diff?r1=1.3&r2=1.4
1.4 +6 -10
incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java.diff?r1=1.3&r2=1.4
1.1
incubator-geronimo/modules/j2ee/src/test-ear/META-INF/application.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/META-INF/application.xml?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/META-INF/geronimo-application.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/META-INF/geronimo-application.xml?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/META-INF/ejb-jar.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/META-INF/ejb-jar.xml?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntity.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntity.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityEJB.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityEJB.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityHome.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityHome.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityLocal.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityLocal.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityLocalHome.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityLocalHome.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntity.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntity.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityEJB.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityEJB.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityHome.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityHome.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityLocal.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityLocal.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityLocalHome.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityLocalHome.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSession.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSession.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionEJB.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionEJB.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionHome.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionHome.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionLocal.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionLocal.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionLocalHome.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionLocalHome.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSession.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSession.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionEJB.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionEJB.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionHome.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionHome.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionLocal.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionLocal.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionLocalHome.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionLocalHome.java?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-war/hello.txt
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-war/hello.txt?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-war/WEB-INF/geronimo-web.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-war/WEB-INF/geronimo-web.xml?rev=1.1
1.1
incubator-geronimo/modules/j2ee/src/test-ear/test-war/WEB-INF/web.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-war/WEB-INF/web.xml?rev=1.1
1.32 +7 -1 incubator-geronimo/modules/jetty/project.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/jetty/project.xml.diff?r1=1.31&r2=1.32
1.11 +3 -3
incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml.diff?r1=1.10&r2=1.11
1.1
incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=1.1
1.8 +3 -1
incubator-geronimo/modules/jetty/src/schema/geronimo-jetty.xsd
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/jetty/src/schema/geronimo-jetty.xsd.diff?r1=1.7&r2=1.8
1.4 +5 -1
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanContext.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanContext.java.diff?r1=1.3&r2=1.4
1.6 +6 -4
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBeanReference.java
http://cvs.apache.org/viewcvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBeanReference.java.diff?r1=1.5&r2=1.6
1.11 +2 -2 incubator-geronimo/specs/schema/maven.xml
http://cvs.apache.org/viewcvs/incubator-geronimo/specs/schema/maven.xml.diff?r1=1.10&r2=1.11