You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2004/12/03 00:37:57 UTC
svn commit: r109593 - in geronimo/trunk: modules/assembly modules/assembly/src/plan modules/axis modules/client-builder modules/client-builder/src/schema modules/connector-builder modules/connector-builder/src/schema modules/deploy-tool modules/deploy-tool/src modules/deploy-tool/src/conf modules/deploy-tool/src/java modules/deploy-tool/src/java/org modules/deploy-tool/src/java/org/apache modules/deploy-tool/src/java/org/apache/geronimo modules/deploy-tool/src/java/org/apache/geronimo/deployment modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/client modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/factories modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local modules/deploy-tool/src/test modules/deploy-tool/src/test/org modules/deploy-tool/src/test/org/apache modules/deploy-tool/src/test/org/apache/geronimo modules/deploy-tool/src/test/org/apache/geronimo/deployment modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin modules/deployment modules/deployment/src/conf modules/deployment/src/java/org/apache/geronimo/deployment modules/deployment/src/java/org/apache/geronimo/deployment/cli modules/deployment/src/java/org/apache/geronimo/deployment/plugin modules/deployment/src/java/org/apache/geronimo/deployment/service modules/deployment/src/java/org/apache/geronimo/deployment/tools modules/deployment/src/schema modules/deployment/src/test modules/deployment/src/test-resources modules/j2ee-builder modules/j2ee-builder/src/schema modules/jetty-builder modules/jetty-builder/src/schema modules/naming-builder modules/remoting/src/java/org/apache/geronimo/remoting/transport/async/bio modules/service-builder modules/service-builder/src modules/service-builder/src/java modules/service-builder/src/java/org modules/service-builder/src/java/org/apache modules/service-builder/src/java/org/apache/geronimo modules/service-builder/src/java/org/apache/geronimo/deployment modules/service-builder/src/java/org/apache/geronimo/deployment/service modules/service-builder/src/schema modules/service-builder/src/test modules/service-builder/src/test-resources modules/service-builder/src/test-resources/services modules/service-builder/src/test-resources/services/service3 modules/service-builder/src/test/org modules/service-builder/src/test/org/apache modules/service-builder/src/test/org/apache/geronimo modules/service-builder/src/test/org/apache/geronimo/deployment modules/service-builder/src/test/org/apache/geronimo/deployment/service modules/test-ddbean modules/test-ddbean/src modules/test-ddbean/src/java modules/test-ddbean/src/java/org modules/test-ddbean/src/java/org/apache modules/test-ddbean/src/java/org/apache/geronimo modules/test-ddbean/src/java/org/apache/geronimo/deployment modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/loader modules/test-ddbean/src/test modules/test-ddbean/src/test-resources modules/test-ddbean/src/test-resources/deployables modules/test-ddbean/src/test-resources/descriptors modules/test-ddbean/src/test-resources/etc modules/test-ddbean/src/test-resources/services modules/test-ddbean/src/test/org modules/test-ddbean/src/test/org/apache modules/test-ddbean/src/test/org/apache/geronimo modules/test-ddbean/src/test/org/apache/geronimo/deployment modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools plugins/maven-geronimo-plugin
Author: ammulder
Date: Thu Dec 2 15:37:56 2004
New Revision: 109593
URL: http://svn.apache.org/viewcvs?view=rev&rev=109593
Log:
Split deployment module into:
- deployment (main deployer GBean)
- service-deployer (service deployment GBean w/schemas & XMLBeans)
- deploy-tool (CLI deploy tool & DConfigBeans)
- test-ddbean (Sample DDBean implementation used for testing purposes)
Added:
geronimo/trunk/modules/deploy-tool/ (props changed)
geronimo/trunk/modules/deploy-tool/LICENSE.txt
geronimo/trunk/modules/deploy-tool/NOTICE.txt
geronimo/trunk/modules/deploy-tool/locator.ent
geronimo/trunk/modules/deploy-tool/maven.xml
geronimo/trunk/modules/deploy-tool/project.properties
geronimo/trunk/modules/deploy-tool/project.xml
geronimo/trunk/modules/deploy-tool/src/
geronimo/trunk/modules/deploy-tool/src/conf/
geronimo/trunk/modules/deploy-tool/src/conf/manifest.mf
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/conf/manifest.mf
geronimo/trunk/modules/deploy-tool/src/java/
geronimo/trunk/modules/deploy-tool/src/java/org/
geronimo/trunk/modules/deploy-tool/src/java/org/apache/
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/Bootstrap.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandStart.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStop.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandStop.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandUndeploy.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandUndeploy.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanRootSupport.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanRootSupport.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationImpl.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationImpl.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationSupport.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationSupport.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/FailedProgressObject.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/FailedProgressObject.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/TargetImpl.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/TargetImpl.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/TargetModuleIDImpl.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/TargetModuleIDImpl.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/XmlBeanSupport.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/XmlBeanSupport.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/client/
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/factories/
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/factories/AuthenticationFailedException.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories/AuthenticationFailedException.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
geronimo/trunk/modules/deploy-tool/src/test/
geronimo/trunk/modules/deploy-tool/src/test/org/
geronimo/trunk/modules/deploy-tool/src/test/org/apache/
geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/
geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/
geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/
geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/Application.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/plugin/Application.java
geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/ApplicationRoot.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/plugin/ApplicationRoot.java
geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/DeploymentConfigurationTest.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/plugin/DeploymentConfigurationTest.java
geronimo/trunk/modules/service-builder/ (props changed)
geronimo/trunk/modules/service-builder/LICENSE.txt
geronimo/trunk/modules/service-builder/NOTICE.txt
geronimo/trunk/modules/service-builder/locator.ent
geronimo/trunk/modules/service-builder/maven.xml
geronimo/trunk/modules/service-builder/project.properties
geronimo/trunk/modules/service-builder/project.xml
geronimo/trunk/modules/service-builder/src/
geronimo/trunk/modules/service-builder/src/java/
geronimo/trunk/modules/service-builder/src/java/org/
geronimo/trunk/modules/service-builder/src/java/org/apache/
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/
- copied from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanAdapter.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanAdapter.java
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanDefault.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanDefault.java
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceGBeanAdapter.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceGBeanAdapter.java
geronimo/trunk/modules/service-builder/src/schema/
- copied from r109507, geronimo/trunk/modules/deployment/src/schema/
geronimo/trunk/modules/service-builder/src/schema/geronimo-common.xsd
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/schema/geronimo-common.xsd
geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/schema/geronimo-config.xsd
geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/schema/geronimo-service.xsd
geronimo/trunk/modules/service-builder/src/schema/xmlconfig.xml
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/schema/xmlconfig.xml
geronimo/trunk/modules/service-builder/src/test/
geronimo/trunk/modules/service-builder/src/test-resources/
geronimo/trunk/modules/service-builder/src/test-resources/services/
- copied from r109541, geronimo/trunk/modules/deployment/src/test-resources/services/
geronimo/trunk/modules/service-builder/src/test-resources/services/plan1.xml
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/test-resources/services/plan1.xml
geronimo/trunk/modules/service-builder/src/test-resources/services/service1.xml
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/test-resources/services/service1.xml
geronimo/trunk/modules/service-builder/src/test-resources/services/service2.jar
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/test-resources/services/service2.jar
geronimo/trunk/modules/service-builder/src/test-resources/services/service3/
- copied from r109589, geronimo/trunk/modules/deployment/src/test-resources/services/service3/
geronimo/trunk/modules/service-builder/src/test/org/
geronimo/trunk/modules/service-builder/src/test/org/apache/
geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/
geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/
geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/MockEndpoint.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/MockEndpoint.java
geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/MockGBean.java
- copied unchanged from r109507, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/MockGBean.java
geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/
- copied from r109507, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/service/
geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java
geronimo/trunk/modules/test-ddbean/ (props changed)
geronimo/trunk/modules/test-ddbean/LICENSE.txt
geronimo/trunk/modules/test-ddbean/NOTICE.txt
geronimo/trunk/modules/test-ddbean/locator.ent
geronimo/trunk/modules/test-ddbean/maven.xml
geronimo/trunk/modules/test-ddbean/project.properties
geronimo/trunk/modules/test-ddbean/project.xml
geronimo/trunk/modules/test-ddbean/src/
geronimo/trunk/modules/test-ddbean/src/java/
geronimo/trunk/modules/test-ddbean/src/java/org/
geronimo/trunk/modules/test-ddbean/src/java/org/apache/
geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/
geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/
geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/
- copied from r109541, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/tools/
geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/DDBeanImpl.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/tools/DDBeanImpl.java
geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/DDBeanRootImpl.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/tools/DDBeanRootImpl.java
geronimo/trunk/modules/test-ddbean/src/test/
geronimo/trunk/modules/test-ddbean/src/test-resources/
- copied from r109541, geronimo/trunk/modules/deployment/src/test-resources/
geronimo/trunk/modules/test-ddbean/src/test-resources/deployables/
- copied from r109589, geronimo/trunk/modules/deployment/src/test-resources/deployables/
geronimo/trunk/modules/test-ddbean/src/test-resources/descriptors/
- copied from r109589, geronimo/trunk/modules/deployment/src/test-resources/descriptors/
geronimo/trunk/modules/test-ddbean/src/test/org/
geronimo/trunk/modules/test-ddbean/src/test/org/apache/
geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/
geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/
geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/
- copied from r109541, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/tools/
geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/ClientDeployableTest.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/tools/ClientDeployableTest.java
geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/DDBeanRootTest.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/tools/DDBeanRootTest.java
geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/WebDeployableTest.java
- copied unchanged from r109589, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/tools/WebDeployableTest.java
Removed:
geronimo/trunk/modules/deployment/src/conf/manifest.mf
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/RemoteDeployer.java
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/tools/
geronimo/trunk/modules/deployment/src/schema/
geronimo/trunk/modules/deployment/src/test/
geronimo/trunk/modules/deployment/src/test-resources/
geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/loader/
geronimo/trunk/modules/test-ddbean/src/test-resources/etc/
geronimo/trunk/modules/test-ddbean/src/test-resources/services/
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-runtime-deployer-plan.xml
geronimo/trunk/modules/axis/project.xml
geronimo/trunk/modules/client-builder/project.xml
geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd
geronimo/trunk/modules/connector-builder/project.xml
geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd
geronimo/trunk/modules/deployment/maven.xml
geronimo/trunk/modules/deployment/project.properties
geronimo/trunk/modules/deployment/project.xml
geronimo/trunk/modules/j2ee-builder/project.xml
geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd
geronimo/trunk/modules/jetty-builder/project.xml
geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd
geronimo/trunk/modules/naming-builder/project.xml
geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/transport/async/bio/BlockingServer.java
geronimo/trunk/plugins/maven-geronimo-plugin/project.xml
Modified: geronimo/trunk/modules/assembly/maven.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/assembly/maven.xml&r1=109592&p2=geronimo/trunk/modules/assembly/maven.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Thu Dec 2 15:37:56 2004
@@ -127,7 +127,7 @@
</ant:fileScanner>
<j:forEach var="schema" items="${schemaScanner.iterator()}">
<ant:replace file="${schema}" token="../../../naming-builder/src/schema/" value=""/>
- <ant:replace file="${schema}" token="../../../deployment/src/schema/" value=""/>
+ <ant:replace file="${schema}" token="../../../service-builder/src/schema/" value=""/>
<ant:replace file="${schema}" token="../../../security-builder/src/schema/" value=""/>
<ant:replace file="${schema}" token="../../../connector-builder/src/schema/" value=""/>
</j:forEach>
Modified: geronimo/trunk/modules/assembly/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/assembly/project.xml&r1=109592&p2=geronimo/trunk/modules/assembly/project.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Thu Dec 2 15:37:56 2004
@@ -145,6 +145,17 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-deploy-tool</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <lib>true</lib>
+ <deploy>true</deploy>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -250,6 +261,15 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-derby</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml&r1=109592&p2=geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Thu Dec 2 15:37:56 2004
@@ -52,6 +52,9 @@
<uri>geronimo/jars/geronimo-security-builder-${geronimo_version}.jar</uri>
</dependency>
<dependency>
+ <uri>geronimo/jars/geronimo-service-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
</dependency>
<dependency>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml&r1=109592&p2=geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml Thu Dec 2 15:37:56 2004
@@ -52,6 +52,9 @@
<uri>geronimo/jars/geronimo-security-builder-${geronimo_version}.jar</uri>
</dependency>
<dependency>
+ <uri>geronimo/jars/geronimo-service-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
</dependency>
<dependency>
Modified: geronimo/trunk/modules/axis/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/project.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/axis/project.xml&r1=109592&p2=geronimo/trunk/modules/axis/project.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/axis/project.xml (original)
+++ geronimo/trunk/modules/axis/project.xml Thu Dec 2 15:37:56 2004
@@ -131,6 +131,11 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/trunk/modules/client-builder/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/project.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/client-builder/project.xml&r1=109592&p2=geronimo/trunk/modules/client-builder/project.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/client-builder/project.xml (original)
+++ geronimo/trunk/modules/client-builder/project.xml Thu Dec 2 15:37:56 2004
@@ -142,6 +142,12 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd?view=diff&rev=109593&p1=geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd&r1=109592&p2=geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd&r2=109593
==============================================================================
--- geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd (original)
+++ geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd Thu Dec 2 15:37:56 2004
@@ -29,7 +29,7 @@
<xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming-builder/src/schema/geronimo-naming.xsd"/>
<xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/connector" schemaLocation="../../../connector-builder/src/schema/geronimo-connector_1_5.xsd"/>
<!--xs:include schemaLocation="../../../naming-builder/src/schema/geronimo-naming.xsd"/-->
- <xs:include schemaLocation="../../../deployment/src/schema/geronimo-common.xsd"/>
+ <xs:include schemaLocation="../../../service-builder/src/schema/geronimo-common.xsd"/>
<xs:element name="application-client" type="geronimo:application-clientType"/>
Modified: geronimo/trunk/modules/connector-builder/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/project.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/connector-builder/project.xml&r1=109592&p2=geronimo/trunk/modules/connector-builder/project.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/connector-builder/project.xml (original)
+++ geronimo/trunk/modules/connector-builder/project.xml Thu Dec 2 15:37:56 2004
@@ -87,7 +87,19 @@
<version>${pom.currentVersion}</version>
</dependency>
- <dependency>
+ <!-- todo: move this once DConfigBean home is selected -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deploy-tool</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-test-ddbean</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
<version>${pom.currentVersion}</version>
@@ -115,6 +127,12 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd?view=diff&rev=109593&p1=geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd&r1=109592&p2=geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd&r2=109593
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd (original)
+++ geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd Thu Dec 2 15:37:56 2004
@@ -26,7 +26,7 @@
version="1.5">
<xsd:import namespace="http://java.sun.com/xml/ns/j2ee" schemaLocation="j2ee_1_4.xsd"/>
- <xsd:include schemaLocation="../../../deployment/src/schema/geronimo-common.xsd"/>
+ <xsd:include schemaLocation="../../../service-builder/src/schema/geronimo-common.xsd"/>
<xsd:annotation>
<xsd:documentation>
Added: geronimo/trunk/modules/deploy-tool/LICENSE.txt
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/LICENSE.txt?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/deploy-tool/LICENSE.txt Thu Dec 2 15:37:56 2004
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
+
Added: geronimo/trunk/modules/deploy-tool/NOTICE.txt
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/NOTICE.txt?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/deploy-tool/NOTICE.txt Thu Dec 2 15:37:56 2004
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: geronimo/trunk/modules/deploy-tool/locator.ent
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/locator.ent?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/deploy-tool/locator.ent Thu Dec 2 15:37:56 2004
@@ -0,0 +1,3 @@
+<!ENTITY % versions SYSTEM "file:../../etc/version-info.ent">
+
+
Added: geronimo/trunk/modules/deploy-tool/maven.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/maven.xml?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/deploy-tool/maven.xml Thu Dec 2 15:37:56 2004
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright 2004 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: 56771 $ $Date: 2004-11-06 14:58:54 -0500 (Sat, 06 Nov 2004) $ -->
+
+<project default="default">
+
+</project>
Added: geronimo/trunk/modules/deploy-tool/project.properties
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/project.properties?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/deploy-tool/project.properties Thu Dec 2 15:37:56 2004
@@ -0,0 +1,4 @@
+##
+## $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
+##
+maven.jar.manifest=${basedir}/src/conf/manifest.mf
Added: geronimo/trunk/modules/deploy-tool/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/project.xml?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/deploy-tool/project.xml Thu Dec 2 15:37:56 2004
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2004 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.
+-->
+
+<!DOCTYPE project [
+<!ENTITY % locator SYSTEM "file:locator.ent">
+%locator;
+%versions;
+]>
+
+<!-- $Rev: 57362 $ $Date: 2004-11-10 15:40:05 -0500 (Wed, 10 Nov 2004) $ -->
+
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../../etc/project.xml</extend>
+
+ <!-- ===================== -->
+ <!-- Module Identification -->
+ <!-- ===================== -->
+
+ <name>Geronimo :: Deploy :: CLI Tool</name>
+ <id>geronimo-deploy-tool</id>
+ <shortDescription>Geronimo CLI Deploy Tool</shortDescription>
+ <description>Geronimo CLI Deploy Tool</description>
+ <url>http://incubator.apache.org/projects/geronimo/deployment/</url>
+ <siteDirectory>/www/incubator.apache.org/projects/geronimo/deployment</siteDirectory>
+ <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/deployment/</distributionDirectory>
+
+ <package>org.apache.geronimo.deployment</package>
+
+ <!-- ============ -->
+ <!-- Dependencies -->
+ <!-- ============ -->
+
+ <dependencies>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean-apache</artifactId>
+ <version>&xmlbeans-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>&mx4j-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ <version>&mx4j-version;</version>
+ </dependency>
+
+ <!-- Module Dependencies -->
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+ <version>&geronimo-spec-j2ee-deployment-version;</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <resources>
+ </resources>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+<!--
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test-data</directory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+-->
+ </unitTest>
+ </build>
+</project>
Copied: geronimo/trunk/modules/deploy-tool/src/conf/manifest.mf (from r109507, geronimo/trunk/modules/deployment/src/conf/manifest.mf)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/conf/manifest.mf?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/conf/manifest.mf&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/conf/manifest.mf&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/Bootstrap.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/Bootstrap.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/Bootstrap.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/AbstractCommand.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListModules.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListTargets.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandStart.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandStart.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStart.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStop.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandStop.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStop.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandStop.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandStop.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandUndeploy.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandUndeploy.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandUndeploy.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandUndeploy.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandUndeploy.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployCommand.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeployTool.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeployTool.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployUtils.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeploymentSyntaxException.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/ServerConnection.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanRootSupport.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanRootSupport.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanRootSupport.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanRootSupport.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanRootSupport.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationImpl.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationImpl.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationImpl.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationImpl.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationImpl.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationSupport.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationSupport.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationSupport.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationSupport.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationSupport.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/FailedProgressObject.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/FailedProgressObject.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/FailedProgressObject.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/FailedProgressObject.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/FailedProgressObject.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/TargetImpl.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/TargetImpl.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/TargetImpl.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/TargetImpl.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/TargetImpl.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/TargetModuleIDImpl.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/TargetModuleIDImpl.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/TargetModuleIDImpl.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/TargetModuleIDImpl.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/TargetModuleIDImpl.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/XmlBeanSupport.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/XmlBeanSupport.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/XmlBeanSupport.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/XmlBeanSupport.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/XmlBeanSupport.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigBean.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfiguration.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/client/ClientConfigBean.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/factories/AuthenticationFailedException.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories/AuthenticationFailedException.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/factories/AuthenticationFailedException.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories/AuthenticationFailedException.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/factories/AuthenticationFailedException.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java (from r109507, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/Application.java (from r109507, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/plugin/Application.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/Application.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/plugin/Application.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/Application.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/ApplicationRoot.java (from r109507, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/plugin/ApplicationRoot.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/ApplicationRoot.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/plugin/ApplicationRoot.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/ApplicationRoot.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/DeploymentConfigurationTest.java (from r109507, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/plugin/DeploymentConfigurationTest.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/DeploymentConfigurationTest.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/plugin/DeploymentConfigurationTest.java&r1=109507&p2=geronimo/trunk/modules/deploy-tool/src/test/org/apache/geronimo/deployment/plugin/DeploymentConfigurationTest.java&r2=109593
==============================================================================
Modified: geronimo/trunk/modules/deployment/maven.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/maven.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/maven.xml&r1=109592&p2=geronimo/trunk/modules/deployment/maven.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/deployment/maven.xml (original)
+++ geronimo/trunk/modules/deployment/maven.xml Thu Dec 2 15:37:56 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-config.xsd,schema/geronimo-service.xsd"
- xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
- targetdir="${basedir}/target/xmlbeans"
- cataloglocation="${basedir}/../../specs/schema/src/catalog/resolver-catalog.xml"/>
- </preGoal>
-
+<project default="default" >
</project>
Modified: geronimo/trunk/modules/deployment/project.properties
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/project.properties?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/project.properties&r1=109592&p2=geronimo/trunk/modules/deployment/project.properties&r2=109593
==============================================================================
--- geronimo/trunk/modules/deployment/project.properties (original)
+++ geronimo/trunk/modules/deployment/project.properties Thu Dec 2 15:37:56 2004
@@ -2,8 +2,3 @@
## $Rev$ $Date$
##
-# Include the generated xmlbean classes in the eclipse classpath
-maven.eclipse.classpath.include=target/xmlbeans
-
-maven.idea.generated.source=xmlbeans
-maven.jar.manifest=${basedir}/src/conf/manifest.mf
Modified: geronimo/trunk/modules/deployment/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/project.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/project.xml&r1=109592&p2=geronimo/trunk/modules/deployment/project.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/deployment/project.xml (original)
+++ geronimo/trunk/modules/deployment/project.xml Thu Dec 2 15:37:56 2004
@@ -49,20 +49,6 @@
<dependencies>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-xmlbeans-plugin</artifactId>
- <version>${pom.currentVersion}</version>
- <type>plugin</type>
- </dependency>
-
- <!-- needed for xmlbeans runtime-->
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean-apache</artifactId>
- <version>&xmlbeans-version;</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
@@ -86,31 +72,12 @@
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-full</artifactId>
- <version>&cglib-version;</version>
- <url>http://cglib.sf.net/</url>
- </dependency>
-
- <dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>&mx4j-version;</version>
</dependency>
<dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- <version>&mx4j-version;</version>
- </dependency>
-
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>&commons-logging-version;</version>
@@ -118,13 +85,6 @@
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>&commons-cli-version;</version>
- <url>http://jakarta.apache.org/commons/cli/</url>
- </dependency>
-
- <dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>&xml-resolver-version;</version>
@@ -146,12 +106,14 @@
<exclude>**/Abstract*.java</exclude>
</excludes>
<resources>
- <resource>
+<!--
+ <resource>
<directory>${basedir}/src/schema</directory>
<includes>
<include>*.xsd</include>
</includes>
</resource>
+-->
<resource>
<directory>${basedir}/src/test-resources</directory>
</resource>
Deleted: /geronimo/trunk/modules/deployment/src/conf/manifest.mf
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/src/conf/manifest.mf?view=auto&rev=109592
==============================================================================
Deleted: /geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java?view=auto&rev=109592
==============================================================================
Deleted: /geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/RemoteDeployer.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/RemoteDeployer.java?view=auto&rev=109592
==============================================================================
Modified: geronimo/trunk/modules/j2ee-builder/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/project.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/j2ee-builder/project.xml&r1=109592&p2=geronimo/trunk/modules/j2ee-builder/project.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/project.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/project.xml Thu Dec 2 15:37:56 2004
@@ -73,6 +73,11 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd?view=diff&rev=109593&p1=geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd&r1=109592&p2=geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd&r2=109593
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd (original)
+++ geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd Thu Dec 2 15:37:56 2004
@@ -24,7 +24,7 @@
attributeFormDefault="unqualified"
version="1.0">
- <xs:include schemaLocation="../../../deployment/src/schema/geronimo-common.xsd"/>
+ <xs:include schemaLocation="../../../service-builder/src/schema/geronimo-common.xsd"/>
<xs:element name="application" type="geronimo:applicationType"/>
Modified: geronimo/trunk/modules/jetty-builder/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/project.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/jetty-builder/project.xml&r1=109592&p2=geronimo/trunk/modules/jetty-builder/project.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/jetty-builder/project.xml (original)
+++ geronimo/trunk/modules/jetty-builder/project.xml Thu Dec 2 15:37:56 2004
@@ -73,6 +73,18 @@
<version>${pom.currentVersion}</version>
</dependency>
+ <!-- todo: remove this once the DConfigBean home is selected -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deploy-tool</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-test-ddbean</artifactId>
+ <version>&geronimo-version;</version>
+ </dependency>
+
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
@@ -142,6 +154,12 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd?view=diff&rev=109593&p1=geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd&r1=109592&p2=geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd&r2=109593
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd (original)
+++ geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd Thu Dec 2 15:37:56 2004
@@ -29,7 +29,7 @@
<xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming-builder/src/schema/geronimo-naming.xsd"/>
<xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="../../../security-builder/src/schema/geronimo-security.xsd"/>
- <xs:include schemaLocation="../../../deployment/src/schema/geronimo-common.xsd"/>
+ <xs:include schemaLocation="../../../service-builder/src/schema/geronimo-common.xsd"/>
<xs:element name="web-app" type="jetty:web-appType"/>
Modified: geronimo/trunk/modules/naming-builder/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/project.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/naming-builder/project.xml&r1=109592&p2=geronimo/trunk/modules/naming-builder/project.xml&r2=109593
==============================================================================
--- geronimo/trunk/modules/naming-builder/project.xml (original)
+++ geronimo/trunk/modules/naming-builder/project.xml Thu Dec 2 15:37:56 2004
@@ -107,6 +107,13 @@
<version>&geronimo-spec-jta-version;</version>
</dependency>
+ <!-- todo: should be removed once DConfigBean locations are resolved -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deploy-tool</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
Modified: geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/transport/async/bio/BlockingServer.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/transport/async/bio/BlockingServer.java?view=diff&rev=109593&p1=geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/transport/async/bio/BlockingServer.java&r1=109592&p2=geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/transport/async/bio/BlockingServer.java&r2=109593
==============================================================================
--- geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/transport/async/bio/BlockingServer.java (original)
+++ geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/transport/async/bio/BlockingServer.java Thu Dec 2 15:37:56 2004
@@ -35,9 +35,9 @@
import org.apache.geronimo.remoting.transport.async.ChannelPool;
/**
* Provides a Blocking implemenation of the AsynchChannelServer interface.
- *
+ *
* Sets up a blocking ServerSocket to accept blocking client connections.
- *
+ *
* @version $Rev$ $Date$
*/
public final class BlockingServer extends AbstractServer implements Runnable {
@@ -141,7 +141,7 @@
while (running) {
SocketChannel socket = null;
try {
- socket = serverSocketChannel.accept();
+ socket = serverSocketChannel.socket().accept().getChannel();
if (log.isTraceEnabled())
log.trace("Accepted connection: " + socket);
} catch (java.io.InterruptedIOException e) {
@@ -149,14 +149,14 @@
continue;
}
try {
-
+
socket.socket().setTcpNoDelay(enableTcpNoDelay);
BlockingChannel channel = new BlockingChannel();
channel.init(connectURI, socket);
ChannelPool pool = getChannelPool(channel.getRemoteURI());
pool.setBackConnectURI( channel.getRequestedURI() );
pool.associate(channel);
-
+
} catch (TransportException ie) {
log.debug("Client connection could not be accepted: ", ie);
} catch (IOException ie) {
@@ -208,4 +208,4 @@
public Router getNextRouter() {
return nextRouter;
}
-}
\ No newline at end of file
+}
Added: geronimo/trunk/modules/service-builder/LICENSE.txt
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/LICENSE.txt?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/service-builder/LICENSE.txt Thu Dec 2 15:37:56 2004
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
+
Added: geronimo/trunk/modules/service-builder/NOTICE.txt
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/NOTICE.txt?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/service-builder/NOTICE.txt Thu Dec 2 15:37:56 2004
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: geronimo/trunk/modules/service-builder/locator.ent
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/locator.ent?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/service-builder/locator.ent Thu Dec 2 15:37:56 2004
@@ -0,0 +1,3 @@
+<!ENTITY % versions SYSTEM "file:../../etc/version-info.ent">
+
+
Added: geronimo/trunk/modules/service-builder/maven.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/maven.xml?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/service-builder/maven.xml Thu Dec 2 15:37:56 2004
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright 2004 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: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ -->
+
+<project default="default"
+ xmlns:xmlbeans="geronimo:xmlbeans">
+
+ <preGoal name="java:compile">
+ <xmlbeans:schema2java
+ sourcedir="${basedir}/src"
+ sourceschema="schema/geronimo-config.xsd,schema/geronimo-service.xsd"
+ xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
+ targetdir="${basedir}/target/xmlbeans"
+ cataloglocation="${basedir}/../../specs/schema/src/catalog/resolver-catalog.xml"/>
+ </preGoal>
+
+</project>
Added: geronimo/trunk/modules/service-builder/project.properties
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/project.properties?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/service-builder/project.properties Thu Dec 2 15:37:56 2004
@@ -0,0 +1,8 @@
+##
+## $Rev: 56981 $ $Date: 2004-11-08 20:01:27 -0500 (Mon, 08 Nov 2004) $
+##
+
+# Include the generated xmlbean classes in the eclipse classpath
+maven.eclipse.classpath.include=target/xmlbeans
+
+maven.idea.generated.source=xmlbeans
Added: geronimo/trunk/modules/service-builder/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/project.xml?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/service-builder/project.xml Thu Dec 2 15:37:56 2004
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright 2004 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.
+-->
+
+<!DOCTYPE project [
+<!ENTITY % locator SYSTEM "file:locator.ent">
+%locator;
+%versions;
+]>
+
+<!-- $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ -->
+
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../../etc/project.xml</extend>
+
+ <!-- ===================== -->
+ <!-- Module Identification -->
+ <!-- ===================== -->
+
+ <name>Geronimo :: Service :: Builder</name>
+ <id>geronimo-service-builder</id>
+ <shortDescription>Geronimo Service Builder</shortDescription>
+ <description>Geronimo Service Builder</description>
+ <url>httphttp://geronimo.apache.org/modules/deployment/</url>
+ <siteDirectory>/www/geronimo.apache.org/modules/deployment</siteDirectory>
+ <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/deployment</distributionDirectory>
+
+ <package>org.apache.geronimo.deployment</package>
+
+ <!-- ============ -->
+ <!-- Dependencies -->
+ <!-- ============ -->
+
+ <dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-xmlbeans-plugin</artifactId>
+ <version>${pom.currentVersion}</version>
+ <type>plugin</type>
+ </dependency>
+
+ <!-- needed for xmlbeans runtime-->
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean-apache</artifactId>
+ <version>&xmlbeans-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+ <version>&geronimo-spec-j2ee-deployment-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-schema</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
+ <version>&cglib-version;</version>
+ <url>http://cglib.sf.net/</url>
+ </dependency>
+-->
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>&mx4j-version;</version>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ <version>&mx4j-version;</version>
+ </dependency>
+-->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>&commons-logging-version;</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>&commons-cli-version;</version>
+ <url>http://jakarta.apache.org/commons/cli/</url>
+ </dependency>
+-->
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>&xml-resolver-version;</version>
+ <url>http://xml.apache.org/commons</url>
+ </dependency>
+ </dependencies>
+
+
+ <!-- =================== -->
+ <!-- Build Specification -->
+ <!-- =================== -->
+
+ <build>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/schema</directory>
+ <includes>
+ <include>*.xsd</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/test-resources</directory>
+ </resource>
+ </resources>
+ </unitTest>
+ </build>
+</project>
Copied: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanAdapter.java (from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanAdapter.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanAdapter.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanAdapter.java&r1=109589&p2=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanAdapter.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java (from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java&r1=109589&p2=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanDefault.java (from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanDefault.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanDefault.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanDefault.java&r1=109589&p2=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanDefault.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java (from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java&r1=109589&p2=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanHelper.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java&r1=109589&p2=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceGBeanAdapter.java (from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceGBeanAdapter.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceGBeanAdapter.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceGBeanAdapter.java&r1=109589&p2=geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceGBeanAdapter.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/schema/geronimo-common.xsd (from r109589, geronimo/trunk/modules/deployment/src/schema/geronimo-common.xsd)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/schema/geronimo-common.xsd?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/schema/geronimo-common.xsd&r1=109589&p2=geronimo/trunk/modules/service-builder/src/schema/geronimo-common.xsd&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd (from r109589, geronimo/trunk/modules/deployment/src/schema/geronimo-config.xsd)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/schema/geronimo-config.xsd&r1=109589&p2=geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd (from r109589, geronimo/trunk/modules/deployment/src/schema/geronimo-service.xsd)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/schema/geronimo-service.xsd&r1=109589&p2=geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/schema/xmlconfig.xml (from r109589, geronimo/trunk/modules/deployment/src/schema/xmlconfig.xml)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/schema/xmlconfig.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/schema/xmlconfig.xml&r1=109589&p2=geronimo/trunk/modules/service-builder/src/schema/xmlconfig.xml&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/test-resources/services/plan1.xml (from r109589, geronimo/trunk/modules/deployment/src/test-resources/services/plan1.xml)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/test-resources/services/plan1.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test-resources/services/plan1.xml&r1=109589&p2=geronimo/trunk/modules/service-builder/src/test-resources/services/plan1.xml&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/test-resources/services/service1.xml (from r109589, geronimo/trunk/modules/deployment/src/test-resources/services/service1.xml)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/test-resources/services/service1.xml?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test-resources/services/service1.xml&r1=109589&p2=geronimo/trunk/modules/service-builder/src/test-resources/services/service1.xml&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/test-resources/services/service2.jar (from r109589, geronimo/trunk/modules/deployment/src/test-resources/services/service2.jar)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/test-resources/services/service2.jar?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test-resources/services/service2.jar&r1=109589&p2=geronimo/trunk/modules/service-builder/src/test-resources/services/service2.jar&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/MockEndpoint.java (from r109507, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/MockEndpoint.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/MockEndpoint.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/MockEndpoint.java&r1=109507&p2=geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/MockEndpoint.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/MockGBean.java (from r109507, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/MockGBean.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/MockGBean.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/MockGBean.java&r1=109507&p2=geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/MockGBean.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java (from r109589, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java&r1=109589&p2=geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java&r2=109593
==============================================================================
Added: geronimo/trunk/modules/test-ddbean/LICENSE.txt
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/LICENSE.txt?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/test-ddbean/LICENSE.txt Thu Dec 2 15:37:56 2004
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
+
Added: geronimo/trunk/modules/test-ddbean/NOTICE.txt
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/NOTICE.txt?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/test-ddbean/NOTICE.txt Thu Dec 2 15:37:56 2004
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: geronimo/trunk/modules/test-ddbean/locator.ent
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/locator.ent?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/test-ddbean/locator.ent Thu Dec 2 15:37:56 2004
@@ -0,0 +1,3 @@
+<!ENTITY % versions SYSTEM "file:../../etc/version-info.ent">
+
+
Added: geronimo/trunk/modules/test-ddbean/maven.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/maven.xml?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/test-ddbean/maven.xml Thu Dec 2 15:37:56 2004
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright 2004 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: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ -->
+
+<project default="default" >
+</project>
Added: geronimo/trunk/modules/test-ddbean/project.properties
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/project.properties?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/test-ddbean/project.properties Thu Dec 2 15:37:56 2004
@@ -0,0 +1,4 @@
+##
+## $Rev: 56981 $ $Date: 2004-11-08 20:01:27 -0500 (Mon, 08 Nov 2004) $
+##
+
Added: geronimo/trunk/modules/test-ddbean/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/project.xml?view=auto&rev=109593
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/test-ddbean/project.xml Thu Dec 2 15:37:56 2004
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright 2004 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.
+-->
+
+<!DOCTYPE project [
+<!ENTITY % locator SYSTEM "file:locator.ent">
+%locator;
+%versions;
+]>
+
+<!-- $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ -->
+
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../../etc/project.xml</extend>
+
+ <!-- ===================== -->
+ <!-- Module Identification -->
+ <!-- ===================== -->
+
+ <name>Geronimo :: Test :: DDBeans</name>
+ <id>geronimo-test-ddbean</id>
+ <shortDescription>Geronimo Test DDBeans</shortDescription>
+ <description>Geronimo Test DDBeans</description>
+ <url>httphttp://geronimo.apache.org/modules/deployment/</url>
+ <siteDirectory>/www/geronimo.apache.org/modules/deployment</siteDirectory>
+ <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/deployment</distributionDirectory>
+
+ <package>org.apache.geronimo.deployment</package>
+
+ <!-- ============ -->
+ <!-- Dependencies -->
+ <!-- ============ -->
+
+ <dependencies>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean-apache</artifactId>
+ <version>&xmlbeans-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+ <version>&geronimo-spec-j2ee-deployment-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-schema</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <xmlbeans>true</xmlbeans>
+ </properties>
+ </dependency>
+ </dependencies>
+
+
+ <!-- =================== -->
+ <!-- Build Specification -->
+ <!-- =================== -->
+
+ <build>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test-resources</directory>
+ </resource>
+ </resources>
+ </unitTest>
+ </build>
+</project>
Copied: geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/DDBeanImpl.java (from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/tools/DDBeanImpl.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/DDBeanImpl.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/tools/DDBeanImpl.java&r1=109589&p2=geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/DDBeanImpl.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/DDBeanRootImpl.java (from r109589, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/tools/DDBeanRootImpl.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/DDBeanRootImpl.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/tools/DDBeanRootImpl.java&r1=109589&p2=geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/DDBeanRootImpl.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/ClientDeployableTest.java (from r109589, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/tools/ClientDeployableTest.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/ClientDeployableTest.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/tools/ClientDeployableTest.java&r1=109589&p2=geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/ClientDeployableTest.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/DDBeanRootTest.java (from r109589, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/tools/DDBeanRootTest.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/DDBeanRootTest.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/tools/DDBeanRootTest.java&r1=109589&p2=geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/DDBeanRootTest.java&r2=109593
==============================================================================
Copied: geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/WebDeployableTest.java (from r109589, geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/tools/WebDeployableTest.java)
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/WebDeployableTest.java?view=diff&rev=109593&p1=geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/tools/WebDeployableTest.java&r1=109589&p2=geronimo/trunk/modules/test-ddbean/src/test/org/apache/geronimo/deployment/tools/WebDeployableTest.java&r2=109593
==============================================================================
Modified: geronimo/trunk/plugins/maven-geronimo-plugin/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-geronimo-plugin/project.xml?view=diff&rev=109593&p1=geronimo/trunk/plugins/maven-geronimo-plugin/project.xml&r1=109592&p2=geronimo/trunk/plugins/maven-geronimo-plugin/project.xml&r2=109593
==============================================================================
--- geronimo/trunk/plugins/maven-geronimo-plugin/project.xml (original)
+++ geronimo/trunk/plugins/maven-geronimo-plugin/project.xml Thu Dec 2 15:37:56 2004
@@ -55,6 +55,12 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-deploy-tool</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
<version>${pom.currentVersion}</version>
</dependency>