geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r447401 [1/3] - in /geronimo/server/branches/sachin: ./ applications/console/geronimo-console-framework/src/main/webapp/js/ applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/server/ applicat...
Date Mon, 18 Sep 2006 13:41:09 GMT
Author: sppatel
Date: Mon Sep 18 06:41:03 2006
New Revision: 447401

URL: http://svn.apache.org/viewvc?view=rev&rev=447401
Log:
merge from head

Added:
    geronimo/server/branches/sachin/configs/jetty-clustering-builder-wadi/
      - copied from r447390, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/
    geronimo/server/branches/sachin/configs/jetty-clustering-builder-wadi/LICENSE.txt
      - copied unchanged from r447390, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/LICENSE.txt
    geronimo/server/branches/sachin/configs/jetty-clustering-builder-wadi/NOTICE.txt
      - copied unchanged from r447390, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/NOTICE.txt
    geronimo/server/branches/sachin/configs/jetty-clustering-builder-wadi/pom.xml
      - copied unchanged from r447390, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml
    geronimo/server/branches/sachin/configs/jetty-clustering-builder-wadi/src/
      - copied from r447390, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/src/
    geronimo/server/branches/sachin/configs/jetty-clustering-builder-wadi/src/plan/
      - copied from r447390, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/src/plan/
    geronimo/server/branches/sachin/configs/jetty-clustering-builder-wadi/src/plan/plan.xml
      - copied unchanged from r447390, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/src/plan/plan.xml
    geronimo/server/branches/sachin/configs/jetty-clustering-wadi/
      - copied from r447390, geronimo/server/trunk/configs/jetty-clustering-wadi/
    geronimo/server/branches/sachin/configs/jetty-clustering-wadi/LICENSE.txt
      - copied unchanged from r447390, geronimo/server/trunk/configs/jetty-clustering-wadi/LICENSE.txt
    geronimo/server/branches/sachin/configs/jetty-clustering-wadi/NOTICE.txt
      - copied unchanged from r447390, geronimo/server/trunk/configs/jetty-clustering-wadi/NOTICE.txt
    geronimo/server/branches/sachin/configs/jetty-clustering-wadi/pom.xml
      - copied unchanged from r447390, geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml
    geronimo/server/branches/sachin/configs/jetty-clustering-wadi/src/
      - copied from r447390, geronimo/server/trunk/configs/jetty-clustering-wadi/src/
    geronimo/server/branches/sachin/configs/jetty-clustering-wadi/src/plan/
      - copied from r447390, geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/
    geronimo/server/branches/sachin/configs/jetty-clustering-wadi/src/plan/plan.xml
      - copied unchanged from r447390, geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml
    geronimo/server/branches/sachin/modules/geronimo-clustering/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/pom.xml
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/java/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/java/org/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/jetty/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/jetty/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/jetty/WADIJettyClusteringBuilder.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/jetty/WADIJettyClusteringBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/schema/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/schema/
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/schema/geronimo-clustering-wadi-1.2.xsd
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/schema/geronimo-clustering-wadi-1.2.xsd
    geronimo/server/branches/sachin/modules/geronimo-clustering-builder-wadi/src/main/schema/xmlconfig.xml
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/schema/xmlconfig.xml
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/pom.xml
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/ActiveClusterDispatcherHolder.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/ActiveClusterDispatcherHolder.java
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicReplicaStorageFactoryGBean.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicReplicaStorageFactoryGBean.java
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicReplicationManagerFactoryGBean.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicReplicationManagerFactoryGBean.java
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/DispatcherHolder.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/DispatcherHolder.java
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADIClusteredHandleInterceptor.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADIClusteredHandleInterceptor.java
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionAdaptor.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionAdaptor.java
    geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManager.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManager.java
    geronimo/server/branches/sachin/modules/geronimo-clustering/pom.xml
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/apache/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/apache/geronimo/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/BasicNode.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/BasicNode.java
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/ClusteredInvocation.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/ClusteredInvocation.java
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/ClusteredInvocationException.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/ClusteredInvocationException.java
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/Node.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/Node.java
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/Session.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/Session.java
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/SessionAlreadyExistException.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/SessionAlreadyExistException.java
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/SessionListener.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/SessionListener.java
    geronimo/server/branches/sachin/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/SessionManager.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/SessionManager.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/DefaultWebApplicationHandlerFactory.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/DefaultWebApplicationHandlerFactory.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/GeronimoServletHttpRequest.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/GeronimoServletHttpRequest.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/HandleInterceptor.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/HandleInterceptor.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/WebApplicationHandlerFactory.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/WebApplicationHandlerFactory.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/
      - copied from r447390, geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/AbstractClusteredHandleInterceptor.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/AbstractClusteredHandleInterceptor.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/ClusteredSessionManager.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/ClusteredSessionManager.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/ClusteredWebApplicationHandler.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/ClusteredWebApplicationHandler.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/ClusteredWebApplicationHandlerFactory.java
      - copied unchanged from r447390, geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/ClusteredWebApplicationHandlerFactory.java
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml
      - copied unchanged from r447390, geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml
      - copied unchanged from r447390, geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml
Modified:
    geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/js/forms.js
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSConnectorPortlet.java
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-modules.properties
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/editGeneric.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
    geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
    geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml
    geronimo/server/branches/sachin/configs/jetty/pom.xml
    geronimo/server/branches/sachin/configs/pom.xml
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ModuleConfig.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ListModulesMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ModuleMojoSupport.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartModuleMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartStopUndeployMojoSupport.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StopModuleMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/UndeployModuleMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
    geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/schema/geronimo-application-1.2.xsd
    geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/main/schema/geronimo-jetty-1.2.xsd
    geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebAppContext.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/RequestWrappingBeforeAfter.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java
    geronimo/server/branches/sachin/modules/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java
    geronimo/server/branches/sachin/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-tomcat/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/cluster/WADIGBean.java
    geronimo/server/branches/sachin/modules/pom.xml
    geronimo/server/branches/sachin/pom.xml
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/pom.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/js/forms.js
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/js/forms.js?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/js/forms.js (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-framework/src/main/webapp/js/forms.js Mon Sep 18 06:41:03 2006
@@ -2,7 +2,7 @@
     var obj;
     for(i in elementNameArray){
         var elem = elementNameArray[i];
-        obj = eval("document." + formName + "." + elem); 
+        obj = eval("document.forms['" + formName + "'].elements['"+ elem +"']");
         if(isEmptyString(obj.value)){
             alert(elem + " must not be empty.");
             obj.focus(); 
@@ -15,7 +15,7 @@
     return value.length < 1;
 }
 function checkIntegral(formName, elementName){
-    var obj = eval("document." + formName + "." + elementName); 
+    var obj = eval("document.forms['" + formName + "'].elements['"+ elementName +"']");
     if(isIntegral(obj.value)) return true;
     else{
         alert(elementName + " must be an integer.");
@@ -25,6 +25,7 @@
 }
 
 function isIntegral(value){
+    if(value.length < 1) return false;
     var ints = "1234567890";
     for(i = 0; i < value.length; i++){
         if(ints.indexOf(value.charAt(i)) < 0) return false;

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSConnectorPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSConnectorPortlet.java?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSConnectorPortlet.java (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSConnectorPortlet.java Mon Sep 18 06:41:03 2006
@@ -116,6 +116,7 @@
                 actionResponse.setRenderParameter("mode", "list");
             } else if(mode.equals("edit")) {
                 actionResponse.setRenderParameter("connectorURI", connectorURI);
+                actionResponse.setRenderParameter("brokerURI", brokerURI);
                 actionResponse.setRenderParameter("mode", "edit");
             } else if(mode.equals("delete")) {
                 AbstractName connectorAbstractName = new AbstractName(URI.create(connectorURI));
@@ -148,15 +149,20 @@
                 String protocol = renderRequest.getParameter("protocol");
                 renderRequest.setAttribute("protocol", protocol);
                 renderRequest.setAttribute("brokerURI", brokerURI);
+                renderRequest.setAttribute("brokerName", new AbstractName(URI.create(brokerURI)).getName().get("name").toString());
                 renderRequest.setAttribute("mode", "add");
                 editView.include(renderRequest, renderResponse);
             } else if(mode.equals("edit")) {
+                String brokerURI = renderRequest.getParameter("brokerURI");
                 String connectorURI = renderRequest.getParameter("connectorURI");
                 JMSConnector connector = (JMSConnector)PortletManager.getManagedBean(renderRequest, new AbstractName(URI.create(connectorURI)));
                 if(connector == null) {
                     doList(renderRequest, manager, renderResponse);
                 } else {
                     renderRequest.setAttribute("connectorURI", connectorURI);
+                    renderRequest.setAttribute("brokerName", new AbstractName(URI.create(brokerURI)).getName().get("name").toString());
+                    renderRequest.setAttribute("connectorName", new AbstractName(URI.create(connectorURI)).getName().get("name").toString());
+                    renderRequest.setAttribute("protocol", connector.getProtocol());
                     renderRequest.setAttribute("port", new Integer(connector.getPort()));
                     renderRequest.setAttribute("host", connector.getHost());
                     renderRequest.setAttribute("mode", "save");

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java Mon Sep 18 06:41:03 2006
@@ -155,6 +155,10 @@
                         if(test != null) {
                             option.setDisplayOrder(Integer.parseInt(test.trim()));
                         }
+                        test = props.getProperty(prefix+fieldName+".blankAllowed");
+                        if(test != null) {
+                            option.setBlankAllowed("true".equalsIgnoreCase(test.trim()));
+                        }
                         fields.add(option);
                     }
                 }
@@ -191,6 +195,7 @@
         private boolean password = false;
         private int length = 30;
         private int displayOrder = 1;
+        private boolean blankAllowed = false;
 
         public OptionInfo(String name, String displayName, String description) {
             this.name = name;
@@ -236,6 +241,14 @@
 
         public int compareTo(Object o) {
             return displayOrder - ((OptionInfo)o).displayOrder;
+        }
+        
+        public boolean isBlankAllowed() {
+            return this.blankAllowed;
+        }
+        
+        public void setBlankAllowed(boolean blankAllowed) {
+            this.blankAllowed = blankAllowed;
         }
     }
 }

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-modules.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-modules.properties?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-modules.properties (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/classes/login-modules.properties Mon Sep 18 06:41:03 2006
@@ -36,10 +36,12 @@
 module.ldap.field.connectionProtocol.displayName=Connect Protocol
 module.ldap.field.connectionProtocol.description=The connection protocol used to communicate with the LDAP server.  Normally left blank, though it can be set to <tt>ssl</tt> if the server supports it.
 module.ldap.field.connectionProtocol.length=10
+module.ldap.field.connectionProtocol.blankAllowed=true
 module.ldap.field.authentication.displayOrder=6
 module.ldap.field.authentication.displayName=Authentication
 module.ldap.field.authentication.description=The security level to use, which can be <tt>none</tt>, <tt>simple</tt>, or <tt>strong</tt> (the usual value is <tt>simple</tt>.  If this property is unspecified, the behavior is determined by the service provider.
 module.ldap.field.authentication.length=10
+module.ldap.field.authentication.blankAllowed=true
 module.ldap.field.userBase.displayOrder=7
 module.ldap.field.userBase.displayName=User Base
 module.ldap.field.userBase.description=The base LDAP context (location) to search for users.  The search may look in this location only, or there and all subcontexts, depending on the settings for "User Search Subtree" below.
@@ -72,6 +74,7 @@
 module.ldap.field.userRoleName.displayName=User Role Search String
 module.ldap.field.userRoleName.description=If the role entry does not have an attribute for users, but instead the user entry has an attribute for roles, this should be used instead of the "Role User Search String".  It names the attribute on a user that lists a role that user is in.  A typical value would be <tt>(memberOf={0})</tt>.
 module.ldap.field.userRoleName.length=20
+module.ldap.field.userRoleName.blankAllowed=true
 # Certificate Properties File
 module.certprops.name=Certificate Properties File Realm
 module.certprops.class=org.apache.geronimo.security.realm.providers.CertificatePropertiesFileLoginModule

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp Mon Sep 18 06:41:03 2006
@@ -4,13 +4,25 @@
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
 <portlet:defineObjects/>
 
-<form action="<portlet:actionURL portletMode='view'/>" method="post">
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>DBForm";
+var <portlet:namespace/>requiredFields = new Array("createDB");
+var <portlet:namespace/>requiredFields2 = new Array("sqlStmts");
+function <portlet:namespace/>validateForm(){
+    return textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields);
+}
+function <portlet:namespace/>validateForm2(){
+    return textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields2);
+}
+</script>
+
+<form name="<portlet:namespace/>DBForm" action="<portlet:actionURL portletMode='view'/>" method="post">
 
 <table width="100%"  border="0">
   <tr>
     <td><div align="right">Create DB:</div></td>
     <td><input name="createDB" type="text" size="30">&nbsp;
-      <input type="submit" name="action" value="Create"></td>
+      <input type="submit" name="action" value="Create" onClick="return <portlet:namespace/>validateForm();"></td>
     </tr>
   <tr>
     <td><div align="right">Delete DB:</div></td>
@@ -31,7 +43,7 @@
         <option value="${db}">${db}</option>
       </c:forEach>
       </select>&nbsp;
-      <input type="submit" name="action" value="Run SQL"></td>
+      <input type="submit" name="action" value="Run SQL" onClick="return <portlet:namespace/>validateForm2();"></td>
   </tr>
   <tr>
     <td></td>

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/editGeneric.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/editGeneric.jsp?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/editGeneric.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/editGeneric.jsp Mon Sep 18 06:41:03 2006
@@ -2,7 +2,22 @@
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
 <portlet:defineObjects/>
 
-<form name="<portlet:namespace/>" action="<portlet:actionURL/>">
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>JmsConnectorForm";
+var <portlet:namespace/>requiredFields = new Array("host");
+var <portlet:namespace/>numericFields = new Array("port");
+function <portlet:namespace/>validateForm(){
+    if(!textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields))
+        return false;
+    for(i in <portlet:namespace/>numericFields) {
+        if(!checkIntegral(<portlet:namespace/>formName, <portlet:namespace/>numericFields[i]))
+            return false;
+    }
+    return true;
+}
+</script>
+
+<form name="<portlet:namespace/>JmsConnectorForm" action="<portlet:actionURL/>">
 <input type="hidden" name="mode" value="${mode}">
 <input type="hidden" name="protocol" value="${protocol}">
 <c:choose>
@@ -15,6 +30,16 @@
 </c:choose>
 <table width="100%%"  border="0">
 
+<!-- Current Task -->
+<c:choose>
+  <c:when test="${mode eq 'add'}">
+    <tr><th colspan="2" align="left">Add new ${protocol} connector for ${brokerName}</th></tr>
+  </c:when>
+  <c:otherwise>
+    <tr><th colspan="2" align="left">Edit ${protocol} connector ${connectorName} for ${brokerName}.</th></tr>
+  </c:otherwise>
+</c:choose>
+
 <!-- Name Field -->
 <c:if test="${mode eq 'add'}">
   <tr>
@@ -25,6 +50,9 @@
     <td><div align="right"></div></td>
     <td>A name that is different than the name for any other JMS connectors in the server</td>
   </tr>
+  <script language="JavaScript">
+    <portlet:namespace/>requiredFields = new Array("name").concat(<portlet:namespace/>requiredFields);
+  </script>
 </c:if>
 <!-- Host Field -->
   <tr>
@@ -48,10 +76,13 @@
     <td><div align="right"></div></td>
     <td>The network port to bind to.</td>
   </tr>
-<!-- Submit Button -->
+<!-- Form buttons -->
   <tr>
     <td><div align="right"></div></td>
-    <td><input name="submit" type="submit" value="Save"></td>
+    <td>
+      <input name="submit" type="submit" value="Save" onClick="return <portlet:namespace/>validateForm();">
+      <input name="reset" type="reset" value="Reset">
+    </td>
   </tr>
 </table>
 </form>

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp Mon Sep 18 06:41:03 2006
@@ -3,6 +3,21 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>KeystoreForm";
+var <portlet:namespace/>requiredFields = new Array("alias", "password", "certCN", "certO", "certOU", "certL", "certST", "certC");
+var <portlet:namespace/>numericFields = new Array("valid");
+function <portlet:namespace/>validateForm(){
+    if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields))
+        return false;
+    for(i in <portlet:namespace/>numericFields) {
+        if(!checkIntegral(<portlet:namespace/>formName, <portlet:namespace/>numericFields[i]))
+            return false;
+    }
+    return true;
+}
+</script>
+
 <p>On this screen you can configure the settings to generate a new private key.
 The next screen will let you review this information before generating the
 private key and accompanying certificate.</p>
@@ -89,7 +104,7 @@
             </td>
         </tr>
     </table>
-    <input type="submit" value="Review Key Data" />
+    <input type="submit" value="Review Key Data" onClick="return <portlet:namespace/>validateForm();"/>
 </form>
 
 

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp Mon Sep 18 06:41:03 2006
@@ -5,7 +5,7 @@
 
 <script language="JavaScript">
 var <portlet:namespace/>formName = "<portlet:namespace/>KeystoreForm";
-var <portlet:namespace/>requiredFields = new Array("alias");
+var <portlet:namespace/>requiredFields = new Array("certificate", "alias");
 function <portlet:namespace/>validateForm(){
     return textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields);
 }

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp Mon Sep 18 06:41:03 2006
@@ -1,6 +1,17 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 
+      <script language="JavaScript">
+        var <portlet:namespace/>requiredFieldsCommon = new Array('option-userSelect', 'option-groupSelect');
+        var <portlet:namespace/>requiredFieldsJDBC = new Array('option-jdbcDriver', 'jar', 'option-jdbcURL', 'option-jdbcUser', 'option-jdbcPassword');
+        function <portlet:namespace/>changeRequiredFields(par) {
+          if(par.value != '') // Database pool is selected
+            <portlet:namespace/>requiredFields = <portlet:namespace/>requiredFieldsCommon;
+          else
+            <portlet:namespace/>requiredFields = <portlet:namespace/>requiredFieldsCommon.concat(<portlet:namespace/>requiredFieldsJDBC);
+        }
+      </script>
       <tr>
         <th style="min-width: 140px"><div align="right">User SELECT SQL:</div></th>
         <td><input name="option-userSelect" type="text"
@@ -40,12 +51,15 @@
       <tr>
         <th><div align="right">Database Pool</div></th>
         <td>
-          <select name="option-databasePoolAbstractName">
+          <select name="option-databasePoolAbstractName" onChange="<portlet:namespace/>changeRequiredFields(this)">
             <option />
         <c:forEach var="pool" items="${pools}">
             <option value="${pool.abstractName}"<c:if test="${realm.options['dataSourceName'] eq pool.name && realm.options['dataSourceApplication'] eq pool.applicationName}"> selected</c:if>>${pool.displayName}</option>
         </c:forEach>
           </select>
+          <script language="JavaScript">
+            <portlet:namespace/>changeRequiredFields(document.forms[<portlet:namespace/>formName].elements['option-databasePoolAbstractName']);
+          </script>
         </td>
       </tr>
       <tr>

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp Mon Sep 18 06:41:03 2006
@@ -2,12 +2,32 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>RealmForm";
+function <portlet:namespace/>validateForm(){
+    var valid = true;
+    var realmForm = document.forms[<portlet:namespace/>formName];
+    if(realmForm.elements['enableAuditing'].checked)
+        valid = textElementsNotEmpty(<portlet:namespace/>formName, new Array('auditPath'));
+    if(!valid) return false;
+    
+    if(realmForm.elements['enableLockout'].checked) {
+        var fields = new Array('lockoutCount', 'lockoutWindow', 'lockoutDuration');
+        for(i in fields) {
+            valid = checkIntegral(<portlet:namespace/>formName, fields[i]);
+            if(!valid) return false;
+        }
+    }
+    return true;
+}
+</script>
+
 <p><b>Create Security Realm</b> -- Step 3: Advanced Configuration</p>
 
 <c:if test="${!(empty AdvancedError)}"><p><font color="red"><b>Error: ${AdvancedError}</b></font></p></c:if>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
-<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>" onSubmit="return <portlet:namespace/>validateForm()">
     <input type="hidden" name="mode" value="process-advanced" />
     <input type="hidden" name="test" value="true" />
     <input type="hidden" name="name" value="${realm.name}" />
@@ -69,7 +89,7 @@
       <tr>
         <th valign="top"><div align="right">Enable Lockout:</div></th>
         <td valign="top">
-          <input type="checkbox" id="<portlet:namespace/>lockoutCheckbox" name="enableAuditing"<c:if test="${realm.lockoutEnabled}"> checked="checked"</c:if>
+          <input type="checkbox" id="<portlet:namespace/>lockoutCheckbox" name="enableLockout"<c:if test="${realm.lockoutEnabled}"> checked="checked"</c:if>
                  onclick="document.getElementById('<portlet:namespace/>lockoutDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('<portlet:namespace/>lockoutCount').value='';document.getElementById('<portlet:namespace/>lockoutWindow').value='';document.getElementById('<portlet:namespace/>lockoutDuration').value='';"/>
           <div id="<portlet:namespace/>lockoutDiv" style="display: <c:choose><c:when test="${realm.lockoutEnabled}">block</c:when><c:otherwise>none</c:otherwise></c:choose>;">
           Lock a user after <input type="text" id="<portlet:namespace/>lockoutCount" name="lockoutCount" size="2" maxlength="3" value="${realm.lockoutCount}" />

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp Mon Sep 18 06:41:03 2006
@@ -3,6 +3,14 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>RealmForm";
+var <portlet:namespace/>requiredFields;
+function <portlet:namespace/>validateForm(){
+    return textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields);
+}
+</script>
+
 <p><b>Create Security Realm</b> -- Step 2: Configure Login Module</p>
 
 <c:if test="${!(empty LoginModuleError)}"><p><font color="red"><b>Error: ${LoginModuleError}</b></font></p></c:if>
@@ -57,6 +65,9 @@
 <jsp:include page="_sql.jsp" />
   </c:when>
   <c:otherwise>
+    <script language="JavaScript">
+      <portlet:namespace/>requiredFields = new Array();
+    </script>
     <c:forEach var="option" items="${realm.optionNames}">
       <tr>
         <th style="min-width: 140px"><div align="right">${optionMap[option].displayName}:</div></th>
@@ -68,13 +79,18 @@
         <td></td>
         <td>${optionMap[option].description}</td>
       </tr>
+      <c:if test="${!optionMap[option].blankAllowed}">
+        <script language="JavaScript">
+          <portlet:namespace/>requiredFields = <portlet:namespace/>requiredFields.concat(new Array('option-${option}'))
+        </script>
+      </c:if>
     </c:forEach>
   </c:otherwise>
 </c:choose>
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" /></td>
+        <td><input type="submit" value="Next" onClick="return <portlet:namespace/>validateForm()"/></td>
       </tr>
     </table>
 </form>

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp Mon Sep 18 06:41:03 2006
@@ -2,6 +2,14 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>RealmForm";
+var <portlet:namespace/>requiredFields = new Array("name");
+function <portlet:namespace/>validateForm(){
+    return textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields);
+}
+</script>
+
 <p><b>Create Security Realm</b> -- Step 1: Select Name and Type</p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
@@ -77,7 +85,7 @@
       </tr>
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" /></td>
+        <td><input type="submit" value="Next" onclick="return <portlet:namespace/>validateForm()"/></td>
       </tr>
     </table>
 </form>

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp Mon Sep 18 06:41:03 2006
@@ -2,6 +2,14 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>RealmForm";
+var <portlet:namespace/>requiredFields = new Array('username');
+function <portlet:namespace/>validateForm(){
+    return textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields);
+}
+</script>
+
 <p><b>Create Security Realm</b> -- Step 4: Test Login</p>
 
 <p>From here you can enter a username and password for the main login module in the realm, and
@@ -75,7 +83,7 @@
       </tr>
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" /></td>
+        <td><input type="submit" value="Next" onClick="return <portlet:namespace/>validateForm()"/></td>
       </tr>
     </table>
 </form>

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp Mon Sep 18 06:41:03 2006
@@ -2,7 +2,24 @@
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
 <portlet:defineObjects/>
 
-<form name="<portlet:namespace/>" action="<portlet:actionURL/>">
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>HttpForm";
+var <portlet:namespace/>requiredFields = new Array("host");
+var <portlet:namespace/>numericFields = new Array("port", "maxThreads");
+function <portlet:namespace/>validateForm(){
+    if(!textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields)) {
+        return false;
+    }
+    for(i in <portlet:namespace/>numericFields) {
+        if(!checkIntegral(<portlet:namespace/>formName, <portlet:namespace/>numericFields[i])) {
+            return false;
+        }
+    }
+    return true;
+}
+</script>
+
+<form name="<portlet:namespace/>HttpForm" action="<portlet:actionURL/>">
 <input type="hidden" name="mode" value="${mode}">
 <input type="hidden" name="protocol" value="${protocol}">
 <input type="hidden" name="containerURI" value="${containerURI}">
@@ -32,6 +49,9 @@
     <td><div align="right"></div></td>
     <td>A name that is different than the name for any other web connectors in the server</td>
   </tr>
+  <script language="JavaScript">
+    <portlet:namespace/>requiredFields = new Array("displayName").concat(<portlet:namespace/>requiredFields);
+  </script>
 </c:if>
 <!-- Host Field -->
   <tr>
@@ -67,6 +87,9 @@
     <td><div align="right"></div></td>
     <td>The minimum number of threads this connector should use to handle incoming requests</td>
   </tr>
+  <script language="JavaScript">
+    <portlet:namespace/>numericFields = <portlet:namespace/>numericFields.concat(new Array("minThreads"));
+  </script>
 </c:if>
 <!-- Max Threads Field -->
   <tr>
@@ -83,7 +106,7 @@
   <tr>
     <td><div align="right"></div></td>
     <td>
-      <input name="submit" type="submit" value="Save">
+      <input name="submit" type="submit" value="Save" onClick="return <portlet:namespace/>validateForm();">
       <input name="reset" type="reset" value="Reset">
       <input name="submit" type="submit" value="Cancel">
     </td>    

Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp Mon Sep 18 06:41:03 2006
@@ -2,7 +2,24 @@
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
 <portlet:defineObjects/>
 
-<form name="<portlet:namespace/>" action="<portlet:actionURL/>">
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>HttpsForm";
+var <portlet:namespace/>requiredFields = new Array("host");
+var <portlet:namespace/>numericFields = new Array("port", "maxThreads");
+function <portlet:namespace/>validateForm(){
+    if(!textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields)) {
+        return false;
+    }    
+    for(i in <portlet:namespace/>numericFields) {
+        if(!checkIntegral(<portlet:namespace/>formName, <portlet:namespace/>numericFields[i])) {
+            return false;
+        }
+    }
+    return true;
+}
+</script>
+
+<form name="<portlet:namespace/>HttpsForm" action="<portlet:actionURL/>">
 <input type="hidden" name="mode" value="${mode}">
 <input type="hidden" name="protocol" value="${protocol}">
 <input type="hidden" name="containerURI" value="${containerURI}">
@@ -34,6 +51,9 @@
     <td><div align="right"></div></td>
     <td>A name that is different than the name for any other web connectors in the server (no spaces in the name please)</td>
   </tr>
+  <script language="JavaScript">
+    <portlet:namespace/>requiredFields = new Array("displayName").concat(<portlet:namespace/>requiredFields);
+  </script>
 </c:if>
 <!-- Host Field -->
   <tr>
@@ -69,6 +89,9 @@
     <td><div align="right"></div></td>
     <td>The minimum number of threads this connector should use to handle incoming requests</td>
   </tr>
+  <script language="JavaScript">
+    <portlet:namespace/>numericFields = <portlet:namespace/>numericFields.concat(new Array("minThreads"));
+  </script>
 </c:if>
 <!-- Max Threads Field -->
   <tr>
@@ -140,6 +163,9 @@
     <td><div align="right"></div></td>
     <td>The file that holds the keystore (relative to the Geronimo install dir)</td>
   </tr>
+  <script language="JavaScript">
+    <portlet:namespace/>requiredFields = <portlet:namespace/>requiredFields.concat(new Array("keystoreFile"));
+  </script>
 
 <!-- Keystore Password Field -->
   <tr>
@@ -156,6 +182,11 @@
       set to be the same on the keystore).</c:if><c:if test="${mode eq 'save'}">  Leave
       this empty if you don't want to change the current password.</c:if></td>
   </tr>
+  <c:if test="${mode eq 'add'}">
+    <script language="JavaScript">
+      <portlet:namespace/>requiredFields = <portlet:namespace/>requiredFields.concat(new Array("keystorePassword"));
+    </script>
+  </c:if>
 
     <!-- Keystore Type Field -->
       <tr>
@@ -278,7 +309,7 @@
   <tr>
     <td><div align="right"></div></td>
     <td>
-      <input name="submit" type="submit" value="Save">
+      <input name="submit" type="submit" value="Save" onClick="return <portlet:namespace/>validateForm();">
       <input name="reset" type="reset" value="Reset">
       <input name="submit" type="submit" value="Cancel">
     </td>    

Modified: geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/pom.xml?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/pom.xml Mon Sep 18 06:41:03 2006
@@ -219,6 +219,19 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-clustering-builder-wadi</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-clustering-wadi</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>welcome-jetty</artifactId>
             <version>${pom.version}</version>
             <type>car</type>

Modified: geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml Mon Sep 18 06:41:03 2006
@@ -51,6 +51,9 @@
         <reference name="NamingBuilders">
             <name>NamingBuilders</name>
         </reference>
+        <reference name="ClusteringBuilders">
+            <name>JettyClusteringBuilder</name>
+        </reference>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>

Modified: geronimo/server/branches/sachin/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/jetty/pom.xml?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/configs/jetty/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/jetty/pom.xml Mon Sep 18 06:41:03 2006
@@ -47,6 +47,13 @@
             <version>${pom.version}</version>
         </dependency>
 
+        <!-- This dependency should be retrieved by transitivity -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-clustering</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>

Modified: geronimo/server/branches/sachin/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/pom.xml?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/configs/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/pom.xml Mon Sep 18 06:41:03 2006
@@ -134,6 +134,8 @@
         <module>j2ee-system</module>
         <module>javamail</module>
         <module>jetty</module>
+        <module>jetty-clustering-builder-wadi</module>
+        <module>jetty-clustering-wadi</module>
         <module>jetty-deployer</module>
         <module>jsp-examples-jetty</module>
         <module>jsp-examples-tomcat</module>

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ModuleConfig.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ModuleConfig.java?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ModuleConfig.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ModuleConfig.java Mon Sep 18 06:41:03 2006
@@ -38,26 +38,13 @@
      */
     private File plan;
 
-    //
-    // FIXME: This is bad, as someone can configure an module's archive here which will cause unexpected
-    //        problems.
-
-    private File archive;
-
+    
     public void setPlan(final File plan) {
         this.plan = plan;
     }
 
     public File getPlan() {
         return plan;
-    }
-
-    public void setArchive(final File archive) {
-        this.archive = archive;
-    }
-
-    public File getArchive() {
-        return archive;
     }
 
 }

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java Mon Sep 18 06:41:03 2006
@@ -46,13 +46,6 @@
     extends ModuleMojoSupport
 {
     /**
-     * List of module artifact configurations.  Artifacts need to point to jar | war | ear | rar archive.
-     *
-     * @parameter
-     */
-    protected ModuleConfig[] modules = null;
-
-    /**
      * A file which points to a specific module's jar | war | ear | rar archive.
      * If this parameter is set, then it will be used instead of from the
      * modules configuration.
@@ -80,39 +73,24 @@
      */
     private boolean startModules = false;
 
-    public void doExecute() throws Exception {
+    protected void doExecute() throws Exception {
+        List completed = new ArrayList();
+
         if (moduleArchive != null) {
             log.info("Using non-artifact based module archive: " + moduleArchive);
 
-            // Add the single module to the list
-            ModuleConfig moduleConfig = new ModuleConfig();
-            moduleConfig.setArchive(moduleArchive);
-            moduleConfig.setPlan(modulePlan);
-
-            modules = new ModuleConfig[] {
-                moduleConfig
-            };
+            TargetModuleID[] ids = distribute(moduleArchive, modulePlan);
+            completed.add(ids);
         }
         else if (modules == null || modules.length == 0) {
             throw new MojoExecutionException("At least one module configuration (or moduleArchive) must be specified");
         }
+        else {
+            log.info("Using artifact based module archive(s)...");
 
-        List completed = new ArrayList();
-        DeploymentManager manager = getDeploymentManager();
-        Target[] targets = manager.getTargets();
-
-        for (int i=0; i<modules.length; i++) {
-            File file = getModuleArchive(modules[i]);
-            log.info("Distributing module artifact: " + file);
-
-            ProgressObject progress = manager.distribute(targets, file, modules[i].getPlan());
-            DeploymentStatus status = waitFor(progress);
-
-            if (status.isFailed()) {
-                throw new MojoExecutionException("Distribution failed: " + status.getMessage());
-            }
-            else {
-                completed.add(progress.getResultTargetModuleIDs());
+            for (int i=0; i<modules.length; i++) {
+                TargetModuleID[] ids = distribute(getModuleArchive(modules[i]), modules[i].getPlan());
+                completed.add(ids);
             }
         }
 
@@ -127,7 +105,7 @@
                     log.info("Starting module: " + moduleIds[i].getModuleID() + (url == null ? "" : ("; URL: " + url)));
                 }
 
-                ProgressObject progress = manager.start(moduleIds);
+                ProgressObject progress = getDeploymentManager().start(moduleIds);
                 DeploymentStatus status = waitFor(progress);
 
                 if (status.isFailed()) {
@@ -141,13 +119,6 @@
     }
 
     private File getModuleArchive(final ModuleConfig module) throws MojoExecutionException {
-        //
-        // HACK: For single non-artifact module archive
-        //
-        if (module.getArchive() != null) {
-            return module.getArchive();
-        }
-
         Artifact artifact = getArtifact(module);
 
         File file = artifact.getFile();
@@ -167,5 +138,22 @@
         }
 
         return file;
+    }
+
+    private TargetModuleID[] distribute(final File file, final File plan) throws Exception {
+        assert file != null;
+        
+        log.info("Distributing module artifact: " + file);
+
+        DeploymentManager manager = getDeploymentManager();
+        Target[] targets = manager.getTargets();
+        ProgressObject progress = manager.distribute(targets, file, plan);
+        DeploymentStatus status = waitFor(progress);
+
+        if (status.isFailed()) {
+            throw new MojoExecutionException("Distribution failed: " + status.getMessage());
+        }
+
+        return progress.getResultTargetModuleIDs();
     }
 }

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ListModulesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ListModulesMojo.java?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ListModulesMojo.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ListModulesMojo.java Mon Sep 18 06:41:03 2006
@@ -33,7 +33,7 @@
 public class ListModulesMojo
     extends ModuleMojoSupport
 {
-    public void doExecute() throws Exception {
+    protected void doExecute() throws Exception {
         DeploymentManager manager = getDeploymentManager();
         Target[] targets = manager.getTargets();
         

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ModuleMojoSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ModuleMojoSupport.java?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ModuleMojoSupport.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ModuleMojoSupport.java Mon Sep 18 06:41:03 2006
@@ -35,6 +35,7 @@
 
 import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
 import org.apache.geronimo.mavenplugins.geronimo.GeronimoMojoSupport;
+import org.apache.geronimo.mavenplugins.geronimo.ModuleConfig;
 
 import org.apache.geronimo.genesis.ArtifactItem;
 
@@ -50,8 +51,26 @@
 {
     private static final String URI_PREFIX = "deployer:geronimo:jmx";
 
+    /**
+     * List of module artifact configurations.  Artifacts need to point to jar | war | ear | rar archive.
+     *
+     * @parameter
+     */
+    protected ModuleConfig[] modules = null;
+
+    /**
+     * Cached deployment manager.
+     */
     private DeploymentManager deploymentManager;
 
+    /**
+     * Get a deployment manager; if the manager was previosuly initialized then that cached instance is used.
+     *
+     * @return  Deployment manager instance; never null
+     *
+     * @throws IOException
+     * @throws DeploymentManagerCreationException
+     */
     protected DeploymentManager getDeploymentManager() throws IOException, DeploymentManagerCreationException {
         if (deploymentManager == null) {
             // Register the Geronimo factory
@@ -67,6 +86,14 @@
         return deploymentManager;
     }
 
+    /**
+     * Waits for the given progress to stop running.
+     *
+     * @param progress  The progress object to wait for.
+     * @return          The status of the deployment; never null
+     *
+     * @throws InterruptedException
+     */
     protected DeploymentStatus waitFor(final ProgressObject progress) throws InterruptedException {
         assert progress != null;
 
@@ -110,6 +137,14 @@
         return item.getGroupId() + "/" + item.getArtifactId() + "/" + item.getVersion() + "/" + item.getType();
     }
 
+    /**
+     * Check of the given module is started.
+     *
+     * @param moduleId  The module ID to check
+     * @return          True if the module for this ID is started.
+     *
+     * @throws Exception
+     */
     protected boolean isModuleStarted(final String moduleId) throws Exception {
         assert moduleId != null;
 
@@ -151,86 +186,104 @@
     // TODO: Can probably wrap up some of this into findModules with a flag for running or non-running
     //
     
-    protected void startModule(final String moduleId) throws Exception {
-        assert moduleId != null;
-        
-        if (isModuleStarted(moduleId)) {
-            throw new MojoExecutionException("Module is already started: " + moduleId);
-        }
+    protected void startModule() throws Exception {
+        assert modules != null;
 
         DeploymentManager manager = getDeploymentManager();
         Target[] targets = manager.getTargets();
         TargetModuleID[] targetIds = manager.getNonRunningModules(null, targets);
-        TargetModuleID[] found = findModules(moduleId, targetIds);
 
-        if (found.length == 0) {
-            throw new MojoExecutionException("Module is not deployed: " + moduleId);
-        }
+        for (int i=0; i<modules.length; i++) {
+           String moduleId = getModuleId(modules[i]);
+        
+           if (isModuleStarted(moduleId)) {
+               log.warn("Module is already started: " + moduleId);
+               continue;
+               //throw new MojoExecutionException("Module is already started: " + moduleId);
+           }
 
-        log.info("Starting module: " + moduleId);
-        ProgressObject progress = manager.start(found);
+           TargetModuleID[] found = findModules(moduleId, targetIds);
 
-        DeploymentStatus status = waitFor(progress);
-        if (status.isFailed()) {
-            throw new MojoExecutionException("Failed to start module: " + moduleId);
-        }
+           if (found.length == 0) {
+               throw new MojoExecutionException("Module is not deployed: " + moduleId);
+           }
 
-        log.info("Started module(s):");
-        logModules(found, "    ");
-    }
+           log.info("Starting module: " + moduleId);
+           ProgressObject progress = manager.start(found);
 
-    protected void stopModule(final String moduleId) throws Exception {
-        assert moduleId != null;
-        
-        if (!isModuleStarted(moduleId)) {
-            throw new MojoExecutionException("Module is not started: " + moduleId);
+           DeploymentStatus status = waitFor(progress);
+           if (status.isFailed()) {
+               throw new MojoExecutionException("Failed to start module: " + moduleId);
+           }
+
+           log.info("Started module(s):");
+           logModules(found, "    ");
         }
+    }
+
+    protected void stopModule() throws Exception {
+        assert modules != null;
 
         DeploymentManager manager = getDeploymentManager();
         Target[] targets = manager.getTargets();
         TargetModuleID[] targetIds = manager.getRunningModules(null, targets);
-        TargetModuleID[] found = findModules(moduleId, targetIds);
 
-        if (found.length == 0) {
-            throw new MojoExecutionException("Module not deployed: " + moduleId);
-        }
+         for (int i=0; i<modules.length; i++) {
+           String moduleId = getModuleId(modules[i]);
+           if (!isModuleStarted(moduleId)) {
+               log.warn("Module is already stopped: " + moduleId);
+               continue;
+               //throw new MojoExecutionException("Module is not started: " + moduleId);
+           }
 
-        log.info("Stopping module: " + moduleId);
-        ProgressObject progress = manager.stop(found);
+           TargetModuleID[] found = findModules(moduleId, targetIds);
 
-        DeploymentStatus status = waitFor(progress);
-        if (status.isFailed()) {
-            throw new MojoExecutionException("Failed to stop module: " + moduleId);
-        }
+           if (found.length == 0) {
+               throw new MojoExecutionException("Module not deployed: " + moduleId);
+           }
 
-        log.info("Stopped module(s):");
-        logModules(found, "    ");
+           log.info("Stopping module: " + moduleId);
+           ProgressObject progress = manager.stop(found);
+
+           DeploymentStatus status = waitFor(progress);
+           if (status.isFailed()) {
+               throw new MojoExecutionException("Failed to stop module: " + moduleId);
+           }
+
+           log.info("Stopped module(s):");
+           logModules(found, "    ");
+         }
     }
 
-    protected void undeployModule(final String moduleId) throws Exception {
-        assert moduleId != null;
+    protected void undeployModule() throws Exception {
+        assert modules != null;
+
+        stopModule();
 
-        stopModule(moduleId);
-        
         DeploymentManager manager = getDeploymentManager();
         Target[] targets = manager.getTargets();
         TargetModuleID[] targetIds = manager.getNonRunningModules(null, targets);
-        TargetModuleID[] found = findModules(moduleId, targetIds);
 
-        if (found.length == 0) {
-            throw new Exception("Module is not deployed: " + moduleId);
-        }
+        for (int i=0; i<modules.length; i++) {
+          String moduleId = getModuleId(modules[i]);
 
-        log.info("Undeploying module: " + moduleId);
-        ProgressObject progress = manager.undeploy(found);
+          TargetModuleID[] found = findModules(moduleId, targetIds);
 
-        DeploymentStatus status = waitFor(progress);
-        if (status.isFailed()) {
-            throw new MojoExecutionException("Failed to undeploy module: " + moduleId);
-        }
+          if (found.length == 0) {
+              throw new Exception("Module is not deployed: " + moduleId);
+          }
+
+          log.info("Undeploying module: " + moduleId);
+          ProgressObject progress = manager.undeploy(found);
 
-        log.info("Undeployed module(s):");
-        logModules(found, "    ");
+          DeploymentStatus status = waitFor(progress);
+          if (status.isFailed()) {
+              throw new MojoExecutionException("Failed to undeploy module: " + moduleId);
+          }
+
+          log.info("Undeployed module(s):");
+          logModules(found, "    ");
+        }
     }
 
     protected void logModules(final TargetModuleID[] targetIds) {

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartModuleMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartModuleMojo.java?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartModuleMojo.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartModuleMojo.java Mon Sep 18 06:41:03 2006
@@ -33,7 +33,7 @@
     // TODO: Add forced restart if already started
     //
 
-    public void doExecute() throws Exception {
-        startModule(moduleId);
+    protected void doExecute() throws Exception {
+        startModule();
     }
 }

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartStopUndeployMojoSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartStopUndeployMojoSupport.java?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartStopUndeployMojoSupport.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartStopUndeployMojoSupport.java Mon Sep 18 06:41:03 2006
@@ -19,6 +19,10 @@
 
 package org.apache.geronimo.mavenplugins.geronimo.module;
 
+import org.apache.geronimo.mavenplugins.geronimo.ModuleConfig;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+
 /**
  * Support for start/stop/undeploy mojos.
  *
@@ -35,7 +39,40 @@
      * The id of the module to be started in the format of <tt>groupId/artifactId/version/type</tt>.
      *
      * @parameter expression="${moduleId}
-     * @required
      */
     protected String moduleId = null;
+
+    protected void init() throws MojoExecutionException, MojoFailureException {
+        super.init();
+
+        if (moduleId != null) {
+            log.info("Using non-artifact based module id: " + moduleId);
+
+            // Add the single module to the list
+            ModuleConfig moduleConfig = createModuleConfigFromId(moduleId);
+            modules = new ModuleConfig[] {
+                moduleConfig
+            };
+        }
+        else if (modules == null || modules.length == 0) {
+            throw new MojoExecutionException("At least one module configuration (or moduleId) must be specified");
+        }
+    }
+
+    private ModuleConfig createModuleConfigFromId(String moduleId) throws MojoExecutionException {
+        assert moduleId != null;
+
+        ModuleConfig moduleConfig = new ModuleConfig();
+        moduleId = moduleId.replace('\\', '/');
+        String[] splitStr = moduleId.split("/");
+        if (splitStr.length != 4) {
+            throw new MojoExecutionException("Invalid moduleId: " + moduleId);
+        }
+        moduleConfig.setGroupId(splitStr[0]);
+        moduleConfig.setArtifactId(splitStr[1]);
+        moduleConfig.setVersion(splitStr[2]);
+        moduleConfig.setType(splitStr[3]);
+         
+        return moduleConfig;
+    }
 }

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StopModuleMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StopModuleMojo.java?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StopModuleMojo.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StopModuleMojo.java Mon Sep 18 06:41:03 2006
@@ -33,7 +33,7 @@
     // TODO: Add ignore not running flag ?
     //
     
-    public void doExecute() throws Exception {
-        stopModule(moduleId);
+    protected void doExecute() throws Exception {
+        stopModule();
     }
 }

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/UndeployModuleMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/UndeployModuleMojo.java?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/UndeployModuleMojo.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/UndeployModuleMojo.java Mon Sep 18 06:41:03 2006
@@ -33,7 +33,7 @@
     // TODO: Re-add support to skip undeploy if module is not yet stopped
     //
     
-    public void doExecute() throws Exception {
-        undeployModule(moduleId);
+    protected void doExecute() throws Exception {
+        undeployModule();
     }
 }

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java Mon Sep 18 06:41:03 2006
@@ -111,7 +111,6 @@
 
     protected int installType;
 
-
     private File discoverGeronimoHome(final File archive) throws MojoExecutionException {
         log.debug("Attempting to discover geronimoHome...");
 

Modified: geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml Mon Sep 18 06:41:03 2006
@@ -173,6 +173,7 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-rar-plugin</artifactId>
                 <configuration>
                     <includeJar>false</includeJar>



Mime
View raw message