geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1096951 [1/6] - in /geronimo/server/trunk: ./ framework/ framework/assemblies/ framework/assemblies/geronimo-framework/ framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/ framework/buildsupport/car-maven-plu...
Date Tue, 26 Apr 2011 23:19:00 GMT
Author: djencks
Date: Tue Apr 26 23:18:49 2011
New Revision: 1096951

URL: http://svn.apache.org/viewvc?rev=1096951&view=rev
Log:
start rebasing PackageMojo on AbstractFrameworkMojo

Added:
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf   (with props)
    geronimo/server/trunk/framework/features/
    geronimo/server/trunk/framework/features/client-system/
    geronimo/server/trunk/framework/features/client-system/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
    geronimo/server/trunk/framework/features/client-system/src/
    geronimo/server/trunk/framework/features/client-system/src/main/
    geronimo/server/trunk/framework/features/client-system/src/main/history/
    geronimo/server/trunk/framework/features/client-system/src/main/history/dependencies.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/client-system/src/main/plan/
    geronimo/server/trunk/framework/features/client-system/src/main/plan/plan.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml
    geronimo/server/trunk/framework/features/client-system/src/main/resources/
    geronimo/server/trunk/framework/features/client-system/src/main/resources/META-INF/
    geronimo/server/trunk/framework/features/client-system/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/goals.txt   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/META-INF/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/validate.groovy
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/goals.txt   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/META-INF/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/validate.groovy
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/goals.txt   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/validate.groovy
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/goals.txt   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/validate.groovy
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/history/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/plan/
    geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/main/plan/plan.xml   (contents, props changed)
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml
    geronimo/server/trunk/framework/features/j2ee-security/
    geronimo/server/trunk/framework/features/j2ee-security/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml
    geronimo/server/trunk/framework/features/j2ee-security/src/
    geronimo/server/trunk/framework/features/j2ee-security/src/main/
    geronimo/server/trunk/framework/features/j2ee-security/src/main/history/
    geronimo/server/trunk/framework/features/j2ee-security/src/main/history/dependencies.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/j2ee-security/src/main/plan/
    geronimo/server/trunk/framework/features/j2ee-security/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/framework/features/j2ee-system/
    geronimo/server/trunk/framework/features/j2ee-system/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
    geronimo/server/trunk/framework/features/j2ee-system/src/
    geronimo/server/trunk/framework/features/j2ee-system/src/main/
    geronimo/server/trunk/framework/features/j2ee-system/src/main/history/
    geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/framework/features/j2ee-system/src/main/plan/
    geronimo/server/trunk/framework/features/j2ee-system/src/main/plan/plan.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml
    geronimo/server/trunk/framework/features/j2ee-system/src/main/resources/
    geronimo/server/trunk/framework/features/j2ee-system/src/main/resources/META-INF/
    geronimo/server/trunk/framework/features/j2ee-system/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/framework/features/jmx-security/
    geronimo/server/trunk/framework/features/jmx-security/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
    geronimo/server/trunk/framework/features/jmx-security/src/
    geronimo/server/trunk/framework/features/jmx-security/src/main/
    geronimo/server/trunk/framework/features/jmx-security/src/main/history/
    geronimo/server/trunk/framework/features/jmx-security/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/framework/features/jmx-security/src/main/plan/
    geronimo/server/trunk/framework/features/jmx-security/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/framework/features/jsr88-cli/
    geronimo/server/trunk/framework/features/jsr88-cli/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
    geronimo/server/trunk/framework/features/jsr88-cli/src/
    geronimo/server/trunk/framework/features/jsr88-cli/src/main/
    geronimo/server/trunk/framework/features/jsr88-cli/src/main/history/
    geronimo/server/trunk/framework/features/jsr88-cli/src/main/history/dependencies.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/jsr88-cli/src/main/plan/
    geronimo/server/trunk/framework/features/jsr88-cli/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/framework/features/jsr88-deploymentfactory/
    geronimo/server/trunk/framework/features/jsr88-deploymentfactory/pom.xml   (contents, props changed)
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
    geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/
    geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/
    geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/history/
    geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/history/dependencies.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/plan/
    geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/plan/plan.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml
    geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/resources/
    geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/resources/META-INF/
    geronimo/server/trunk/framework/features/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/framework/features/offline-deployer/
    geronimo/server/trunk/framework/features/offline-deployer/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
    geronimo/server/trunk/framework/features/offline-deployer/src/
    geronimo/server/trunk/framework/features/offline-deployer/src/main/
    geronimo/server/trunk/framework/features/offline-deployer/src/main/history/
    geronimo/server/trunk/framework/features/offline-deployer/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/framework/features/offline-deployer/src/main/plan/
    geronimo/server/trunk/framework/features/offline-deployer/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/framework/features/online-deployer/
    geronimo/server/trunk/framework/features/online-deployer/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
    geronimo/server/trunk/framework/features/online-deployer/src/
    geronimo/server/trunk/framework/features/online-deployer/src/main/
    geronimo/server/trunk/framework/features/online-deployer/src/main/history/
    geronimo/server/trunk/framework/features/online-deployer/src/main/history/dependencies.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/online-deployer/src/main/plan/
    geronimo/server/trunk/framework/features/online-deployer/src/main/plan/plan.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/framework/features/online-deployer/src/main/resources/
    geronimo/server/trunk/framework/features/online-deployer/src/main/resources/META-INF/
    geronimo/server/trunk/framework/features/online-deployer/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/framework/features/plugin/
    geronimo/server/trunk/framework/features/plugin/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/plugin/pom.xml
    geronimo/server/trunk/framework/features/plugin/src/
    geronimo/server/trunk/framework/features/plugin/src/main/
    geronimo/server/trunk/framework/features/plugin/src/main/history/
    geronimo/server/trunk/framework/features/plugin/src/main/history/dependencies.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/plugin/src/main/plan/
    geronimo/server/trunk/framework/features/plugin/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/framework/features/plugin/src/main/resources/
    geronimo/server/trunk/framework/features/plugin/src/main/resources/plugin-repositories.properties   (with props)
    geronimo/server/trunk/framework/features/pom.xml   (with props)
    geronimo/server/trunk/framework/features/rmi-naming/
    geronimo/server/trunk/framework/features/rmi-naming/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
    geronimo/server/trunk/framework/features/rmi-naming/src/
    geronimo/server/trunk/framework/features/rmi-naming/src/main/
    geronimo/server/trunk/framework/features/rmi-naming/src/main/history/
    geronimo/server/trunk/framework/features/rmi-naming/src/main/history/dependencies.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/rmi-naming/src/main/plan/
    geronimo/server/trunk/framework/features/rmi-naming/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/framework/features/rmi-naming/src/main/resources/
    geronimo/server/trunk/framework/features/rmi-naming/src/main/resources/OSGI-INF/
    geronimo/server/trunk/framework/features/rmi-naming/src/main/resources/OSGI-INF/blueprint/
    geronimo/server/trunk/framework/features/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml   (with props)
    geronimo/server/trunk/framework/features/server-security-config/
    geronimo/server/trunk/framework/features/server-security-config/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/server-security-config/pom.xml
    geronimo/server/trunk/framework/features/server-security-config/src/
    geronimo/server/trunk/framework/features/server-security-config/src/main/
    geronimo/server/trunk/framework/features/server-security-config/src/main/history/
    geronimo/server/trunk/framework/features/server-security-config/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/framework/features/server-security-config/src/main/plan/
    geronimo/server/trunk/framework/features/server-security-config/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/framework/features/server-security-config/src/main/resources/
    geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/
    geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties   (with props)
    geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties   (with props)
    geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties   (with props)
    geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties   (with props)
    geronimo/server/trunk/framework/features/shutdown/
    geronimo/server/trunk/framework/features/shutdown/pom.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/shutdown/pom.xml
    geronimo/server/trunk/framework/features/shutdown/src/
    geronimo/server/trunk/framework/features/shutdown/src/main/
    geronimo/server/trunk/framework/features/shutdown/src/main/history/
    geronimo/server/trunk/framework/features/shutdown/src/main/history/dependencies.xml   (contents, props changed)
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/shutdown/src/main/plan/
    geronimo/server/trunk/framework/features/shutdown/src/main/plan/plan.xml
      - copied, changed from r1096950, geronimo/server/trunk/framework/configs/shutdown/src/main/plan/plan.xml
    geronimo/server/trunk/framework/features/shutdown/src/main/resources/
    geronimo/server/trunk/framework/features/shutdown/src/main/resources/META-INF/
    geronimo/server/trunk/framework/features/shutdown/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/framework/features/shutdown/src/main/resources/log4j.properties   (with props)
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JaxbTest.java   (with props)
Removed:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/karaf-framework/NOTICE
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/geronimo-bin.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/unix-bin.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/unix-src.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/windows-bin.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/windows-src.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/instance/var/config/README.txt
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/instance/var/log/client-log4j.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/instance/var/log/deployer-log4j.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/instance/var/log/server-log4j.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/instance/var/temp/README.txt
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/LICENSE
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/NOTICE
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/README.txt
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/RELEASE_NOTES-3.0-SNAPSHOT.txt
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/equinox-debug.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/java.util.logging.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.log.cfg
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/shell.init.script
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/hotbundles/README.txt
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/deploy
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/gserviceReg.sh
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/setjavaenv.sh
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/startup
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/deploy.bat
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/setjavaenv.bat
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/startup.bat
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/features.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
Modified:
    geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/framework/assemblies/pom.xml
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/startup.properties
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractFrameworkMojo.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/FrameworkHelper.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/MavenConfigStore.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
    geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
    geronimo/server/trunk/framework/configs/client-system/pom.xml
    geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/jmx-security/pom.xml
    geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
    geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
    geronimo/server/trunk/framework/configs/online-deployer/pom.xml
    geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/plugin/pom.xml
    geronimo/server/trunk/framework/configs/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/server-security-config/pom.xml
    geronimo/server/trunk/framework/configs/shutdown/pom.xml
    geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/shutdown/src/main/plan/plan.xml
    geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/eba/EBADeploymentManager.java
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java
    geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
    geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerImpl.java
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java
    geronimo/server/trunk/framework/modules/geronimo-management/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/JVM.java
    geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/SingleGBeanBuilder.java
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/JaxbUtil.java
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ModuleType.java
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml
    geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PluginXmlUtil.java
    geronimo/server/trunk/framework/modules/testsupport-common/pom.xml
    geronimo/server/trunk/framework/plugingroups/framework/pom.xml
    geronimo/server/trunk/framework/plugingroups/pom.xml
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml Tue Apr 26 23:18:49 2011
@@ -31,7 +31,7 @@
     <groupId>org.apache.geronimo.assemblies</groupId>
     <artifactId>geronimo-framework</artifactId>
     <name>Geronimo Assemblies :: Framework</name>
-    <packaging>server-assembly</packaging>
+    <packaging>karaf-assembly</packaging>
     
     <description>
         A minimal Geronimo server (Little-G) framework assembly.
@@ -39,10 +39,35 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework.plugingroups</groupId>
-            <artifactId>framework</artifactId>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>karaf-framework</artifactId>
+            <type>kar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>karaf-full</artifactId>
+            <type>kar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>j2ee-system</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/framework/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/assemblies/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/pom.xml Tue Apr 26 23:18:49 2011
@@ -39,41 +39,41 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <osiApproved>true</osiApproved>
-                    <servers>
-                        <serverInstance>
-                            <name>default</name>
-                            <configFile>var/config/config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
-                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                        <serverInstance>
-                            <name>client</name>
-                            <attributeManagerFrom>default</attributeManagerFrom>
-                            <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                        <serverInstance>
-                            <name>offline</name>
-                            <configFile>var/config/offline-deployer-config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
-                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                        <serverInstance>
-                            <name>jsr88</name>
-                            <configFile>var/config/jsr88-configurer-config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
-                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                    </servers>
-                </configuration>
-            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.geronimo.buildsupport</groupId>-->
+                <!--<artifactId>car-maven-plugin</artifactId>-->
+                <!--<configuration>-->
+                    <!--<osiApproved>true</osiApproved>-->
+                    <!--<servers>-->
+                        <!--<serverInstance>-->
+                            <!--<name>default</name>-->
+                            <!--<configFile>var/config/config.xml</configFile>-->
+                            <!--<configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>-->
+                            <!--<configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>-->
+                            <!--<artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>-->
+                        <!--</serverInstance>-->
+                        <!--<serverInstance>-->
+                            <!--<name>client</name>-->
+                            <!--<attributeManagerFrom>default</attributeManagerFrom>-->
+                            <!--<artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>-->
+                        <!--</serverInstance>-->
+                        <!--<serverInstance>-->
+                            <!--<name>offline</name>-->
+                            <!--<configFile>var/config/offline-deployer-config.xml</configFile>-->
+                            <!--<configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>-->
+                            <!--<configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>-->
+                            <!--<artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>-->
+                        <!--</serverInstance>-->
+                        <!--<serverInstance>-->
+                            <!--<name>jsr88</name>-->
+                            <!--<configFile>var/config/jsr88-configurer-config.xml</configFile>-->
+                            <!--<configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>-->
+                            <!--<configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>-->
+                            <!--<artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>-->
+                        <!--</serverInstance>-->
+                    <!--</servers>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/startup.properties?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/startup.properties (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/startup.properties Tue Apr 26 23:18:49 2011
@@ -75,14 +75,14 @@ org.apache.karaf.deployer\:org.apache.ka
 org.apache.karaf.deployer\:org.apache.karaf.deployer.wrap\:${karaf.version}=30
 
 # geronimo additions
-org.apache.felix\:org.apache.felix.scr\:1.6.1-SNAPSHOT=15
-org.apache.felix\:org.apache.felix.shell\:1.5.0-SNAPSHOT=15
-org.apache.geronimo.bundles\:jaxb-impl\:2.2.3_1-SNAPSHOT=15
-org.apache.geronimo.specs\:geronimo-stax-api_1.2_spec\:1.1-SNAPSHOT=15
-org.apache.geronimo.specs\:geronimo-jaxb_2.2_spec\:1.0.2-SNAPSHOT=15
-org.apache.geronimo.specs\:geronimo-activation_1.1_spec\:1.1=15
-org.apache.geronimo.bundles\:woodstox\:4.0.6_2-SNAPSHOT=15
-org.apache.geronimo.specs\:geronimo-osgi-registry\:1.1-SNAPSHOT=15
+org.apache.felix\:org.apache.felix.scr\:1.6.1-SNAPSHOT=35
+org.apache.felix\:org.apache.felix.shell\:1.5.0-SNAPSHOT=35
+#org.apache.geronimo.bundles\:jaxb-impl\:2.2.3_1-SNAPSHOT=15
+#org.apache.geronimo.specs\:geronimo-stax-api_1.2_spec\:1.1-SNAPSHOT=15
+#org.apache.geronimo.specs\:geronimo-jaxb_2.2_spec\:1.0.2-SNAPSHOT=15
+#org.apache.geronimo.specs\:geronimo-activation_1.1_spec\:1.1=15
+#org.apache.geronimo.bundles\:woodstox\:4.0.6_2-SNAPSHOT=15
+org.apache.geronimo.specs\:geronimo-osgi-registry\:1.1-SNAPSHOT=14
 
 org.apache.geronimo.framework\:geronimo-kernel\:${geronimo.version}=40
 org.apache.geronimo.framework\:geronimo-crypto\:${geronimo.version}=40
@@ -91,7 +91,7 @@ org.apache.xbean\:xbean-reflect\:${xbean
 
 org.apache.geronimo.framework\:geronimo-system\:${geronimo.version}=40
 org.apache.geronimo.framework\:geronimo-common\:${geronimo.version}=40
-org.apache.geronimo.framework\:geronimo-pax-logging\:${geronimo.version}=40
+#org.apache.geronimo.framework\:geronimo-pax-logging\:${geronimo.version}=40
 org.apache.geronimo.framework\:geronimo-main\:${geronimo.version}=40
 org.apache.servicemix.bundles\:org.apache.servicemix.bundles.commons-jexl\:1.1_3=40
 org.apache.xbean\:xbean-bundleutils\:${xbeanVersion}=40

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Tue Apr 26 23:18:49 2011
@@ -886,7 +886,7 @@ public abstract class AbstractCarMojo
                         "org.apache.geronimo.transformer," +
                         "org.apache.geronimo.hook," +
                         "org.apache.geronimo.mavenplugins.car," +
-                        "org.apache.karaf.jaas.boot;version=\"2.2.1.SNAPSHOT\"," +
+                        "org.apache.karaf.jaas.boot;version=\"2.1.2\"," +
                         "org.apache.yoko," +
                         "org.apache.yoko.osgi," +
                         "org.apache.yoko.rmispec.util," +
@@ -1013,7 +1013,6 @@ public abstract class AbstractCarMojo
             systemProperties.put("openejb.log.factory", "org.apache.openejb.util.PaxLogStreamFactory");
         }
         systemProperties.put("karaf.startLocalConsole", "false");
-        systemProperties.put("openejb.geronimo", "true");
         setSystemProperties();
         return framework;
     }

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractFrameworkMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractFrameworkMojo.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractFrameworkMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractFrameworkMojo.java Tue Apr 26 23:18:49 2011
@@ -48,9 +48,6 @@ import org.sonatype.aether.util.artifact
 /**
  * Base for karaf-aware mojos
  *
- * @goal karaf-framework
- * @requiresDependencyResolution runtime
- *
  * @version $Rev$ $Date$
  */
 public class AbstractFrameworkMojo extends AbstractMojo {
@@ -84,20 +81,32 @@ public class AbstractFrameworkMojo exten
      */
     private String karafHome;
 
-    private Framework framework;
+    /**
+     * how long to wait for a service
+     *
+     * @parameter default-value="20000"
+     */
     private long timeout = 20000L;
+
+    private Framework framework;
     private List<ServiceReference> services = new ArrayList<ServiceReference>();
 
 
     @java.lang.Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         initializeFramework();
+        try {
+            doExecute();
+        } finally {
+            done();
+        }
+    }
+
+    protected void doExecute() throws MojoExecutionException {
         getService(FeaturesService.class);
         getService(Deployer.class);
         getService(ConfigurationBuilder.class);
-        listBundles();
-
-        done();
+//        listBundles();
     }
 
     protected void done() throws MojoExecutionException {
@@ -111,6 +120,11 @@ public class AbstractFrameworkMojo exten
         }
     }
 
+
+    public Framework getFramework() {
+        return framework;
+    }
+
     protected <T> T getService(Class<T> clazz) throws MojoExecutionException {
         long timeout = this.timeout;
         while (timeout > 0) {

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/FrameworkHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/FrameworkHelper.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/FrameworkHelper.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/FrameworkHelper.java Tue Apr 26 23:18:49 2011
@@ -100,7 +100,7 @@ public class FrameworkHelper {
     }
 
     public Framework start() throws Exception {
-        ThreadLocalProperties.install();
+//        ThreadLocalProperties.install();
         System.setProperty(PROP_KARAF_HOME, karafHomeString);
         System.setProperty(PROP_KARAF_BASE, karafHomeString);
         launch();
@@ -112,7 +112,7 @@ public class FrameworkHelper {
         try {
             destroy();
         } finally {
-            ThreadLocalProperties.uninstall();
+//            ThreadLocalProperties.uninstall();
         }
     }
 
@@ -527,9 +527,9 @@ public class FrameworkHelper {
             if (pid.indexOf('@') > 0) {
                 pid = pid.substring(0, pid.indexOf('@'));
             }
-
+            
             boolean isRoot = karafHome.equals(karafBase);
-
+            
             if (instanceName != null) {
                 String storage = System.getProperty("karaf.instances");
                 if (storage == null) {
@@ -557,7 +557,7 @@ public class FrameworkHelper {
                     fis.close();
                     if (!isRoot) {
                         throw new Exception("Instance " + instanceName + " not found");
-                    }
+                    } 
                 } else if (isRoot) {
                     if (!propertiesFile.getParentFile().exists()) {
                         try {
@@ -886,16 +886,13 @@ public class FrameworkHelper {
         Properties startupProps = loadPropertiesFile(startupPropURL, true);
 
         String defaultRepo = System.getProperty(DEFAULT_REPO, "system");
-
         if (karafBase.equals(karafHome)) {
             bundleDirs.add(new File(karafHome, defaultRepo));
         } else {
             bundleDirs.add(new File(karafBase, defaultRepo));
             bundleDirs.add(new File(karafHome, defaultRepo));
         }
-
         String locations = configProps.getProperty(BUNDLE_LOCATIONS);
-
         if (locations != null) {
             StringTokenizer st = new StringTokenizer(locations, "\" ", true);
             if (st.countTokens() > 0) {

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/MavenConfigStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/MavenConfigStore.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/MavenConfigStore.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/MavenConfigStore.java Tue Apr 26 23:18:49 2011
@@ -46,7 +46,7 @@ public class MavenConfigStore
     extends RepositoryConfigurationStore
 {
     public MavenConfigStore(Kernel kernel, String objectName, WritableListableRepository repository) {
-        super(kernel, objectName, null, repository);
+        super(repository);
     }
 
     public MavenConfigStore(WritableListableRepository repository) {

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Tue Apr 26 23:18:49 2011
@@ -20,6 +20,8 @@
 package org.apache.geronimo.mavenplugins.car;
 
 import java.io.File;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Dictionary;
@@ -28,6 +30,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.geronimo.deployment.Deployer;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
@@ -51,8 +54,12 @@ import org.apache.geronimo.system.resolv
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.FileUtils;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.framework.launch.Framework;
@@ -60,12 +67,12 @@ import org.osgi.framework.launch.Framewo
 /**
  * Build a Geronimo Configuration using the local Maven infrastructure.
  *
- * @goal package
+ * @goal compile-gbean-plan
  * @requiresDependencyResolution compile
  *
  * @version $Rev$ $Date$
  */
-public class PackageMojo extends AbstractCarMojo {
+public class PackageMojo extends AbstractFrameworkMojo {
 
 
     /**
@@ -139,29 +146,29 @@ public class PackageMojo extends Abstrac
      */
     private Dependency module = null;
 
-    /**
-     * The location where the properties mapping will be generated.
-     * <p/>
-     * <p>
-     * Probably don't want to change this.
-     * </p>
-     *
-     * @parameter expression="${project.build.directory}/explicit-versions.properties"
-     */
-    private File explicitResolutionProperties = null;
-
-    /**
-     * True to enable the bootshell when packaging.
-     *
-     * @parameter
-     */
-    private boolean bootstrap = false;
-
-    /**
-     * Holds a local repo lookup instance so that we can use the current project to resolve.
-     * This is required since the Kernel used to deploy is cached.
-     */
-    private static ThreadLocal<Maven2RepositoryAdapter.ArtifactLookup> lookupHolder = new ThreadLocal<Maven2RepositoryAdapter.ArtifactLookup>();
+//    /**
+//     * The location where the properties mapping will be generated.
+//     * <p/>
+//     * <p>
+//     * Probably don't want to change this.
+//     * </p>
+//     *
+//     * @parameter expression="${project.build.directory}/explicit-versions.properties"
+//     */
+//    private File explicitResolutionProperties = null;
+
+//    /**
+//     * True to enable the bootshell when packaging.
+//     *
+//     * @parameter
+//     */
+//    private boolean bootstrap = false;
+
+//    /**
+//     * Holds a local repo lookup instance so that we can use the current project to resolve.
+//     * This is required since the Kernel used to deploy is cached.
+//     */
+//    private static ThreadLocal<Maven2RepositoryAdapter.ArtifactLookup> lookupHolder = new ThreadLocal<Maven2RepositoryAdapter.ArtifactLookup>();
 
     /**
      * Directory for generated plugin metadata file.
@@ -178,206 +185,266 @@ public class PackageMojo extends Abstrac
      * @required
      */
     protected String pluginMetadataFileName = null;
-    private BundleContext bundleContext;
-    private ServiceRegistration kernelRegistration;
-    private ServiceReference kernelReference;
 
+//    private BundleContext bundleContext;
+//    private ServiceRegistration kernelRegistration;
+//    private ServiceReference kernelReference;
+
+    /**
+     * The maven project.
+     *
+     * @parameter expression="${project}"
+     * @required
+     * @readonly
+     */
+    protected MavenProject project;
     //
     // Mojo
     //
 
-    public void execute() throws MojoExecutionException, MojoFailureException {
+    public void doExecute() throws MojoExecutionException {
         try {
-            // We need to make sure to clean up any previous work first or this operation will fail
-            FileUtils.forceDelete(targetRepository);
-            FileUtils.forceMkdir(targetRepository);
-
-            if (!planFile.exists()) {
-                return;
-            }
+            try {
+                super.doExecute();
+                // We need to make sure to clean up any previous work first or this operation will fail
+                FileUtils.forceDelete(targetRepository);
+                FileUtils.forceMkdir(targetRepository);
 
-            // Use the default configs if none specified
-            if (deploymentConfigs == null) {
-                if (bootstrap) {
-                    deploymentConfigs = new String[]{};
-                } else {
-                    deploymentConfigs = new String[]{defaultDeploymentConfig};
+                if (!planFile.exists()) {
+                    return;
+                }
+                for (Artifact dependency : (Set<Artifact>) project.getDependencyArtifacts()) {
+                    if ("compile".equals(dependency.getScope()) || "runtime".equals(dependency.getScope())) {
+                        getLog().info("starting dependency: " + dependency);
+                        File file = dependency.getFile();
+                        try {
+                            getFramework().getBundleContext().installBundle("reference:" + file.toURI().toURL());
+                        } catch (BundleException e) {
+                            getLog().info("Can't start " + dependency + " due to " + e.getMessage());
+                        }
+                    }
                 }
+                listBundles();
+                Object deployer = getService(Deployer.class);
+                invokeDeployer(deployer, null);
+//            } catch (MojoExecutionException e) {
+            } catch (Exception e) {
+                getLog().info("Exception, use console to investigate ", e);
+                listBundles();
+                for (Bundle b: getFramework().getBundleContext().getBundles()) {
+                    if (b.getState() != 32) {
+                        try {
+                            b.start();
+                        } catch (BundleException e1) {
+                            getLog().info("Could not start " + b + e.getMessage());
+                        }
+                    }
+                }
+                while (1 == 1) {
+                    try {
+                        Thread.sleep(1000L);
+                    } catch (InterruptedException e1) {
+                        //exit
+                        break;
+                    }
+                }
+                throw e;
+//            } catch (RuntimeException e) {
+//                getLog().info("RuntimeException, use console to investigate ", e);
+//                listBundles();
+//                while (1 == 1) {
+//                    try {
+//                        Thread.sleep(1000L);
+//                    } catch (InterruptedException e1) {
+//                        //exit
+//                        break;
+//                    }
+//                }
+//                throw e;
             }
-            getLog().debug("Deployment configs: " + Arrays.asList(deploymentConfigs));
 
-            getDependencies(project, false);
+            // Use the default configs if none specified
+//            if (deploymentConfigs == null) {
+//                if (bootstrap) {
+//                    deploymentConfigs = new String[]{};
+//                } else {
+//                    deploymentConfigs = new String[]{defaultDeploymentConfig};
+//                }
+//            }
+//            getLog().debug("Deployment configs: " + Arrays.asList(deploymentConfigs));
+//
+//            getDependencies(project, false);
             // If module is set, then resolve the artifact and set moduleFile
-            if (module != null) {
-                Artifact artifact = resolveArtifact(module.getGroupId(), module.getArtifactId(), module.getType());
-                if (artifact == null) {
-                    throw new MojoExecutionException("Could not resolve module " + module.getGroupId() + ":" + module.getArtifactId() + ":" + module.getType() + ". Perhaps it is not listed as a dependency");
-                }
-                moduleFile = artifact.getFile();
-                getLog().debug("Using module file: " + moduleFile);
-            }
+//            if (module != null) {
+//                Artifact artifact = resolveArtifact(module.getGroupId(), module.getArtifactId(), module.getType());
+//                if (artifact == null) {
+//                    throw new MojoExecutionException("Could not resolve module " + module.getGroupId() + ":" + module.getArtifactId() + ":" + module.getType() + ". Perhaps it is not listed as a dependency");
+//                }
+//                moduleFile = artifact.getFile();
+//                getLog().debug("Using module file: " + moduleFile);
+//            }
 
 
-            generateExplicitVersionProperties(explicitResolutionProperties, dependencyArtifacts);
+//            generateExplicitVersionProperties(explicitResolutionProperties, dependencyArtifacts);
 
             //
             // NOTE: Install a local lookup, so that the cached kernel can resolve based on the current project
             //       and not the project where the kernel was first initialized.
             //
-            lookupHolder.set(new ArtifactLookupImpl());
+//            lookupHolder.set(new ArtifactLookupImpl());
 
-            if (bootstrap) {
-                executeBootShell();
-            } else {
-                buildPackage();
-            }
+//            if (bootstrap) {
+//                executeBootShell();
+//            } else {
+//                buildPackage();
+//            }
         } catch (Exception e) {
             throw new MojoExecutionException("could not package plugin", e);
-        } finally {
-            cleanup();
+//        } finally {
+//            cleanup();
         }
     }
 
-    private File getArtifactInRepositoryDir() {
-        //
-        // HACK: Generate the filename in the repo... really should delegate this to the repo impl
-        //
-
-        File dir = new File(targetRepository, project.getGroupId().replace('.', '/'));
-        dir = new File(dir, project.getArtifactId());
-        dir = new File(dir, project.getVersion());
-        dir = new File(dir, project.getArtifactId() + "-" + project.getVersion() + ".car");
-
-        return dir;
-    }
-
-    public void executeBootShell() throws Exception {
-        getLog().debug("Starting bootstrap shell...");
-
-        PluginBootstrap2 boot = new PluginBootstrap2();
-
-        boot.setBuildDir(outputDirectory);
-        boot.setCarFile(getArtifactInRepositoryDir());
-        boot.setLocalRepo(repository);
-        boot.setPlan(planFile);
-        Framework framework = getFramework();
-        BundleContext bundleContext = framework.getBundleContext();
-        boot.setBundleContext(bundleContext);
-
-        // Keep the same behavior with RepositoryConfigurationStore
-        boot.setExpanded(false);
-
-        boot.bootstrap();
-    }
+//    private File getArtifactInRepositoryDir() {
+//        //
+//        // HACK: Generate the filename in the repo... really should delegate this to the repo impl
+//        //
+//
+//        File dir = new File(targetRepository, project.getGroupId().replace('.', '/'));
+//        dir = new File(dir, project.getArtifactId());
+//        dir = new File(dir, project.getVersion());
+//        dir = new File(dir, project.getArtifactId() + "-" + project.getVersion() + ".car");
+//
+//        return dir;
+//    }
+
+//    public void executeBootShell() throws Exception {
+//        getLog().debug("Starting bootstrap shell...");
+//
+//        PluginBootstrap2 boot = new PluginBootstrap2();
+//
+//        boot.setBuildDir(outputDirectory);
+//        boot.setCarFile(getArtifactInRepositoryDir());
+//        boot.setLocalRepo(repository);
+//        boot.setPlan(planFile);
+//        Framework framework = getFramework();
+//        BundleContext bundleContext = framework.getBundleContext();
+//        boot.setBundleContext(bundleContext);
+//
+//        // Keep the same behavior with RepositoryConfigurationStore
+//        boot.setExpanded(false);
+//
+//        boot.bootstrap();
+//    }
 
     //
     // Deployment
     //
 
-    private static final String KERNEL_NAME = "geronimo.maven";
-
-    /**
-     * Reference to the kernel that will last the lifetime of this classloader.
-     * The KernelRegistry keeps soft references that may be garbage collected.
-     */
-    private Kernel kernel;
-
-    private AbstractName targetConfigStoreAName;
-
-    private AbstractName targetRepositoryAName;
-
-    private boolean targetSet;
-
+//    private static final String KERNEL_NAME = "geronimo.maven";
+//
+//    /**
+//     * Reference to the kernel that will last the lifetime of this classloader.
+//     * The KernelRegistry keeps soft references that may be garbage collected.
+//     */
+//    private Kernel kernel;
+//
+//    private AbstractName targetConfigStoreAName;
+//
+//    private AbstractName targetRepositoryAName;
+//
+//    private boolean targetSet;
+//
     public void buildPackage() throws Exception {
         getLog().info("Packaging module configuration: " + planFile);
 
-        Kernel kernel = createKernel();
-        if (!targetSet) {
-            kernel.stopGBean(targetRepositoryAName);
-            kernel.setAttribute(targetRepositoryAName, "root", targetRepository.toURI());
-            kernel.startGBean(targetRepositoryAName);
-
-            if (kernel.getGBeanState(targetConfigStoreAName) != State.RUNNING_INDEX) {
-                throw new IllegalStateException("After restarted repository then config store is not running");
-            }
-
-            targetSet = true;
-        }
-
-        getLog().debug("Starting configurations..." + Arrays.asList(deploymentConfigs));
-
-        // start the Configuration we're going to use for this deployment
-        ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
-
-        DependencyManager dependencyManager = kernel.getGBean(DependencyManager.class);
+//        Kernel kernel = createKernel();
+//        if (!targetSet) {
+//            kernel.stopGBean(targetRepositoryAName);
+//            kernel.setAttribute(targetRepositoryAName, "root", targetRepository.toURI());
+//            kernel.startGBean(targetRepositoryAName);
+//
+//            if (kernel.getGBeanState(targetConfigStoreAName) != State.RUNNING_INDEX) {
+//                throw new IllegalStateException("After restarted repository then config store is not running");
+//            }
+//
+//            targetSet = true;
+//        }
+//
+//        getLog().debug("Starting configurations..." + Arrays.asList(deploymentConfigs));
+//
+//        // start the Configuration we're going to use for this deployment
+//        ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+//
+//        DependencyManager dependencyManager = kernel.getGBean(DependencyManager.class);
         //Register ConfigurationExtender Listener
 //        ConfigurationExtender configurationExtender = new ConfigurationExtender(configurationManager, dependencyManager, bundleContext);
 //        configurationExtender.doStart();
 
-        try {
-            for (String artifactName : deploymentConfigs) {
-                org.apache.geronimo.kernel.repository.Artifact configName = org.apache.geronimo.kernel.repository.Artifact.create(artifactName);
-                if (!configurationManager.isLoaded(configName)) {
-                    RecordingLifecycleMonitor monitor = new RecordingLifecycleMonitor();
-                    try {
-                        configurationManager.loadConfiguration(configName, monitor);
-                    } catch (LifecycleException e) {
-                        getLog().error("Could not load deployer configuration: " + configName + "\n" + monitor.toString(), e);
-                    }
-                    monitor = new RecordingLifecycleMonitor();
-                    try {
-                        configurationManager.startConfiguration(configName, monitor);
-                        getLog().info("Started deployer: " + configName);
-                    } catch (LifecycleException e) {
-                        getLog().error("Could not start deployer configuration: " + configName + "\n" + monitor.toString(), e);
-                    }
-                }
-            }
-        } finally {
-            ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager);
-        }
-
-        getLog().debug("Deploying...");
+//        try {
+//            for (String artifactName : deploymentConfigs) {
+//                org.apache.geronimo.kernel.repository.Artifact configName = org.apache.geronimo.kernel.repository.Artifact.create(artifactName);
+//                if (!configurationManager.isLoaded(configName)) {
+//                    RecordingLifecycleMonitor monitor = new RecordingLifecycleMonitor();
+//                    try {
+//                        configurationManager.loadConfiguration(configName, monitor);
+//                    } catch (LifecycleException e) {
+//                        getLog().error("Could not load deployer configuration: " + configName + "\n" + monitor.toString(), e);
+//                    }
+//                    monitor = new RecordingLifecycleMonitor();
+//                    try {
+//                        configurationManager.startConfiguration(configName, monitor);
+//                        getLog().info("Started deployer: " + configName);
+//                    } catch (LifecycleException e) {
+//                        getLog().error("Could not start deployer configuration: " + configName + "\n" + monitor.toString(), e);
+//                    }
+//                }
+//            }
+//        } finally {
+//            ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager);
+//        }
 
-        AbstractName deployer = locateDeployer(kernel);
-        invokeDeployer(kernel, deployer, targetConfigStoreAName.toString());
-        //use a fresh kernel for each module
-//        configurationExtender.doStop();
-//        kernel.shutdown();
-        kernel = null;
-        bundleContext.ungetService(kernelReference);
-        bundleContext.getBundle().stop();
-        bundleContext = null;
+//        getLog().debug("Deploying...");
+//
+//        AbstractName deployer = locateDeployer(kernel);
+//        invokeDeployer(kernel, deployer, targetConfigStoreAName.toString());
+//        //use a fresh kernel for each module
+////        configurationExtender.doStop();
+////        kernel.shutdown();
+//        kernel = null;
+//        bundleContext.ungetService(kernelReference);
+//        bundleContext.getBundle().stop();
+//        bundleContext = null;
     }
 
     /**
      * Create a Geronimo Kernel to contain the deployment configurations.
      */
-    private synchronized Kernel createKernel() throws Exception {
-        // first return our cached version
-//        if (kernel != null) {
-//            return kernel;
-//        }
-        getLog().debug("Creating kernel...");
-
-        // check the registry in case someone else created one
-//        kernel = KernelRegistry.getKernel(KERNEL_NAME);
-//        if (kernel != null) {
-//            return kernel;
-//        }
-
-        // boot one ourselves
-        bundleContext = getFramework().getBundleContext();
-
-//        kernel = KernelFactory.newInstance(bundleContext).createKernel(KERNEL_NAME);
-//        kernel.boot();
-        AbstractName sourceRepoName = bootDeployerSystem();
-        Dictionary dictionary = null;
-//        kernelRegistration = bundleContext.registerService(Kernel.class.getName(), kernel, dictionary);
-        kernelReference = bundleContext.getServiceReference(Kernel.class.getName());
-
-        return (Kernel) bundleContext.getService(kernelReference);
-    }
+//    private synchronized Kernel createKernel() throws Exception {
+//        // first return our cached version
+////        if (kernel != null) {
+////            return kernel;
+////        }
+//        getLog().debug("Creating kernel...");
+//
+//        // check the registry in case someone else created one
+////        kernel = KernelRegistry.getKernel(KERNEL_NAME);
+////        if (kernel != null) {
+////            return kernel;
+////        }
+//
+//        // boot one ourselves
+//        bundleContext = getFramework().getBundleContext();
+//
+////        kernel = KernelFactory.newInstance(bundleContext).createKernel(KERNEL_NAME);
+////        kernel.boot();
+//        AbstractName sourceRepoName = bootDeployerSystem();
+//        Dictionary dictionary = null;
+////        kernelRegistration = bundleContext.registerService(Kernel.class.getName(), kernel, dictionary);
+//        kernelReference = bundleContext.getServiceReference(Kernel.class.getName());
+//
+//        return (Kernel) bundleContext.getService(kernelReference);
+//    }
 
     /**
      * Boot the in-Maven deployment system.
@@ -387,89 +454,89 @@ public class PackageMojo extends Abstrac
      * the local maven installation.
      * </p>
      */
-    private AbstractName bootDeployerSystem() throws Exception {
-        getLog().debug("Booting deployer system...");
-
-        org.apache.geronimo.kernel.repository.Artifact baseId =
-                new org.apache.geronimo.kernel.repository.Artifact("geronimo", "packaging", "fixed", "car");
-        Naming naming = kernel.getNaming();
-        ConfigurationData bootstrap = new ConfigurationData(baseId, naming);
-        ClassLoader cl = getClass().getClassLoader();
-        Set<AbstractName> repoNames = new HashSet<AbstractName>();
-
-        //
-        // NOTE: Install an adapter for the source repository that will leverage the Maven2 repository subsystem
-        //       to allow for better handling of SNAPSHOT values.
-        //
-        GBeanData repoGBean = bootstrap.addGBean("SourceRepository", GBeanInfo.getGBeanInfo(Maven2RepositoryAdapter.class.getName(), bundleContext.getBundle()));
-        Maven2RepositoryAdapter.ArtifactLookup lookup = new Maven2RepositoryAdapter.ArtifactLookup() {
-            private Maven2RepositoryAdapter.ArtifactLookup getDelegate() {
-                return lookupHolder.get();
-            }
-
-            public File getBasedir() {
-                return getDelegate().getBasedir();
-            }
-
-            public File getLocation(final org.apache.geronimo.kernel.repository.Artifact artifact) {
-                return getDelegate().getLocation(artifact);
-            }
-        };
-        repoGBean.setAttribute("lookup", lookup);
-        repoGBean.setAttribute("dependencies", dependencyArtifacts);
-        repoNames.add(repoGBean.getAbstractName());
-
-        // Target repo
-        GBeanData targetRepoGBean = bootstrap.addGBean("TargetRepository", GBeanInfo.getGBeanInfo(Maven2Repository.class.getName(), bundleContext.getBundle()));
-        URI targetRepositoryURI = targetRepository.toURI();
-        targetRepoGBean.setAttribute("root", targetRepositoryURI);
-        repoNames.add(targetRepoGBean.getAbstractName());
-        targetRepositoryAName = targetRepoGBean.getAbstractName();
-
-        GBeanData artifactManagerGBean = bootstrap.addGBean("ArtifactManager", DefaultArtifactManager.GBEAN_INFO);
-        GBeanData artifactResolverGBean = bootstrap.addGBean("ArtifactResolver", ExplicitDefaultArtifactResolver.class);
-        artifactResolverGBean.setAttribute("versionMapLocation", explicitResolutionProperties.getAbsolutePath());
-        ReferencePatterns repoPatterns = new ReferencePatterns(repoNames);
-        artifactResolverGBean.setReferencePatterns("Repositories", repoPatterns);
-        artifactResolverGBean.setReferencePattern("ArtifactManager", artifactManagerGBean.getAbstractName());
-
-        GBeanData dependencyManager = bootstrap.addGBean("DependencyManager", DependencyManager.class);
-        dependencyManager.setReferencePattern("Repositories", repoGBean.getAbstractName());
-        dependencyManager.setReferencePattern("ArtifactResolver", artifactResolverGBean.getAbstractName());
-
-        Set storeNames = new HashSet();
-
-        // Source config store
-        GBeanInfo configStoreInfo = GBeanInfo.getGBeanInfo(MavenConfigStore.class.getName(), bundleContext.getBundle());
-        GBeanData storeGBean = bootstrap.addGBean("ConfigStore", configStoreInfo);
-        if (configStoreInfo.getReference("Repository") != null) {
-            storeGBean.setReferencePattern("Repository", repoGBean.getAbstractName());
-        }
-        storeNames.add(storeGBean.getAbstractName());
-
-        // Target config store
-        GBeanInfo targetConfigStoreInfo = GBeanInfo.getGBeanInfo(RepositoryConfigurationStore.class.getName(), bundleContext.getBundle());
-        GBeanData targetStoreGBean = bootstrap.addGBean("TargetConfigStore", targetConfigStoreInfo);
-        if (targetConfigStoreInfo.getReference("Repository") != null) {
-            targetStoreGBean.setReferencePattern("Repository", targetRepoGBean.getAbstractName());
-        }
-        storeNames.add(targetStoreGBean.getAbstractName());
-
-        targetConfigStoreAName = targetStoreGBean.getAbstractName();
-        targetSet = true;
-
-        GBeanData attrManagerGBean = bootstrap.addGBean("AttributeStore", MavenAttributeStore.GBEAN_INFO);
-        GBeanData configManagerGBean = bootstrap.addGBean("ConfigManager", KernelConfigurationManager.class);
-        configManagerGBean.setReferencePatterns("Stores", new ReferencePatterns(storeNames));
-        configManagerGBean.setReferencePattern("AttributeStore", attrManagerGBean.getAbstractName());
-        configManagerGBean.setReferencePattern("ArtifactManager", artifactManagerGBean.getAbstractName());
-        configManagerGBean.setReferencePattern("ArtifactResolver", artifactResolverGBean.getAbstractName());
-        configManagerGBean.setReferencePatterns("Repositories", repoPatterns);
-
-        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, bundleContext);
-
-        return repoGBean.getAbstractName();
-    }
+//    private AbstractName bootDeployerSystem() throws Exception {
+//        getLog().debug("Booting deployer system...");
+//
+//        org.apache.geronimo.kernel.repository.Artifact baseId =
+//                new org.apache.geronimo.kernel.repository.Artifact("geronimo", "packaging", "fixed", "car");
+//        Naming naming = kernel.getNaming();
+//        ConfigurationData bootstrap = new ConfigurationData(baseId, naming);
+//        ClassLoader cl = getClass().getClassLoader();
+//        Set<AbstractName> repoNames = new HashSet<AbstractName>();
+//
+//        //
+//        // NOTE: Install an adapter for the source repository that will leverage the Maven2 repository subsystem
+//        //       to allow for better handling of SNAPSHOT values.
+//        //
+//        GBeanData repoGBean = bootstrap.addGBean("SourceRepository", GBeanInfo.getGBeanInfo(Maven2RepositoryAdapter.class.getName(), bundleContext.getBundle()));
+//        Maven2RepositoryAdapter.ArtifactLookup lookup = new Maven2RepositoryAdapter.ArtifactLookup() {
+//            private Maven2RepositoryAdapter.ArtifactLookup getDelegate() {
+//                return lookupHolder.get();
+//            }
+//
+//            public File getBasedir() {
+//                return getDelegate().getBasedir();
+//            }
+//
+//            public File getLocation(final org.apache.geronimo.kernel.repository.Artifact artifact) {
+//                return getDelegate().getLocation(artifact);
+//            }
+//        };
+//        repoGBean.setAttribute("lookup", lookup);
+//        repoGBean.setAttribute("dependencies", dependencyArtifacts);
+//        repoNames.add(repoGBean.getAbstractName());
+//
+//        // Target repo
+//        GBeanData targetRepoGBean = bootstrap.addGBean("TargetRepository", GBeanInfo.getGBeanInfo(Maven2Repository.class.getName(), bundleContext.getBundle()));
+//        URI targetRepositoryURI = targetRepository.toURI();
+//        targetRepoGBean.setAttribute("root", targetRepositoryURI);
+//        repoNames.add(targetRepoGBean.getAbstractName());
+//        targetRepositoryAName = targetRepoGBean.getAbstractName();
+//
+//        GBeanData artifactManagerGBean = bootstrap.addGBean("ArtifactManager", DefaultArtifactManager.GBEAN_INFO);
+//        GBeanData artifactResolverGBean = bootstrap.addGBean("ArtifactResolver", ExplicitDefaultArtifactResolver.class);
+//        artifactResolverGBean.setAttribute("versionMapLocation", explicitResolutionProperties.getAbsolutePath());
+//        ReferencePatterns repoPatterns = new ReferencePatterns(repoNames);
+//        artifactResolverGBean.setReferencePatterns("Repositories", repoPatterns);
+//        artifactResolverGBean.setReferencePattern("ArtifactManager", artifactManagerGBean.getAbstractName());
+//
+//        GBeanData dependencyManager = bootstrap.addGBean("DependencyManager", DependencyManager.class);
+//        dependencyManager.setReferencePattern("Repositories", repoGBean.getAbstractName());
+//        dependencyManager.setReferencePattern("ArtifactResolver", artifactResolverGBean.getAbstractName());
+//
+//        Set storeNames = new HashSet();
+//
+//        // Source config store
+//        GBeanInfo configStoreInfo = GBeanInfo.getGBeanInfo(MavenConfigStore.class.getName(), bundleContext.getBundle());
+//        GBeanData storeGBean = bootstrap.addGBean("ConfigStore", configStoreInfo);
+//        if (configStoreInfo.getReference("Repository") != null) {
+//            storeGBean.setReferencePattern("Repository", repoGBean.getAbstractName());
+//        }
+//        storeNames.add(storeGBean.getAbstractName());
+//
+//        // Target config store
+//        GBeanInfo targetConfigStoreInfo = GBeanInfo.getGBeanInfo(RepositoryConfigurationStore.class.getName(), bundleContext.getBundle());
+//        GBeanData targetStoreGBean = bootstrap.addGBean("TargetConfigStore", targetConfigStoreInfo);
+//        if (targetConfigStoreInfo.getReference("Repository") != null) {
+//            targetStoreGBean.setReferencePattern("Repository", targetRepoGBean.getAbstractName());
+//        }
+//        storeNames.add(targetStoreGBean.getAbstractName());
+//
+//        targetConfigStoreAName = targetStoreGBean.getAbstractName();
+//        targetSet = true;
+//
+//        GBeanData attrManagerGBean = bootstrap.addGBean("AttributeStore", MavenAttributeStore.GBEAN_INFO);
+//        GBeanData configManagerGBean = bootstrap.addGBean("ConfigManager", KernelConfigurationManager.class);
+//        configManagerGBean.setReferencePatterns("Stores", new ReferencePatterns(storeNames));
+//        configManagerGBean.setReferencePattern("AttributeStore", attrManagerGBean.getAbstractName());
+//        configManagerGBean.setReferencePattern("ArtifactManager", artifactManagerGBean.getAbstractName());
+//        configManagerGBean.setReferencePattern("ArtifactResolver", artifactResolverGBean.getAbstractName());
+//        configManagerGBean.setReferencePatterns("Repositories", repoPatterns);
+//
+//        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, bundleContext);
+//
+//        return repoGBean.getAbstractName();
+//    }
 
     /**
      * Locate a Deployer GBean matching the deployerName pattern.
@@ -478,56 +545,31 @@ public class PackageMojo extends Abstrac
      * @return the ObjectName of the Deployer GBean
      * @throws IllegalStateException if there is not exactly one GBean matching the deployerName pattern
      */
-    private AbstractName locateDeployer(final Kernel kernel) {
-        AbstractName name = new AbstractName(URI.create(deployerName));
-
-        Iterator i = kernel.listGBeans(new AbstractNameQuery(name)).iterator();
-        if (!i.hasNext()) {
-            throw new IllegalStateException("No deployer found matching deployerName: " + name);
-        }
-
-        AbstractName deployer = (AbstractName) i.next();
-        if (i.hasNext()) {
-            throw new IllegalStateException("Multiple deployers found matching deployerName: " + name);
-        }
-
-        return deployer;
-    }
-
-    private static final String[] DEPLOY_SIGNATURE = {
-            boolean.class.getName(),
-            File.class.getName(),
-            File.class.getName(),
-            File.class.getName(),
-            Boolean.TYPE.getName(),
-            String.class.getName(),
-            String.class.getName(),
-            String.class.getName(),
-            String.class.getName(),
-            String.class.getName(),
-            String.class.getName(),
-            String.class.getName(),
-            String.class.getName(),
+//    private AbstractName locateDeployer(final Kernel kernel) {
+//        AbstractName name = new AbstractName(URI.create(deployerName));
+//
+//        Iterator i = kernel.listGBeans(new AbstractNameQuery(name)).iterator();
+//        if (!i.hasNext()) {
+//            throw new IllegalStateException("No deployer found matching deployerName: " + name);
+//        }
+//
+//        AbstractName deployer = (AbstractName) i.next();
+//        if (i.hasNext()) {
+//            throw new IllegalStateException("Multiple deployers found matching deployerName: " + name);
+//        }
+//
+//        return deployer;
+//    }
+
+    private static final Class[] DEPLOY_SIGNATURE = {
+            boolean.class,
+            File.class,
+            File.class
     };
 
-    private List invokeDeployer(final Kernel kernel, final AbstractName deployer, final String targetConfigStore) throws Exception {
-        Object[] args = {
-                Boolean.FALSE, // Not in-place
-                moduleFile,
-                planFile,
-                null, // Target file
-                Boolean.TRUE, // Install
-                null, // main-class
-                null, // main-gbean
-                null, // main-method
-                null, // Manifest configurations
-                null, // class-path
-                null, // endorsed-dirs
-                null, // extension-dirs
-                targetConfigStore
-        };
-
-        return (List) kernel.invoke(deployer, "deploy", args, DEPLOY_SIGNATURE);
+    private List<String> invokeDeployer(Object deployer, final String targetConfigStore) throws Exception {
+        Method m = deployer.getClass().getMethod("deploy", DEPLOY_SIGNATURE);
+        return (List<String>) m.invoke(deployer, new Object[] {Boolean.FALSE, moduleFile, planFile});
     }
 
 }



Mime
View raw message