geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221390 [1/8] - in /geronimo/server/trunk: ./ framework/buildsupport/car-maven-plugin/ framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/buildsupport/car-maven-plugin/src/main/resources/M...
Date Tue, 20 Dec 2011 18:05:05 GMT
Author: djencks
Date: Tue Dec 20 18:04:59 2011
New Revision: 1221390

URL: http://svn.apache.org/viewvc?rev=1221390&view=rev
Log:
GERONIMO-6240 Make several base geronimo functions (kernel, deployer, etc) DS services and make the car-maven-plugin take advantage of that.  Server assembly doesn't work yet, builds framework.

Added:
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerImpl.java
      - copied, changed from r1221389, geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/wrapper/
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/wrapper/AbstractServiceWrapper.java   (with props)
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/command/
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/command/KernelCommandSupport.java   (with props)
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/command/ListGBeansCommand.java   (with props)
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManagerGBean.java   (with props)
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationStoreGBean.java   (with props)
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/RepositoryGBean.java   (with props)
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/resources/OSGI-INF/
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/resources/OSGI-INF/blueprint/
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/resources/OSGI-INF/blueprint/kernel-command.xml   (with props)
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalPluginAttributeStoreGBean.java   (with props)
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolverGBean.java   (with props)
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/ServerInfoGBean.java   (with props)
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/ServerInfoWrapper.java   (with props)
Removed:
    geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/framework/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/AbstractNameConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/AbstractNameQueryConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/ConfigurationDataConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/ConfigurationModuleTypeConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/DomConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/GBeanDataConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/ImportTypeConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/QNameConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/URIConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/VersionConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/XStreamConfigurationMarshaler.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/XStreamGBeanState.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/XStreamGBeanStateConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/XStreamUtil.java
Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
    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/ArchiveCarMojo.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.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/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/maven/plugin.xml
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
    geronimo/server/trunk/framework/configs/bundle-recorder/pom.xml
    geronimo/server/trunk/framework/configs/bundle-recorder/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/client-system/pom.xml
    geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.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/history/dependencies.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-deploymentfactory/pom.xml
    geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
    geronimo/server/trunk/framework/configs/online-deployer/pom.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/server-security-config/pom.xml
    geronimo/server/trunk/framework/configs/shutdown/pom.xml
    geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/framework/pom.xml
    geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/pom.xml
    geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.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-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/Kernel.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/KernelGBean.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicDependencyManager.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/basic/BasicKernelFactory.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationStore.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/config/KernelConfigurationManager.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/ConfigurationActivator.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/KernelActivator.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactManager.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/Speed.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/runtime/GBeanDependencyTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/BootstrapTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/ConfigTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/GBeanTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/SimpleGBeanTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationManagerTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationUtilTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/EditableKernelConfigurationManagerTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
    geronimo/server/trunk/framework/modules/geronimo-management/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompGBeanTest.java
    geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java
    geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java
    geronimo/server/trunk/framework/modules/geronimo-obr/src/main/java/org/apache/geronimo/obr/GeronimoOBRGBean.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ServerInstanceData.java
    geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/AbstractTest.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
    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/GBeanBuilder.java
    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/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
    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/LocalAttributeManager.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/PluginAttributeStore.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/configuration/SwitchableLocalAttributeManager.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PluginXmlUtil.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/AliasedArtifactResolver.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/serverinfo/ServerInfoTest.java
    geronimo/server/trunk/framework/modules/testsupport-common/pom.xml
    geronimo/server/trunk/framework/plugingroups/framework/pom.xml
    geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/plugingroups/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml
    geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml
    geronimo/server/trunk/plugins/axis/axis/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2/pom.xml
    geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml
    geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml
    geronimo/server/trunk/plugins/client/client-security/pom.xml
    geronimo/server/trunk/plugins/client/client/pom.xml
    geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml
    geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml
    geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml
    geronimo/server/trunk/plugins/clustering/clustering/pom.xml
    geronimo/server/trunk/plugins/clustering/farming/pom.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
    geronimo/server/trunk/plugins/console/console-jetty/pom.xml
    geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
    geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
    geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
    geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
    geronimo/server/trunk/plugins/j2ee/javaee-builder-support/pom.xml
    geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
    geronimo/server/trunk/plugins/jasper/jasper/pom.xml
    geronimo/server/trunk/plugins/javamail/javamail/pom.xml
    geronimo/server/trunk/plugins/jetty8/jetty8-deployer/pom.xml
    geronimo/server/trunk/plugins/jetty8/jetty8/pom.xml
    geronimo/server/trunk/plugins/mejb/mejb/pom.xml
    geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml
    geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-ds/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml
    geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb/pom.xml
    geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml
    geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
    geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml
    geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml
    geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/pom.xml
    geronimo/server/trunk/plugins/sharedlib/sharedlib/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
    geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
    geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml
    geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml
    geronimo/server/trunk/plugins/wink/wink/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Tue Dec 20 18:04:59 2011
@@ -41,58 +41,58 @@
     </description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-jaxb_2.2_spec</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>jaxb-impl</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-stax-api_1.2_spec</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>woodstox-core-asl</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>stax2-api</artifactId>        
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.codehaus.woodstox</groupId>-->
+            <!--<artifactId>stax2-api</artifactId>        -->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-activation_1.1_spec</artifactId>-->
+        <!--</dependency>-->
         <!-- try to make javax.transaction classes loadable during build -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-jta_1.1_spec</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-hook</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-hook</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-common</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-system</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -106,11 +106,11 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-service-builder</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -130,27 +130,27 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-transformer</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-transformer</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-main</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.yoko</groupId>
-            <artifactId>yoko-spec-corba</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-main</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+        <!---->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.yoko</groupId>-->
+            <!--<artifactId>yoko-spec-corba</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.yoko</groupId>
-            <artifactId>yoko-rmi-spec</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.yoko</groupId>-->
+            <!--<artifactId>yoko-rmi-spec</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -223,20 +223,20 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>commons-cli</groupId>-->
+            <!--<artifactId>commons-cli</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.servicemix.bundles</groupId>-->
+            <!--<artifactId>org.apache.servicemix.bundles.xstream</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.servicemix.bundles</groupId>-->
+            <!--<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.sonatype.gossip</groupId>
@@ -268,20 +268,32 @@
             <groupId>org.apache.karaf</groupId>
             <artifactId>org.apache.karaf.main</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-mvn</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.ops4j.pax.url</groupId>-->
+            <!--<artifactId>pax-url-mvn</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.karaf.tooling</groupId>
             <artifactId>karaf-maven-plugin</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.utils</artifactId>
+            <version>1.1.0</version>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <showDeprecation>false</showDeprecation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
                 <version>2.9</version>
                 <configuration>

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=1221390&r1=1221389&r2=1221390&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 Dec 20 18:04:59 2011
@@ -23,6 +23,7 @@ import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.lang.*;
 import java.lang.reflect.Field;
 import java.util.Collections;
 import java.util.HashMap;
@@ -35,6 +36,7 @@ import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.LinkedHashMap;
 import java.util.ArrayList;
+import java.util.concurrent.CountDownLatch;
 
 import org.apache.geronimo.system.plugin.model.ArtifactType;
 import org.apache.geronimo.system.plugin.model.DependencyType;
@@ -65,10 +67,17 @@ import org.apache.maven.shared.filtering
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkEvent;
+import org.osgi.framework.FrameworkListener;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
 import org.osgi.framework.launch.Framework;
 import org.osgi.framework.launch.FrameworkFactory;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
+import org.osgi.framework.startlevel.FrameworkStartLevel;
 
 /**
  * Support for <em>packaging</em> Mojos.
@@ -705,7 +714,12 @@ public abstract class AbstractCarMojo
         Main main = new Main(new String[] {});
         try {
             main.launch();
-            return main.getFramework();
+            Framework framework = main.getFramework();
+            FrameworkStartLevel frameworkStartLevel = framework.adapt(FrameworkStartLevel.class);
+            while (frameworkStartLevel.getStartLevel() < 100) {
+                Thread.sleep(100l);
+            }
+            return framework;
         } catch (Exception e) {
             if (1 == 1) {
                 throw new BundleException("Could not start karaf framwork", e);
@@ -1064,4 +1078,75 @@ public abstract class AbstractCarMojo
             e.printStackTrace();
         }
     }
+
+    protected void listBundles(BundleContext ctx) {
+        StringBuilder b = new StringBuilder("Bundles:");
+        for (Bundle bundle: ctx.getBundles()) {
+            b.append("\n   Id:").append(bundle.getBundleId()).append("  status:").append(bundle.getState()).append("  ").append(bundle.getLocation());
+        }
+        getLog().info(b.toString());
+    }
+
+    protected void waitForBundles(BundleContext ctx, long timeout) throws MojoExecutionException {
+        long done = System.currentTimeMillis() + timeout;
+        while (done > System.currentTimeMillis()) {
+            boolean allStarted = true;
+            for (Bundle bundle: ctx.getBundles()) {
+                if (bundle.getState() != 32  && notFragment(bundle)) {
+                    allStarted = false;
+                    break;
+                }
+                if (allStarted) {
+                    return;
+                }
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+
+                }
+            }
+        }
+        listBundles(ctx);
+        throw new MojoExecutionException("Cant start all the bundles");
+    }
+
+    protected boolean notFragment(Bundle bundle) {
+        return bundle.getHeaders().get(Constants.FRAGMENT_HOST) == null;
+    }
+
+    protected Object getService(BundleContext ctx, String clazzName, String filter, long initialTimeout) throws MojoExecutionException {
+//        String filter = null;
+//        if (componentName != null) {
+//            filter = "(osgi.service.blueprint.compname=" + componentName + ")";
+//        }
+        long timeout = initialTimeout;
+        while (timeout > 0) {
+            ServiceReference sr = null;
+            if (filter == null) {
+                sr = ctx.getServiceReference(clazzName);
+            } else {
+                ServiceReference[] refs;
+                try {
+                    refs = ctx.getServiceReferences(clazzName, filter);
+                } catch (InvalidSyntaxException e) {
+                    throw new MojoExecutionException("filter syntax problem", e);
+                }
+                if (refs != null && refs.length == 1) {
+                    sr = refs[0];
+                }
+            }
+            if (sr != null) {
+//                services.add(sr);
+                return ctx.getService(sr);
+            }
+            try {
+                Thread.sleep(100L);
+            } catch (InterruptedException e) {
+                throw new MojoExecutionException("Interrupted waiting for service " + clazzName + " at " + (initialTimeout - timeout)/1000 + " seconds");
+            }
+            timeout = timeout - 100;
+        }
+        throw new MojoExecutionException("Could not get service " + clazzName + " in " + initialTimeout/1000 + " seconds");
+    }
+
 }

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java Tue Dec 20 18:04:59 2011
@@ -30,7 +30,6 @@ import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
 import org.apache.geronimo.kernel.osgi.ConfigurationActivator;
-import org.apache.geronimo.system.osgi.BootActivator;
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.Artifact;
@@ -288,12 +287,12 @@ public class ArchiveCarMojo
                     ZipEntry importTxtEntry = includedJarFile.getEntry("META-INF/imports.txt");
                     if (importTxtEntry != null) {
                         StringBuilder imports = new StringBuilder("org.apache.geronimo.kernel.osgi,");
-                        if (boot) {
-                            archive.addManifestEntry(Constants.BUNDLE_ACTIVATOR, BootActivator.class.getName());
-                            imports.append("org.apache.geronimo.system.osgi,");
-                        } else {
+//                        if (boot) {
+//                            archive.addManifestEntry(Constants.BUNDLE_ACTIVATOR, BootActivator.class.getName());
+//                            imports.append("org.apache.geronimo.system.osgi,");
+//                        } else {
                             archive.addManifestEntry(Constants.BUNDLE_ACTIVATOR, ConfigurationActivator.class.getName());
-                        }
+//                        }
                         archive.addManifestEntry(Constants.BUNDLE_NAME, project.getName());
                         archive.addManifestEntry(Constants.BUNDLE_VENDOR, project.getOrganization().getName());
                         ArtifactVersion version = project.getArtifact().getSelectedVersion();

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java Tue Dec 20 18:04:59 2011
@@ -137,8 +137,10 @@ public class DependencyChangeMojo extend
                             removed.getDependency().add(test);
                         }
                     }
+
+                    File treeListing = saveTreeListing();
                     if (!added.isEmpty() || !removed.getDependency().isEmpty()) {
-                        saveDependencyChanges(added, removed);
+                        saveDependencyChanges(added, removed, treeListing);
                         if (overwriteChangedDependencies) {
                             writeDependencies(toPluginArtifactType(dependencies),  dependencyFile);
                         }
@@ -156,7 +158,7 @@ public class DependencyChangeMojo extend
         }
     }
 
-    protected void saveDependencyChanges(Collection<DependencyType> dependencies, PluginArtifactType removed)
+    protected void saveDependencyChanges(Collection<DependencyType> dependencies, PluginArtifactType removed, File treeListing)
             throws Exception {
         File addedFile = new File(filteredDependencyFile.getParentFile(), "dependencies.added.xml");
         PluginArtifactType added = toPluginArtifactType(dependencies);
@@ -164,9 +166,7 @@ public class DependencyChangeMojo extend
 
         File removedFile = new File(filteredDependencyFile.getParentFile(), "dependencies.removed.xml");
         writeDependencies(removed,  removedFile);
-        
-        File treeListing = saveTreeListing();
-        
+
         StringWriter out = new StringWriter();
         out.write("Dependencies have changed:\n");
         if (!added.getDependency().isEmpty()) {

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Tue Dec 20 18:04:59 2011
@@ -177,7 +177,12 @@ public class InstallModulesMojo extends 
         DownloadResults downloadPoller = new DownloadResults();
         String targetServerPath = targetServerDirectory.getAbsolutePath();
 
-        Kernel kernel = new BasicKernel("Assembly", bundleContext);
+        Kernel kernel = null;
+        try {
+            kernel = new BasicKernel("Assembly", bundleContext);
+        } catch (Exception e) {
+            throw new MojoExecutionException("Could not create kernel", e);
+        }
         PluginRepositoryList pluginRepoList = new PluginRepositoryDownloader(Collections.singletonMap(localRepo, (String[]) null), true);
         try {
             PluginInstallerGBean installer = new PluginInstallerGBean(targetRepositoryPath, targetServerPath, installedPluginsList, servers, pluginRepoList, kernel, bundleContext);

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=1221390&r1=1221389&r2=1221390&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 Dec 20 18:04:59 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=1221390&r1=1221389&r2=1221390&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 Dec 20 18:04:59 2011
@@ -20,55 +20,37 @@
 package org.apache.geronimo.mavenplugins.car;
 
 import java.io.File;
-import java.net.URI;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
+import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Collections;
-import java.util.Dictionary;
 
-import org.apache.geronimo.mavenplugins.car.PluginBootstrap2;
+import org.apache.felix.utils.manifest.Attribute;
+import org.apache.felix.utils.manifest.Clause;
+import org.apache.felix.utils.manifest.Directive;
+import org.apache.felix.utils.manifest.Parser;
+import org.apache.felix.utils.version.VersionRange;
+import org.apache.geronimo.deployment.ConfigurationBuilder;
+import org.apache.geronimo.deployment.Deployer;
 import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.ReferencePatterns;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelFactory;
-import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.kernel.Naming;
-import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.KernelConfigurationManager;
-import org.apache.geronimo.kernel.config.LifecycleException;
-import org.apache.geronimo.kernel.config.RecordingLifecycleMonitor;
-import org.apache.geronimo.system.configuration.DependencyManager;
-import org.apache.geronimo.kernel.management.State;
-import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
-import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
-import org.apache.geronimo.system.repository.Maven2Repository;
-import org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.util.FileUtils;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.framework.launch.Framework;
+import org.osgi.framework.BundleException;
+import org.osgi.service.packageadmin.ExportedPackage;
+import org.osgi.service.packageadmin.PackageAdmin;
 
 /**
  * Build a Geronimo Configuration using the local Maven infrastructure.
  *
+ * @version $Rev$ $Date$
  * @goal package
  * @requiresDependencyResolution compile
- *
- * @version $Rev$ $Date$
  */
 public class PackageMojo extends AbstractCarMojo {
 
@@ -91,9 +73,9 @@ public class PackageMojo extends Abstrac
     private File repository = null;
 
     /**
-     * The Geronimo repository where modules will be packaged up from.
+     * The karaf repository where modules will be packaged up from.
      *
-     * @parameter expression="${project.build.directory}/repository"
+     * @parameter expression="${project.build.directory}/assembly/system"
      * @required
      */
     private File targetRepository = null;
@@ -101,7 +83,7 @@ public class PackageMojo extends Abstrac
     /**
      * The default deployer module to be used when no other deployer modules are configured.
      *
-     * @parameter expression="org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car"
+     * @parameter expression="org.apache.geronimo.framework/j2ee-system/${geronimoVersion}/car"
      * @required
      * @readonly
      */
@@ -192,8 +174,8 @@ public class PackageMojo extends Abstrac
     public void execute() throws MojoExecutionException, MojoFailureException {
         try {
             // We need to make sure to clean up any previous work first or this operation will fail
-            FileUtils.forceDelete(targetRepository);
-            FileUtils.forceMkdir(targetRepository);
+//            FileUtils.forceDelete(targetRepository);
+//            FileUtils.forceMkdir(targetRepository);
 
             if (!planFile.exists()) {
                 return;
@@ -201,11 +183,11 @@ public class PackageMojo extends Abstrac
 
             // Use the default configs if none specified
             if (deploymentConfigs == null) {
-                if (bootstrap) {
+//                if (bootstrap) {
                     deploymentConfigs = new String[]{};
-                } else {
-                    deploymentConfigs = new String[]{defaultDeploymentConfig};
-                }
+//                } else {
+//                    deploymentConfigs = new String[]{defaultDeploymentConfig};
+//                }
             }
             getLog().debug("Deployment configs: " + Arrays.asList(deploymentConfigs));
 
@@ -229,11 +211,7 @@ public class PackageMojo extends Abstrac
             //
             lookupHolder.set(new ArtifactLookupImpl());
 
-            if (bootstrap) {
-                executeBootShell();
-            } else {
-                buildPackage();
-            }
+            buildPackage();
         } catch (Exception e) {
             throw new MojoExecutionException("could not package plugin", e);
         } finally {
@@ -242,36 +220,41 @@ public class PackageMojo extends Abstrac
     }
 
     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;
+        org.apache.geronimo.kernel.repository.Artifact geronimoArtifact = mavenToGeronimoArtifact(project.getArtifact());
+        org.apache.geronimo.kernel.repository.Maven2Repository repo = new org.apache.geronimo.kernel.repository.Maven2Repository(targetRepository);
+        return repo.getLocation(geronimoArtifact);
+
+//        //
+//        // 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();
-    }
+//    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
@@ -283,7 +266,7 @@ public class PackageMojo extends Abstrac
      * 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 Kernel kernel;
 
     private AbstractName targetConfigStoreAName;
 
@@ -294,234 +277,323 @@ public class PackageMojo extends Abstrac
     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);
         try {
+            getLog().debug("Creating kernel...");
+            bundleContext = getFramework().getBundleContext();
+            waitForBundles(bundleContext, 20000l);
+            listBundles(bundleContext);
+
+            getLog().debug("Starting configurations..." + Arrays.asList(deploymentConfigs));
+
+            // start the Configuration we're going to use for this deployment
+            Object configurationManager = getService(bundleContext, ConfigurationManager.class.getName(), null, 10000l);
+            ClassLoader cl = configurationManager.getClass().getClassLoader();
+            Class artifactClass = cl.loadClass("org.apache.geronimo.kernel.repository.Artifact");
+            Method create = artifactClass.getMethod("create", String.class);
+            Method isLoaded = configurationManager.getClass().getMethod("isLoaded", artifactClass);
+            Class monitorClass = cl.loadClass("org.apache.geronimo.kernel.config.LifecycleMonitor");
+            Class recordingLifecycleMonitorClass = cl.loadClass("org.apache.geronimo.kernel.config.RecordingLifecycleMonitor");
+            Method loadConfiguration = configurationManager.getClass().getMethod("loadConfiguration", artifactClass, monitorClass);
+            Method startConfiguration = configurationManager.getClass().getMethod("startConfiguration", artifactClass, monitorClass);
+
+            //add a repo pointing to maven local repo
+            Class m2repoClass = cl.loadClass("org.apache.geronimo.kernel.repository.Maven2Repository");
+            Constructor m2repoConstructor = m2repoClass.getConstructor(File.class);
+            Object m2repo = m2repoConstructor.newInstance(repository);
+            Class repoClass = cl.loadClass("org.apache.geronimo.kernel.repository.Repository");
+            bundleContext.registerService(repoClass, m2repo, null);
+//            Method bindMethod = configurationManager.getClass().getMethod("bindRepository", repoClass);
+//            bindMethod.invoke(configurationManager, m2repo);
+
             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();
+                Object configName = create.invoke(null, artifactName);// org.apache.geronimo.kernel.repository.Artifact.create(artifactName);
+                if (!(Boolean) isLoaded.invoke(configurationManager, configName)) { //.isLoaded(configName)) {
+                    Object monitor = recordingLifecycleMonitorClass.newInstance();//new RecordingLifecycleMonitor();
                     try {
-                        configurationManager.loadConfiguration(configName, monitor);
-                    } catch (LifecycleException e) {
+                        loadConfiguration.invoke(configurationManager, configName, monitor);
+//                        configurationManager.loadConfiguration(configName, monitor);
+                    } catch (Exception e) {
                         getLog().error("Could not load deployer configuration: " + configName + "\n" + monitor.toString(), e);
                     }
-                    monitor = new RecordingLifecycleMonitor();
+                    monitor = recordingLifecycleMonitorClass.newInstance();//new RecordingLifecycleMonitor();
                     try {
-                        configurationManager.startConfiguration(configName, monitor);
+                        startConfiguration.invoke(configurationManager, configName, monitor);
+//                        configurationManager.startConfiguration(configName, monitor);
                         getLog().info("Started deployer: " + configName);
-                    } catch (LifecycleException e) {
+                    } catch (Exception e) {
                         getLog().error("Could not start deployer configuration: " + configName + "\n" + monitor.toString(), e);
                     }
                 }
             }
-        } finally {
-            ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager);
-        }
 
-        getLog().debug("Deploying...");
+            Object kernel = getService(bundleContext, "org.apache.geronimo.kernel.Kernel", null, 10000l);
+            Method list = kernel.getClass().getMethod("listGBeans", cl.loadClass("org.apache.geronimo.gbean.AbstractNameQuery"));
+            Collection results = (Collection) list.invoke(kernel, (Object)null);
+            for (Object o: results) {
+                getLog().info("  " + o);
+            }
 
-        AbstractName deployer = locateDeployer(kernel);
-        invokeDeployer(kernel, deployer, targetConfigStoreAName.toString());
+            getLog().debug("Deploying...");
+
+            getService(bundleContext, ConfigurationBuilder.class.getName(), null, 10000l);
+            Object deployer = getService(bundleContext, Deployer.class.getName(), null, 10000l);
+            invokeDeployer(deployer, null);
+        } catch (Exception e) {
+            getLog().info("Exception, use console to investigate ", e);
+            listBundles(bundleContext);
+            PackageAdmin admin = (PackageAdmin) getService(bundleContext, PackageAdmin.class.getName(), null, 1000l);
+//            for (Bundle b : bundleContext.getBundles()) {
+//                int state = b.getState();
+//                if (state != 32) {
+//                    try {
+//                        b.start();
+//                        getLog().info("trying to start " + b + " from state " + state + ", got to state " + b.getState());
+////                        getLog().info(headers(admin, b));
+//                    } catch (BundleException e1) {
+//                        getLog().info("Could not start " + b + e.getMessage());
+//                    }
+//                }
+//            }
+            listBundles(bundleContext);
+            while (1 == 1) {
+                try {
+                    Thread.sleep(1000L);
+                    if (bundleContext.getBundle().getState() != 32) {
+                        break;
+                    }
+                } catch (InterruptedException e1) {
+                    //exit
+                    break;
+                }
+            }
+            throw e;
+
+        }
         //use a fresh kernel for each module
-        kernel.shutdown();
-        kernel = null;
+//        kernel.shutdown();
+//        kernel = null;
         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;
-        ServiceRegistration kernelRegistration = bundleContext.registerService(Kernel.class.getName(), kernel, dictionary);
-
-        return kernel;
+    private String headers(PackageAdmin admin, Bundle b) {
+        StringBuilder buf = new StringBuilder();
+        String header = b.getHeaders().get("Import-Package");
+        formatHeader(header, buf, 3);
+        return buf.toString();
     }
 
-    /**
-     * Boot the in-Maven deployment system.
-     * <p/>
-     * <p>
-     * This contains Repository and ConfigurationStore GBeans that map to
-     * the local maven installation.
-     * </p>
-     */
-    private AbstractName bootDeployerSystem() throws Exception {
-        getLog().debug("Booting deployer system...");
+    protected void formatHeader(String header, StringBuilder builder, int indent) {
+        Clause[] clauses = Parser.parseHeader(header);
+        formatClauses(clauses, builder, indent);
+    }
 
-        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();
+    protected void formatClauses(Clause[] clauses, StringBuilder builder, int indent) {
+        boolean first = true;
+        for (Clause clause : clauses) {
+            if (first) {
+                first = false;
+            } else {
+                builder.append(",\n");
             }
+            formatClause(clause, builder, indent);
+        }
+    }
 
-            public File getBasedir() {
-                return getDelegate().getBasedir();
+    protected void formatClause(Clause clause, StringBuilder builder, int indent) {
+        if (indent < 0) {
+            indent = 3;
+        }
+        String name = clause.getName();
+        Directive[] directives = clause.getDirectives();
+        Attribute[] attributes = clause.getAttributes();
+        Arrays.sort(directives, new Comparator<Directive>() {
+            public int compare(Directive o1, Directive o2) {
+                return o1.getName().compareTo(o2.getName());
             }
-
-            public File getLocation(final org.apache.geronimo.kernel.repository.Artifact artifact) {
-                return getDelegate().getLocation(artifact);
+        });
+        Arrays.sort(attributes, new Comparator<Attribute>() {
+            public int compare(Attribute o1, Attribute o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+        });
+        builder.append(name);
+        for (int i = 0; directives != null && i < directives.length; i++) {
+            builder.append(";");
+            if (indent > 1) {
+                builder.append("\n\t\t");
+            }
+            builder.append(directives[i].getName()).append(":=");
+            String v = directives[i].getValue();
+            if (v.contains(",")) {
+                if (indent > 2 && v.length() > 20) {
+                    v = v.replace(",", ",\n\t\t\t");
+                }
+                builder.append("\"").append(v).append("\"");
+            } else {
+                builder.append(v);
             }
-        };
-        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());
+        for (int i = 0; attributes != null && i < attributes.length; i++) {
+            builder.append(";");
+            if (indent > 1) {
+                builder.append("\n\t\t");
+            }
+            builder.append(attributes[i].getName()).append("=");
+            String v = attributes[i].getValue();
+            if (v.contains(",")) {
+                if (indent > 2 && v.length() > 20) {
+                    v = v.replace(",", ",\n\t\t\t");
+                }
+                builder.append("\"").append(v).append("\"");
+            } else {
+                builder.append(v);
+            }
         }
-        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.
-     *
-     * @param kernel the kernel to search.
-     * @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);
+    private boolean checkPackage(PackageAdmin admin, String packageName, String version) {
+        VersionRange range = VersionRange.parseVersionRange(version);
+        if (admin != null) {
+            ExportedPackage[] packages = admin.getExportedPackages(packageName);
+            if (packages != null) {
+                for (ExportedPackage export : packages) {
+                    if (range.contains(export.getVersion())) {
+                        return true;
+                    }
+                }
+            }
         }
-
-        return deployer;
+        return false;
     }
 
-    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(),
+    /**
+     * Boot the in-Maven deployment system.
+     * <p/>
+     * <p>
+     * This contains Repository and ConfigurationStore GBeans that map to
+     * 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, configurationManager);
+//
+//        return repoGBean.getAbstractName();
+//    }
+
+    private static final Class[] DEPLOY_SIGNATURE = {
+            boolean.class,
+            File.class,
+            File.class,
+//            File.class,
+//            Boolean.TYPE,
+//            String.class,
+//            String.class,
+//            String.class,
+//            String.class,
+//            String.class,
+//            String.class,
+//            String.class,
+//            String.class,
     };
 
-    private List invokeDeployer(final Kernel kernel, final AbstractName deployer, final String targetConfigStore) throws Exception {
+    private List invokeDeployer(final Object 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
+//                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
+//                null //target config store (ignored)
         };
 
-        return (List) kernel.invoke(deployer, "deploy", args, DEPLOY_SIGNATURE);
+        Method m = deployer.getClass().getMethod("deploy", DEPLOY_SIGNATURE);
+        return (List) m.invoke(deployer, args);
     }
 
 }

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java Tue Dec 20 18:04:59 2011
@@ -31,7 +31,6 @@ import org.apache.geronimo.deployment.xb
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.system.osgi.BootActivator;
 import org.apache.geronimo.system.plugin.model.DependencyType;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -178,9 +177,9 @@ public class PlanProcessorMojo
         Environment newEnvironment = new Environment();
         newEnvironment.setConfigId(configId);
         newEnvironment.setDependencies(dependencies);
-        if (boot) {
-            newEnvironment.setBundleActivator(BootActivator.class.getName());
-        }
+//        if (boot) {
+//            newEnvironment.setBundleActivator(BootActivator.class.getName());
+//        }
 
         EnvironmentBuilder.mergeEnvironments(oldEnvironment, newEnvironment);
         EnvironmentType environmentType = EnvironmentBuilder.buildEnvironmentType(oldEnvironment);

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java Tue Dec 20 18:04:59 2011
@@ -86,10 +86,11 @@ public class PluginBootstrap2 {
 
         Maven2Repository repository = new Maven2Repository(localRepo);
         DependencyManager dm = new DependencyManager(bundleContext, Collections.<Repository>singleton(repository), null);
-        dm.doStart();
+//        dm.doStart();
 
         GBeanBuilder gBeanBuilder = new GBeanBuilder(null, null);
-        ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.<Repository>singleton(repository), Collections.<NamespaceDrivenBuilder>singleton(gBeanBuilder), new Jsr77Naming(), bundleContext);
+        ServiceConfigBuilder builder = new ServiceConfigBuilder();
+        //null, Collections.<Repository>singleton(repository), Collections.<NamespaceDrivenBuilder>singleton(gBeanBuilder), new Jsr77Naming(), bundleContext);
         ConfigurationStore targetConfigurationStore = new NullConfigurationStore() {
             public File createNewConfigurationDir(Artifact configId) throws ConfigurationAlreadyExistsException {
                 StringBuilder configurationPathBuilder = new StringBuilder("repository");

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/maven/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/maven/plugin.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/maven/plugin.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/maven/plugin.xml Tue Dec 20 18:04:59 2011
@@ -969,7 +969,7 @@ if the included module is a EBA applicat
         <escapeString implementation="java.lang.String">${maven.resources.escapeString}</escapeString>
         <resourcesDir implementation="java.io.File">${project.build.directory}/resources</resourcesDir>
         <basedir implementation="java.io.File">${basedir}</basedir>
-        <targetRepository implementation="java.io.File">${project.build.directory}/repository</targetRepository>
+        <targetRepository implementation="java.io.File">${project.build.directory}/assembly/system</targetRepository>
         <outputDirectory implementation="java.io.File">${project.build.directory}</outputDirectory>
         <explicitResolutionProperties implementation="java.io.File">${project.build.directory}/explicit-versions.properties</explicitResolutionProperties>
         <project implementation="org.apache.maven.project.MavenProject">${project}</project>
@@ -1192,10 +1192,10 @@ Probably don&apos;t want to change this.
         <deployerName implementation="java.lang.String">org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
         <escapeString implementation="java.lang.String">${maven.resources.escapeString}</escapeString>
         <basedir implementation="java.io.File">${basedir}</basedir>
-        <targetRepository implementation="java.io.File">${project.build.directory}/repository</targetRepository>
+        <targetRepository implementation="java.io.File">${project.build.directory}/assembly/system</targetRepository>
         <outputDirectory implementation="java.io.File">${project.build.directory}</outputDirectory>
         <explicitResolutionProperties implementation="java.io.File">${project.build.directory}/explicit-versions.properties</explicitResolutionProperties>
-        <defaultDeploymentConfig implementation="java.lang.String">org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</defaultDeploymentConfig>
+        <defaultDeploymentConfig implementation="java.lang.String">org.apache.geronimo.framework/j2ee-system/${geronimoVersion}/car</defaultDeploymentConfig>
         <project implementation="org.apache.maven.project.MavenProject">${project}</project>
         <planFile implementation="java.io.File">${project.build.directory}/work/plan.xml</planFile>
         <session implementation="org.apache.maven.execution.MavenSession">${session}</session>

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml Tue Dec 20 18:04:59 2011
@@ -54,6 +54,9 @@
                                 org.apache.geronimo.buildsupport:car-maven-plugin:package,
                                 org.apache.geronimo.buildsupport:car-maven-plugin:archive-car
                             </package>
+                            <!--<package>-->
+                                <!--org.apache.geronimo.buildsupport:car-maven-plugin:package-->
+                            <!--</package>-->
                             <install>
                                 org.apache.maven.plugins:maven-install-plugin:install,
                                 org.apache.geronimo.buildsupport:car-maven-plugin:update-pluginlist

Modified: geronimo/server/trunk/framework/configs/bundle-recorder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/bundle-recorder/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/bundle-recorder/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/bundle-recorder/pom.xml Tue Dec 20 18:04:59 2011
@@ -34,6 +34,34 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
+            <version>${project.version}</version>
+            <type>kar</type>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-bundle-recorder</artifactId>
             <version>${project.version}</version>



Mime
View raw message