geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r429088 [1/7] - in /geronimo/branches/dain/notcm: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-framework/src...
Date Sun, 06 Aug 2006 01:47:20 GMT
Author: dain
Date: Sat Aug  5 18:47:06 2006
New Revision: 429088

URL: http://svn.apache.org/viewvc?rev=429088&view=rev
Log:
Merged all changed in head since notcm was cut
Added lame geronimo_groupId property so uddi configs will build

Added:
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/AddRepositoryHandler.java
      - copied unchanged from r429083, geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/car/AddRepositoryHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ViewPluginDownloadHandler.java
      - copied unchanged from r429083, geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ViewPluginDownloadHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/CertificateDetailsHandler.java
      - copied unchanged from r429083, geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/CertificateDetailsHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/DeleteEntryHandler.java
      - copied unchanged from r429083, geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/DeleteEntryHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/GenerateCSRHandler.java
      - copied unchanged from r429083, geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/GenerateCSRHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/ImportCAReplyHandler.java
      - copied unchanged from r429083, geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/ImportCAReplyHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/addRepository.jsp
      - copied unchanged from r429083, geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/car/addRepository.jsp
    geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/viewForDownload.jsp
      - copied unchanged from r429083, geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/car/viewForDownload.jsp
    geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/certificateDetails.jsp
      - copied unchanged from r429083, geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/certificateDetails.jsp
    geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/generateCSR.jsp
      - copied unchanged from r429083, geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/generateCSR.jsp
    geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/importCAReply.jsp
      - copied unchanged from r429083, geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/importCAReply.jsp
    geronimo/branches/dain/notcm/configs/remote-deploy-jetty/pom.xml
      - copied unchanged from r429083, geronimo/trunk/configs/remote-deploy-jetty/pom.xml
    geronimo/branches/dain/notcm/configs/remote-deploy-tomcat/pom.xml
      - copied unchanged from r429083, geronimo/trunk/configs/remote-deploy-tomcat/pom.xml
    geronimo/branches/dain/notcm/configs/uddi-jetty/pom.xml
      - copied unchanged from r429083, geronimo/trunk/configs/uddi-jetty/pom.xml
    geronimo/branches/dain/notcm/configs/uddi-tomcat/pom.xml
      - copied unchanged from r429083, geronimo/trunk/configs/uddi-tomcat/pom.xml
    geronimo/branches/dain/notcm/m2-assemblies/   (props changed)
      - copied from r429083, geronimo/trunk/m2-assemblies/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/   (props changed)
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/LICENSE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/LICENSE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/NOTICE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/NOTICE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/pom.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/pom.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/README.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/README.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/client-log4j.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/client-log4j.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/server-log4j.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/server-log4j.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_groups.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_groups.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_users.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_users.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/groups.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/groups.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/keystores/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/keystores/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/keystores/geronimo-default
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/keystores/geronimo-default
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/users.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/users.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/shared/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/shared/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/shared/classes/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/shared/classes/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/shared/lib/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/shared/lib/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/README.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/README.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/LICENSE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/LICENSE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/NOTICE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/NOTICE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/pom.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/README.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/README.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_groups.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_groups.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_users.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_users.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/groups.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/groups.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/keystores/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/keystores/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/keystores/geronimo-default
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/keystores/geronimo-default
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/users.properties
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/users.properties
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/shared/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/shared/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/shared/classes/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/shared/classes/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/shared/lib/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/shared/lib/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/temp/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/temp/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/temp/README.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/temp/README.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/   (props changed)
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/LICENSE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/LICENSE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/NOTICE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/NOTICE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/pom.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/var/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/   (props changed)
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/LICENSE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/LICENSE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/NOTICE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/NOTICE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/pom.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/pom.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/var/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/offline-deployer-list
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/offline-deployer-list
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/   (props changed)
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/LICENSE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/LICENSE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/NOTICE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/NOTICE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/offline-deployer-list
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/offline-deployer-list
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/   (props changed)
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/LICENSE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/LICENSE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/NOTICE.txt
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/NOTICE.txt
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/pom.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/pom.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/var/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/
      - copied from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/offline-deployer-list
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/offline-deployer-list
    geronimo/branches/dain/notcm/m2-assemblies/pom.xml
      - copied unchanged from r429083, geronimo/trunk/m2-assemblies/pom.xml
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/pom.xml
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/pom.xml
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallConfigMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallConfigMojo.java
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallMojo.java
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenAttributeStore.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenAttributeStore.java
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenConfigStore.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenConfigStore.java
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/resources/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/resources/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/resources/META-INF/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/resources/META-INF/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/site/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/site/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/site/apt/
      - copied from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/site/apt/
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/site/apt/usage.apt
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/site/apt/usage.apt
    geronimo/branches/dain/notcm/m2-plugins/car-maven-plugin/src/site/site.xml
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/car-maven-plugin/src/site/site.xml
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/
      - copied from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/pom.xml
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/pom.xml
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/
      - copied from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/
      - copied from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/
      - copied from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/
      - copied from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/
      - copied from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/
      - copied from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/
      - copied from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/DistributeModuleMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/DistributeModuleMojo.java
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartModuleMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartModuleMojo.java
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartRemoteServerMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartRemoteServerMojo.java
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartServerMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartServerMojo.java
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopModuleMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopModuleMojo.java
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopRemoteServerMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopRemoteServerMojo.java
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopServerMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopServerMojo.java
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/UndeployModuleMojo.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/UndeployModuleMojo.java
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/
      - copied from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/DeploymentClient.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/DeploymentClient.java
    geronimo/branches/dain/notcm/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/ServerBehavior.java
      - copied unchanged from r429083, geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/ServerBehavior.java
    geronimo/branches/dain/notcm/modules/common/src/java/org/apache/geronimo/common/FileUtils.java
      - copied unchanged from r429083, geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/FileUtils.java
    geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/util/XmlUtil.java
      - copied unchanged from r429083, geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/util/XmlUtil.java
    geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/util/
      - copied from r429083, geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/util/
    geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/util/XmlUtilTest.java
      - copied unchanged from r429083, geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/util/XmlUtilTest.java
Removed:
    geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/about.jsp
    geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/doc/
    geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/images/head_about_51x86.gif
    geronimo/branches/dain/notcm/applications/uddi-db/src/webapp/
    geronimo/branches/dain/notcm/m2-plugins/geronimo-packaging-plugin/
    geronimo/branches/dain/notcm/modules/axis/log4j.properties
    geronimo/branches/dain/notcm/modules/security/log4j.properties
    geronimo/branches/dain/notcm/modules/tomcat/src/resources2/
    geronimo/branches/dain/notcm/modules/tomcat/src/var/
Modified:
    geronimo/branches/dain/notcm/   (props changed)
    geronimo/branches/dain/notcm/STATUS
    geronimo/branches/dain/notcm/applications/console/   (props changed)
    geronimo/branches/dain/notcm/applications/console/console-core/pom.xml
    geronimo/branches/dain/notcm/applications/console/console-ear/pom.xml
    geronimo/branches/dain/notcm/applications/console/console-framework/pom.xml
    geronimo/branches/dain/notcm/applications/console/console-framework/src/   (props changed)
    geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp
    geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/login.jsp
    geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/loginerror.jsp
    geronimo/branches/dain/notcm/applications/console/console-standard/   (props changed)
    geronimo/branches/dain/notcm/applications/console/console-standard/pom.xml
    geronimo/branches/dain/notcm/applications/console/console-standard/src/   (props changed)
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/BaseImportExportHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ImportExportPortlet.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ListHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/KeystoresPortlet.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/UploadCertificateHandler.java
    geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/download.jsp
    geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/index.jsp
    geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/list.jsp
    geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/uploadCertificate.jsp
    geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/viewKeystore.jsp
    geronimo/branches/dain/notcm/applications/console/pom.xml
    geronimo/branches/dain/notcm/applications/demo/pom.xml
    geronimo/branches/dain/notcm/applications/ldap-realm-demo/pom.xml
    geronimo/branches/dain/notcm/applications/magicGball/magicGball-client/pom.xml
    geronimo/branches/dain/notcm/applications/magicGball/magicGball-ear/pom.xml
    geronimo/branches/dain/notcm/applications/magicGball/magicGball-ejb/pom.xml
    geronimo/branches/dain/notcm/applications/magicGball/magicGball-web/pom.xml
    geronimo/branches/dain/notcm/applications/magicGball/maven.xml   (props changed)
    geronimo/branches/dain/notcm/applications/magicGball/pom.xml
    geronimo/branches/dain/notcm/applications/pom.xml
    geronimo/branches/dain/notcm/applications/remote-deploy/   (props changed)
    geronimo/branches/dain/notcm/applications/remote-deploy/pom.xml
    geronimo/branches/dain/notcm/applications/uddi-db/pom.xml
    geronimo/branches/dain/notcm/applications/uddi-server/pom.xml
    geronimo/branches/dain/notcm/applications/welcome/   (props changed)
    geronimo/branches/dain/notcm/applications/welcome/pom.xml
    geronimo/branches/dain/notcm/applications/welcome/src/   (props changed)
    geronimo/branches/dain/notcm/applications/welcome/src/webapp/sampleNotInstalled.jsp
    geronimo/branches/dain/notcm/assemblies/   (props changed)
    geronimo/branches/dain/notcm/bootstrap
    geronimo/branches/dain/notcm/build
    geronimo/branches/dain/notcm/configs/   (props changed)
    geronimo/branches/dain/notcm/configs/activemq-broker/pom.xml
    geronimo/branches/dain/notcm/configs/activemq/pom.xml
    geronimo/branches/dain/notcm/configs/axis-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/axis/pom.xml
    geronimo/branches/dain/notcm/configs/client-corba/pom.xml
    geronimo/branches/dain/notcm/configs/client-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/client-deployer/project.xml   (props changed)
    geronimo/branches/dain/notcm/configs/client-security/pom.xml
    geronimo/branches/dain/notcm/configs/client-system/pom.xml
    geronimo/branches/dain/notcm/configs/client/pom.xml
    geronimo/branches/dain/notcm/configs/console-jetty/pom.xml
    geronimo/branches/dain/notcm/configs/console-tomcat/pom.xml
    geronimo/branches/dain/notcm/configs/directory/pom.xml
    geronimo/branches/dain/notcm/configs/geronimo-gbean-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/hot-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/j2ee-corba/pom.xml
    geronimo/branches/dain/notcm/configs/j2ee-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/j2ee-security/pom.xml
    geronimo/branches/dain/notcm/configs/j2ee-server/pom.xml
    geronimo/branches/dain/notcm/configs/j2ee-system/pom.xml
    geronimo/branches/dain/notcm/configs/javamail/pom.xml
    geronimo/branches/dain/notcm/configs/jetty-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/jetty/pom.xml
    geronimo/branches/dain/notcm/configs/jsp-examples-jetty/pom.xml
    geronimo/branches/dain/notcm/configs/jsp-examples-tomcat/pom.xml
    geronimo/branches/dain/notcm/configs/jsp-examples-tomcat/project.xml   (props changed)
    geronimo/branches/dain/notcm/configs/ldap-demo-jetty/pom.xml
    geronimo/branches/dain/notcm/configs/ldap-demo-tomcat/pom.xml
    geronimo/branches/dain/notcm/configs/ldap-realm/pom.xml
    geronimo/branches/dain/notcm/configs/online-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/openejb-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/openejb/pom.xml
    geronimo/branches/dain/notcm/configs/pom.xml
    geronimo/branches/dain/notcm/configs/rmi-naming/pom.xml
    geronimo/branches/dain/notcm/configs/servlets-examples-jetty/pom.xml
    geronimo/branches/dain/notcm/configs/servlets-examples-tomcat/pom.xml
    geronimo/branches/dain/notcm/configs/sharedlib/pom.xml
    geronimo/branches/dain/notcm/configs/shutdown/pom.xml
    geronimo/branches/dain/notcm/configs/system-database/pom.xml
    geronimo/branches/dain/notcm/configs/tomcat-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/tomcat-deployer/src/   (props changed)
    geronimo/branches/dain/notcm/configs/tomcat/pom.xml
    geronimo/branches/dain/notcm/configs/uddi-jetty/src/plan/plan.xml
    geronimo/branches/dain/notcm/configs/uddi-tomcat/src/plan/plan.xml
    geronimo/branches/dain/notcm/configs/unavailable-client-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/unavailable-ejb-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/unavailable-webservices-deployer/pom.xml
    geronimo/branches/dain/notcm/configs/upgrade-cli/pom.xml
    geronimo/branches/dain/notcm/configs/upgrade/pom.xml
    geronimo/branches/dain/notcm/configs/welcome-jetty/pom.xml
    geronimo/branches/dain/notcm/configs/welcome-tomcat/pom.xml
    geronimo/branches/dain/notcm/etc/   (props changed)
    geronimo/branches/dain/notcm/etc/explicit_versions.properties
    geronimo/branches/dain/notcm/etc/project.properties
    geronimo/branches/dain/notcm/m2-plugins/pom.xml   (contents, props changed)
    geronimo/branches/dain/notcm/maven.xml
    geronimo/branches/dain/notcm/modules/activation/pom.xml
    geronimo/branches/dain/notcm/modules/activemq-embedded-rar/pom.xml
    geronimo/branches/dain/notcm/modules/activemq-gbean-management/pom.xml
    geronimo/branches/dain/notcm/modules/activemq-gbean/pom.xml
    geronimo/branches/dain/notcm/modules/axis-builder/pom.xml
    geronimo/branches/dain/notcm/modules/axis-builder/src/   (props changed)
    geronimo/branches/dain/notcm/modules/axis-builder/src/java/   (props changed)
    geronimo/branches/dain/notcm/modules/axis/pom.xml
    geronimo/branches/dain/notcm/modules/client-builder/pom.xml
    geronimo/branches/dain/notcm/modules/client/pom.xml
    geronimo/branches/dain/notcm/modules/common/pom.xml
    geronimo/branches/dain/notcm/modules/common/src/   (props changed)
    geronimo/branches/dain/notcm/modules/connector-builder/   (props changed)
    geronimo/branches/dain/notcm/modules/connector-builder/pom.xml
    geronimo/branches/dain/notcm/modules/connector/pom.xml
    geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/outbound/   (props changed)
    geronimo/branches/dain/notcm/modules/console-web/src/   (props changed)
    geronimo/branches/dain/notcm/modules/converter/pom.xml
    geronimo/branches/dain/notcm/modules/converter/src/java/org/apache/geronimo/converter/bea/WebLogic81DatabaseConverter.java
    geronimo/branches/dain/notcm/modules/converter/src/java/org/apache/geronimo/converter/jboss/JBoss4DatabaseConverter.java
    geronimo/branches/dain/notcm/modules/core/pom.xml
    geronimo/branches/dain/notcm/modules/deploy-config/pom.xml
    geronimo/branches/dain/notcm/modules/deploy-jsr88/pom.xml
    geronimo/branches/dain/notcm/modules/deploy-jsr88/src/   (props changed)
    geronimo/branches/dain/notcm/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
    geronimo/branches/dain/notcm/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
    geronimo/branches/dain/notcm/modules/deploy-tool/pom.xml
    geronimo/branches/dain/notcm/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/   (props changed)
    geronimo/branches/dain/notcm/modules/deployment/pom.xml
    geronimo/branches/dain/notcm/modules/deployment/src/   (props changed)
    geronimo/branches/dain/notcm/modules/deployment/src/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java
    geronimo/branches/dain/notcm/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
    geronimo/branches/dain/notcm/modules/derby/pom.xml
    geronimo/branches/dain/notcm/modules/directory/pom.xml
    geronimo/branches/dain/notcm/modules/hot-deploy/pom.xml
    geronimo/branches/dain/notcm/modules/installer-processing/pom.xml
    geronimo/branches/dain/notcm/modules/installer-support/pom.xml
    geronimo/branches/dain/notcm/modules/interceptor/pom.xml
    geronimo/branches/dain/notcm/modules/j2ee-builder/pom.xml
    geronimo/branches/dain/notcm/modules/j2ee-schema/pom.xml
    geronimo/branches/dain/notcm/modules/j2ee-schema/project.xml
    geronimo/branches/dain/notcm/modules/j2ee-schema/src/   (props changed)
    geronimo/branches/dain/notcm/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
    geronimo/branches/dain/notcm/modules/j2ee/pom.xml
    geronimo/branches/dain/notcm/modules/jetty-builder/pom.xml
    geronimo/branches/dain/notcm/modules/jetty/pom.xml
    geronimo/branches/dain/notcm/modules/jetty/src/   (props changed)
    geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
    geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java
    geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
    geronimo/branches/dain/notcm/modules/jmx-remoting/pom.xml
    geronimo/branches/dain/notcm/modules/kernel/pom.xml
    geronimo/branches/dain/notcm/modules/kernel/src/   (props changed)
    geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationClassLoader.java
    geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java
    geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
    geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/xstream/DomConverter.java
    geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/xstream/XStreamGBeanState.java
    geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java
    geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java
    geronimo/branches/dain/notcm/modules/mail/pom.xml
    geronimo/branches/dain/notcm/modules/management/pom.xml
    geronimo/branches/dain/notcm/modules/management/src/   (props changed)
    geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java
    geronimo/branches/dain/notcm/modules/naming-builder/pom.xml
    geronimo/branches/dain/notcm/modules/naming-builder/src/   (props changed)
    geronimo/branches/dain/notcm/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
    geronimo/branches/dain/notcm/modules/naming/pom.xml
    geronimo/branches/dain/notcm/modules/pom.xml
    geronimo/branches/dain/notcm/modules/scripts/pom.xml
    geronimo/branches/dain/notcm/modules/security-builder/pom.xml
    geronimo/branches/dain/notcm/modules/security/pom.xml
    geronimo/branches/dain/notcm/modules/security/src/   (props changed)
    geronimo/branches/dain/notcm/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
    geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
    geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
    geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java
    geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
    geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
    geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
    geronimo/branches/dain/notcm/modules/service-builder/pom.xml
    geronimo/branches/dain/notcm/modules/service-builder/src/   (props changed)
    geronimo/branches/dain/notcm/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
    geronimo/branches/dain/notcm/modules/system/pom.xml
    geronimo/branches/dain/notcm/modules/system/src/   (props changed)
    geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
    geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
    geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/plugin/PluginMetadata.java
    geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java
    geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerConstants.java
    geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/util/PluginRepositoryExporter.java
    geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/configuration/ConfigurationStoreUtilTest.java
    geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/configuration/ServerOverrideTest.java
    geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java
    geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/AbstractRepositoryTest.java
    geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java
    geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java
    geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java
    geronimo/branches/dain/notcm/modules/test-ddbean/pom.xml
    geronimo/branches/dain/notcm/modules/timer/pom.xml
    geronimo/branches/dain/notcm/modules/tomcat-builder/pom.xml
    geronimo/branches/dain/notcm/modules/tomcat-builder/src/   (props changed)
    geronimo/branches/dain/notcm/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
    geronimo/branches/dain/notcm/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/branches/dain/notcm/modules/tomcat/pom.xml
    geronimo/branches/dain/notcm/modules/tomcat/src/   (props changed)
    geronimo/branches/dain/notcm/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/branches/dain/notcm/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java
    geronimo/branches/dain/notcm/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
    geronimo/branches/dain/notcm/modules/transaction/pom.xml
    geronimo/branches/dain/notcm/modules/transaction/src/test/org/apache/geronimo/transaction/log/AbstractLogTest.java
    geronimo/branches/dain/notcm/modules/upgrade/pom.xml
    geronimo/branches/dain/notcm/modules/util/pom.xml
    geronimo/branches/dain/notcm/modules/web-builder/   (props changed)
    geronimo/branches/dain/notcm/modules/web-builder/pom.xml
    geronimo/branches/dain/notcm/modules/web-builder/src/   (props changed)
    geronimo/branches/dain/notcm/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
    geronimo/branches/dain/notcm/modules/webservices/pom.xml
    geronimo/branches/dain/notcm/pom.xml   (contents, props changed)

Propchange: geronimo/branches/dain/notcm/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -1,2 +1,2 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk:419396
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:428851
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk:428882

Modified: geronimo/branches/dain/notcm/STATUS
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/STATUS?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/STATUS (original)
+++ geronimo/branches/dain/notcm/STATUS Sat Aug  5 18:47:06 2006
@@ -1,120 +1,25 @@
-##
-## $Rev$ $Date$
-##
+APACHE GERONIMO STATUS:                                         -*-text-*-
+Last modified at [$Date$]
 
-Exit Criteria
-(put an X next to item when it is complete):
+The current version of this file can be found at:
 
-Copyrights & Licensing
+  * http://svn.apache.org/repos/asf/geronimo/trunk/STATUS
 
-X -- Do all the software in the codebase has its copyright assigned to The
-     Apache Software Foundation?
-     Yes
+Current version in trunk:
 
-X -- Do All the software in the codebase, are licensed (or multi-licensed) under the
-     Apache licence?
-     Yes - code converted to ASL2.0 on 2004/02/25 (thanks Gianny)
 
-X -- Do all the software in the codebase,are compliant with the
-     Specifications set by Java Community Process?(Wherever applicable)
-     * This criteria has been superceded by the Exit Milestone below
+RELEASE SHOWSTOPPERS:
 
-Distribution rights
 
-X -- For all code included with the distribution that is not under the
-     Apache license, do we have the right to combine with Apache-licensed
-     code and redistribute?
-     Yes
+Outstanding patches awaiting votes:
 
-X -- Is all source code distributed by the project covered by one or more
-     of the following approved licenses:  Apache, BSD, Artistic, MIT/X,
-     MIT/W3C, MPL 1.1, or something with essentially the same terms?
-     Yes
 
-Naming
+Release history:
 
-X -- Has the final name for the project decided?
-2003/12/21 vote on keeping the name Geronimo
-      +1 jboynes, dblevins, adc, gstein, jdillon, djencks, dims, chirino, dain, janb, gregwilkins, bsnyder, rmonson, jules, geir
-      -1 jstrachan
-      Decision made on 2003/12/24 to keep the name Geronimo
 
-X -- Does the codebase,mailing list,bug tracker contain the right name of the project?
-     (In case,if the name geronimo is changed)
-     Yes
+----------------------------------------------------
+If you're a contributor looking for something to do:
 
-Infrastructure
-
-X -- CVS modules created and committers added to avail file?
-     Yes:       http://cvs.apache.org/viewcvs.cgi/incubator-geronimo/
-
-X -- Are the developer,commit and user mailing lists set up and archived?
-     Developer: http://nagoya.apache.org/eyebrowse/SummarizeList?listId=140
-     CVS:       http://nagoya.apache.org/eyebrowse/SummarizeList?listId=141
-     User:      to be set up when a distribution is made
-
-X -- Bug tracking system enabled?
-     Yes:       http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10220
-
-X -- wiki based documentation site enabled?
-     Yes:       http://wiki.apache.org/geronimo
-
-X -- Has the project migrated to our infrastructure?
-     Yes
-
-Committers:
-
-X -- Have all of the active long-term volunteers been identified
-     and acknowledged as committers on the project?
-     Yes
-
-X -- Have all the commiters signed the CLA?
-     Yes, with the exception of Simone Bordet. He is listed as a committer
-     but does not have commit access.
-
-X -- Do they have accounts on cvs.apache.org?
-     Yes
-
-X -- Are there three or more independent committers?
-     Yes
-     2/10/04 voted to add Jacek Laskowski as committer
-             +1 jboynes djencks dims ammulder adc dain janb geir gdamour bsynder dblevins chirino
-
-Collaborative Development:
-
-X -- Are project decisions being made in public by the committers?
-     Yes
-
-X -- Are the decision-making guidelines published and agreed to by
-     all of the committers?
-     Yes
-
-  -- Does the documentation site has enough information on the architecure,design decisions and
-     modules?
-
-
-  -- Has the community decided on a policy for the composition of its 'steering committee'?
-
-
-X -- Has the community,the graduation/new PMC of the project to which the codebase and community
-     will move at the end of incubation (if any), and the Incubator PMC, decided the
-     expected time frame of stay in incubator?
-     Yes - when the Exit Milestone below has been achieved
-
-X -- Has the community adopted the Apache voting rules and is otherwise following the Apache
-     guidelines?
-     Yes
-
-Exit Milestone:
-  -- "Run Petstore from a distribution (on a machine with Zero Source code) by following some
-     easy instruction steps" - a little fuzzy, but whether this is met is to be decided by vote
-
-organisational acceptance:
-
-X  -- Has the board accepted moving to a existing/new PMC?
-
-
-Incubator sign-off:
-
-X -- Has the Incubator decided that the project has accomplished all
-    of the above tasks?
+  * Review the documentation and suggest improvements
+  * Review the bug list and suggest fixes or report reproducibility
+  * Report bugs yourself

Propchange: geronimo/branches/dain/notcm/applications/console/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console:421368

Modified: geronimo/branches/dain/notcm/applications/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-core/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-core/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/console/console-core/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,23 +17,34 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications.console</groupId>
-        <artifactId>console-parent</artifactId>
+        <artifactId>console</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-console-core</artifactId>
     <name>Geronimo Applications, Console :: Core</name>
-
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-core</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-core</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-core</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -53,13 +64,6 @@
     </dependencies>
 
     <build>
-    <!-- resources>
-      <resource>
-        <directory>${basedir}/src/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources -->
-    <!-- use the antrun plugin till we get timestamp plugin from Geronimo-1659 -->
         <plugins>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>

Modified: geronimo/branches/dain/notcm/applications/console/console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-ear/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-ear/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/console/console-ear/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,24 +17,35 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications.console</groupId>
-        <artifactId>console-parent</artifactId>
+        <artifactId>console</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-console</artifactId>
-    <packaging>ear</packaging>
     <name>Geronimo Applications, Console :: EAR</name>
-
+    <packaging>ear</packaging>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-ear</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-ear</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-ear</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
@@ -65,11 +76,13 @@
                             <groupId>org.apache.geronimo.applications.console</groupId>
                             <artifactId>geronimo-console-framework</artifactId>
                             <contextRoot>/console</contextRoot>
+                            <bundleFileName>framework.war</bundleFileName>
                         </webModule>
                         <webModule>
                             <groupId>org.apache.geronimo.applications.console</groupId>
                             <artifactId>geronimo-console-standard</artifactId>
                             <contextRoot>/console-standard</contextRoot>
+                            <bundleFileName>standard.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

Modified: geronimo/branches/dain/notcm/applications/console/console-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-framework/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-framework/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/console/console-framework/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,16 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications.console</groupId>
-        <artifactId>console-parent</artifactId>
+        <artifactId>console</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -34,6 +31,20 @@
     <artifactId>geronimo-console-framework</artifactId>
     <name>Geronimo Applications, Console :: Portal Framework</name>
     <packaging>war</packaging>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-framework</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-framework</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-framework</url>
+    </scm>
     
     <dependencies>
         <dependency>

Propchange: geronimo/branches/dain/notcm/applications/console/console-framework/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/src:427994

Modified: geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp (original)
+++ geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp Sat Aug  5 18:47:06 2006
@@ -22,9 +22,7 @@
         <tr>
           <td height="86" class="Logo" border="0"></td>
           <td height="86" class="Top" border="0">&nbsp; </TD>
-          <td height="86" class="Top" border="0" width="40">
-<a href="<%=request.getContextPath()%>/about.jsp"><img border="0" src="<%=request.getContextPath()%>/images/head_about_51x86.gif"></a>
-          </td>
+          <td height="86" class="Top" border="0" width="40"></td>
           <td height="86" class="Top" border="0" width="40">
 <a href="<%=request.getContextPath()%>/logout.jsp"><img border="0" src="<%=request.getContextPath()%>/images/head_logout_63x86.gif"></a>
           </td>

Modified: geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/login.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/login.jsp?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/login.jsp (original)
+++ geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/login.jsp Sat Aug  5 18:47:06 2006
@@ -14,7 +14,6 @@
           <td height="86" class="LoginLogo" border="0"></td>
           <td height="86" class="Top" border="0">&nbsp; </TD>
           <td height="86" class="Top" border="0" width="40">
-<a href="<%=request.getContextPath()%>/about.jsp"><img border="0" src="<%=request.getContextPath()%>/images/head_about_51x86.gif"></a>
           </td>
         </TR>
         <TR>

Modified: geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/loginerror.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/loginerror.jsp?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/loginerror.jsp (original)
+++ geronimo/branches/dain/notcm/applications/console/console-framework/src/webapp/loginerror.jsp Sat Aug  5 18:47:06 2006
@@ -14,7 +14,6 @@
           <td height="86" class="LoginLogo" border="0"></td>
           <td height="86" class="Top" border="0">&nbsp; </TD>
           <td height="86" class="Top" border="0" width="40">
-<a href="<%=request.getContextPath()%>/about.jsp"><img border="0" src="<%=request.getContextPath()%>/images/head_about_51x86.gif"></a>
           </td>
         </TR>
         <TR>

Propchange: geronimo/branches/dain/notcm/applications/console/console-standard/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard:423294

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,24 +17,35 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications.console</groupId>
-        <artifactId>console-parent</artifactId>
+        <artifactId>console</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-console-standard</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications, Console :: Standard Portlets</name>
-
+    <packaging>war</packaging>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-standard</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-standard</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-standard</url>
+    </scm>
+    
     <dependencies>
         
         <dependency>
@@ -132,6 +143,15 @@
     
     <build>
         <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
             <resource>
                 <directory>${pom.basedir}/src/conf</directory>
                 <filtering>true</filtering>

Propchange: geronimo/branches/dain/notcm/applications/console/console-standard/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src:427999

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/BaseImportExportHandler.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/BaseImportExportHandler.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/BaseImportExportHandler.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/BaseImportExportHandler.java Sat Aug  5 18:47:06 2006
@@ -27,8 +27,10 @@
     protected static final String CONFIG_LIST_SESSION_KEY = "console.plugins.ConfigurationList";
     protected static final String DOWNLOAD_RESULTS_SESSION_KEY = "console.plugins.DownloadResults";
     protected static final String INDEX_MODE = "index";
+    protected static final String ADD_REPO_MODE = "addRepository";
     protected static final String LIST_MODE = "list";
     protected static final String DOWNLOAD_MODE = "download";
+    protected static final String VIEW_FOR_DOWNLOAD_MODE = "viewForDownload";
     protected static final String DOWNLOAD_STATUS_MODE = "downloadStatus";
     protected static final String RESULTS_MODE = "results";
     protected static final String CONFIGURE_EXPORT_MODE = "configure";

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java Sat Aug  5 18:47:06 2006
@@ -149,6 +149,12 @@
         metadata.setPrerequisites((PluginMetadata.Prerequisite[]) prereqs.toArray(new PluginMetadata.Prerequisite[prereqs.size()]));
         URL[] backupURLs = splitURLs(repo);
         metadata.setRepositories(backupURLs);
+
+        // TODO: Fields not yet handled by the UI
+        metadata.setForceStart(data.getForceStart());
+        metadata.setFilesToCopy(data.getFilesToCopy());
+        metadata.setConfigXmls(data.getConfigXmls());
+        // Save updated metadata
         PortletManager.getCurrentServer(request).getPluginInstaller().updatePluginMetadata(metadata);
 
         response.setRenderParameter("configId", configId);

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java Sat Aug  5 18:47:06 2006
@@ -46,11 +46,13 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.util.XmlUtil;
 import org.apache.geronimo.kernel.config.ConfigurationInfo;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.config.NoSuchStoreException;
+import org.apache.geronimo.kernel.config.NoSuchConfigException;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.Version;
@@ -116,54 +118,54 @@
             if(path.startsWith("/")) {
                 path = path.substring(1);
             }
-            String[] parts = path.split("/");
-            if(parts.length != 3) {
-                response.sendError(404, "Unrecognized path form "+path);
+            String configId = parsePath(path, response);
+            if(configId == null) { // we already sent the 404
                 return;
             }
-            String groupId = parts[0];
-            String type = parts[1].substring(0, parts[1].length()-1);
-            if(!parts[2].endsWith("."+type)) {
-                response.sendError(404, "Unrecognized path structure "+path);
-            }
-            parts[2] = parts[2].substring(0, parts[2].length()-(type.length()+1));
-            int pos = parts[2].lastIndexOf("-");
-            String version = parts[2].substring(pos+1);
-            if(version.equalsIgnoreCase("SNAPSHOT")) {
-                pos = parts[2].lastIndexOf("-", pos-1);
-                version = parts[2].substring(pos+1);
-            }
-            String artifactId = parts[2].substring(0, pos);
-            String configId = groupId+"/"+artifactId+"/"+version+"/"+type;
             if(!produceDownloadFile(kernel, Artifact.create(configId), response, reply)) {
                 response.sendError(404, "Cannot locate download file "+path);
             }
         }
     }
 
+    private static String parsePath(String path, HttpServletResponse response) throws IOException {
+        String[] parts = path.split("/");
+        String groupId, artifactId, version, type;
+        if(parts.length < 4) {
+            response.sendError(404, "Unrecognized path form "+path);
+            return null;
+        } else {  // e.g.   console/MyDatabase/1.0-SNAPSHOT/MyDatabase-1.0-SNAPSHOT.rar
+            groupId = parts[0];
+            for(int i=4; i<parts.length; i++) {
+                groupId = groupId+"."+parts[i-3];
+            }
+            artifactId = parts[parts.length-3];
+            version = parts[parts.length-2];
+            if(!parts[parts.length-1].startsWith(artifactId+"-"+version)) {
+                response.sendError(404, "Unrecognized path structure "+path);
+                return null;
+            }
+            type = parts[parts.length-1].substring(artifactId.length()+version.length()+2);
+        }
+        return groupId+"/"+artifactId+"/"+version+"/"+type;
+    }
+
     private boolean produceDownloadFile(Kernel kernel, Artifact configId, HttpServletResponse response, boolean reply) throws IOException {
         //todo: replace kernel mumbo jumbo with JSR-77 navigation
         // Step 1: check if it's in a configuration store
         ConfigurationManager mgr = ConfigurationUtil.getConfigurationManager(kernel);
-        List stores = mgr.listStores();
-        for (int i = 0; i < stores.size(); i++) {
-            AbstractName name = (AbstractName) stores.get(i);
-            //todo: this is bad!!!
-            if(name.getName().get(NameFactory.J2EE_NAME).equals("Local")) {
-                ConfigurationStore store = (ConfigurationStore) kernel.getProxyManager().createProxy(name, ConfigurationStore.class);
-                if(store.containsConfiguration(configId)) {
-                    response.setContentType("application/zip");
-                    if(!reply) {
-                        return true;
-                    }
-                    try {
-                        kernel.invoke(name, "exportConfiguration", new Object[]{configId.toString(), response.getOutputStream()}, new String[]{String.class.getName(), OutputStream.class.getName()});
-                        return true;
-                    } catch (Exception e) {
-                        log.error("Unable to export configuration ZIP", e);
-                        throw new IOException("Unable to write ZIP file: "+e.getMessage());
-                    }
-                }
+        if(mgr.isConfiguration(configId)) {
+            ConfigurationStore store = mgr.getStoreForConfiguration(configId);
+            response.setContentType("application/zip");
+            if(!reply) {
+                return true;
+            }
+            try {
+                store.exportConfiguration(configId, response.getOutputStream());
+                return true;
+            } catch (NoSuchConfigException e) {
+                log.error("Inconsistent ConfigurationStore data; ConfigManager claims it has configuration "+configId+" but store claims it doesn't",e);
+                throw new IOException("Unable to write ZIP file; see server log for details");
             }
         }
         // Step 2: check if it's in a repository
@@ -173,7 +175,7 @@
             Repository repo = (Repository) kernel.getProxyManager().createProxy(name, Repository.class);
             if(repo.contains(configId)) {
                 File path = repo.getLocation(configId);
-                if(!path.exists()) throw new IllegalStateException("Can't find file '"+path.getAbsolutePath()+"'");
+                if(!path.exists()) throw new IllegalStateException("Can't find file '"+path.getAbsolutePath()+"' though repository said there's an artifact there!");
                 response.setContentType("application/zip");
                 if(!reply) {
                     return true;
@@ -197,11 +199,12 @@
     private void generateConfigFile(HttpServletRequest request, Kernel kernel, PrintWriter out) throws ParserConfigurationException, NoSuchStoreException, TransformerException {
         ConfigurationManager mgr = ConfigurationUtil.getConfigurationManager(kernel);
         PluginInstaller installer = getInstaller(kernel);
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory();
         factory.setNamespaceAware(true);
         DocumentBuilder builder = factory.newDocumentBuilder();
         Document doc = builder.newDocument();
         Element root = doc.createElementNS("http://geronimo.apache.org/xml/ns/plugins-1.1", "geronimo-plugin-list");
+        root.setAttribute("xmlns", "http://geronimo.apache.org/xml/ns/plugins-1.1");
         doc.appendChild(root);
         List stores = mgr.listStores();
         for (int i = 0; i < stores.size(); i++) {
@@ -255,10 +258,10 @@
                 // Skip repositories since we want the download to come from here
             }
         }
-        String repo = request.getProtocol()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+request.getServletPath();
+        String repo = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+request.getServletPath();
         if(!repo.endsWith("/")) repo += "/";
         createText(doc, root, "default-repository", repo);
-        TransformerFactory xfactory = TransformerFactory.newInstance();
+        TransformerFactory xfactory = XmlUtil.newTransformerFactory();
         Transformer xform = xfactory.newTransformer();
         xform.setOutputProperty(OutputKeys.INDENT, "yes");
         xform.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
@@ -280,7 +283,7 @@
             return;
         }
 
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory();
         DocumentBuilder builder = factory.newDocumentBuilder();
         Document doc = builder.newDocument();
         Element root = doc.createElement("metadata");
@@ -298,7 +301,7 @@
             Artifact artifact = artifacts[i];
             createText(doc, versions, "version", artifact.getVersion().toString());
         }
-        TransformerFactory xfactory = TransformerFactory.newInstance();
+        TransformerFactory xfactory = XmlUtil.newTransformerFactory();
         Transformer xform = xfactory.newTransformer();
         xform.setOutputProperty(OutputKeys.INDENT, "yes");
         xform.transform(new DOMSource(doc), new StreamResult(writer));



Mime
View raw message