geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1100289 - in /geronimo/server/branches/3.0-osgi: framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/ plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/ plugins/j2ee/j...
Date Fri, 06 May 2011 17:14:08 GMT
Author: djencks
Date: Fri May  6 17:14:07 2011
New Revision: 1100289

URL: http://svn.apache.org/viewvc?rev=1100289&view=rev
Log:
tweaks, builds through geronimo-openejb

Modified:
    geronimo/server/branches/3.0-osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/J2EEServer.java
    geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
    geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml
    geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-server/src/main/plan/plan.xml
    geronimo/server/branches/3.0-osgi/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
    geronimo/server/branches/3.0-osgi/plugins/jasper/jasper-deployer/pom.xml
    geronimo/server/branches/3.0-osgi/plugins/jasper/jasper/pom.xml
    geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces-builder/pom.xml
    geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
    geronimo/server/branches/3.0-osgi/plugins/myfaces/myfaces-deployer/pom.xml
    geronimo/server/branches/3.0-osgi/plugins/myfaces/myfaces/pom.xml
    geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java

Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/J2EEServer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/J2EEServer.java?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/J2EEServer.java
(original)
+++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/J2EEServer.java
Fri May  6 17:14:07 2011
@@ -103,11 +103,6 @@ public interface J2EEServer extends org.
     public KeystoreManager getKeystoreManager();
 
     /**
-     * Gets the ConfigurationManager associated with this J2EEServer.
-     */
-    public ConfigurationManager getConfigurationManager();
-
-    /**
      * Gets the applications currently running in this J2EEServer.
      */
     J2EEApplication[] getApplications();

Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
(original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
Fri May  6 17:14:07 2011
@@ -26,7 +26,6 @@ import org.apache.geronimo.gbean.GBeanIn
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.ObjectNameUtil;
-import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.repository.ListableRepository;
 import org.apache.geronimo.kernel.repository.WritableListableRepository;
 import org.apache.geronimo.management.AppClientModule;
@@ -68,7 +67,6 @@ public class J2EEServerImpl implements J
     private final Collection writableRepos;
     private final Collection securityRealms;
     private final Collection keystoreManagers;
-    private final ConfigurationManager configurationManager;
 
     public J2EEServerImpl(String objectName,
                           ServerInfo serverInfo,
@@ -86,8 +84,7 @@ public class J2EEServerImpl implements J
                           Collection repositories,
                           Collection writableRepos,
                           Collection securityRealms,
-                          Collection keystoreManagers,
-                          ConfigurationManager configurationManager) {
+                          Collection keystoreManagers) {
 
         this.objectName = objectName;
         ObjectName myObjectName = ObjectNameUtil.getObjectName(this.objectName);
@@ -112,7 +109,6 @@ public class J2EEServerImpl implements J
         this.writableRepos = writableRepos;
         this.securityRealms = securityRealms;
         this.keystoreManagers = keystoreManagers;
-        this.configurationManager = configurationManager;
     }
 
     public String getObjectName() {
@@ -267,9 +263,6 @@ public class J2EEServerImpl implements J
         return (KeystoreManager) keystoreManagers.iterator().next();
     }
 
-    public ConfigurationManager getConfigurationManager() {
-        return configurationManager;
-    }
 
     public String getServerVendor() {
         return SERVER_VENDOR;
@@ -300,7 +293,6 @@ public class J2EEServerImpl implements J
         infoFactory.addReference("WritableRepos", WritableListableRepository.class);
         infoFactory.addReference("SecurityRealms", SecurityRealm.class);
         infoFactory.addReference("KeystoreManagers", KeystoreManager.class);
-        infoFactory.addReference("ConfigurationManager", ConfigurationManager.class);
 
         infoFactory.setConstructor(new String[]{
                 "objectName",
@@ -320,7 +312,6 @@ public class J2EEServerImpl implements J
                 "WritableRepos",
                 "SecurityRealms",
                 "KeystoreManagers",
-                "ConfigurationManager",
         });
 
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml Fri May  6 17:14:07
2011
@@ -45,12 +45,12 @@
              <type>xml</type>
              <classifier>features</classifier>
          </dependency>
-         <dependency>
-             <groupId>org.apache.geronimo.framework.feature</groupId>
-             <artifactId>server-security-config</artifactId>
-             <version>${project.version}</version>
-             <type>kar</type>
-         </dependency>
+         <!--<dependency>-->
+             <!--<groupId>org.apache.geronimo.framework.feature</groupId>-->
+             <!--<artifactId>server-security-config</artifactId>-->
+             <!--<version>${project.version}</version>-->
+             <!--<type>kar</type>-->
+         <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.feature</groupId>
             <artifactId>org.apache.geronimo.javaee-specs</artifactId>
@@ -173,7 +173,7 @@
                         <feature>org.apache.geronimo.jaxb-support</feature>
                         <feature>org.apache.geronimo.javaee-specs</feature>
                         <feature>j2ee-system</feature>
-                        <feature>server-security-config</feature>
+                        <!--<feature>server-security-config</feature>-->
                     </features>
                     <category>JavaEE deployment</category>
                     <instance>

Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-server/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-server/src/main/plan/plan.xml?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-server/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-server/src/main/plan/plan.xml Fri
May  6 17:14:07 2011
@@ -69,9 +69,9 @@
         <reference name="WritableRepos"/>
         <reference name="SecurityRealms"/>
         <reference name="KeystoreManagers"/>
-        <reference name="ConfigurationManager">
-            <name>ConfigurationManager</name>
-        </reference>
+        <!--<reference name="ConfigurationManager">-->
+            <!--<name>ConfigurationManager</name>-->
+        <!--</reference>-->
     </gbean>
 
     <gbean name="JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl">

Modified: geronimo/server/branches/3.0-osgi/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
(original)
+++ geronimo/server/branches/3.0-osgi/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
Fri May  6 17:14:07 2011
@@ -63,6 +63,7 @@ import org.apache.geronimo.web.info.Serv
 import org.apache.geronimo.web.info.WebAppInfo;
 import org.apache.geronimo.web25.deployment.AbstractWebModuleBuilder;
 import org.apache.geronimo.web25.deployment.WebAppInfoBuilder;
+import org.apache.geronimo.web25.deployment.model.WebAppType;
 import org.apache.openejb.jee.JaxbJavaee;
 import org.apache.openejb.jee.JspConfig;
 import org.apache.openejb.jee.JspPropertyGroup;
@@ -72,7 +73,6 @@ import org.apache.openejb.jee.Taglib;
 import org.apache.openejb.jee.TldTaglib;
 import org.apache.openejb.jee.WebApp;
 import org.apache.xbean.finder.ClassFinder;
-import org.apache.xmlbeans.XmlObject;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
@@ -133,7 +133,7 @@ public class JspModuleBuilderExtension i
         //TODO Only merge if we detect jsps???
         EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
 
-        WebModule webModule = (WebModule) module;
+        WebModule<WebAppType> webModule = (WebModule<WebAppType>) module;
         WebApp webApp = webModule.getSpecDD();
 
         EARContext moduleContext = module.getEarContext();
@@ -150,7 +150,7 @@ public class JspModuleBuilderExtension i
         Holder holder = NamingBuilder.INJECTION_KEY.get(sharedContext);
         buildingContext.put(NamingBuilder.INJECTION_KEY, holder);
 
-        XmlObject jettyWebApp = webModule.getVendorDD();
+        WebAppType jettyWebApp = webModule.getVendorDD();
 
         Set<String> listenerNames = new HashSet<String>();
 

Modified: geronimo/server/branches/3.0-osgi/plugins/jasper/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/jasper/jasper-deployer/pom.xml?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/jasper/jasper-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/jasper/jasper-deployer/pom.xml Fri May  6 17:14:07
2011
@@ -37,6 +37,20 @@
 
     <dependencies>
         <dependency>
+             <groupId>org.apache.geronimo.framework.feature</groupId>
+             <artifactId>j2ee-system</artifactId>
+             <version>${project.version}</version>
+             <type>xml</type>
+             <classifier>features</classifier>
+         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.feature</groupId>
+            <artifactId>org.apache.geronimo.javaee-specs</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>javaee-builder-support</artifactId>
             <version>${project.version}</version>
@@ -70,19 +84,26 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>org.apache.geronimo.configs/javaee-builder-support/${project.version}/car</deploymentConfig>
-                    </deploymentConfigs>
+                    <features>
+                        <feature>declarative-services</feature>
+                        <feature>org.apache.geronimo.jaxb-support</feature>
+                        <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>j2ee-system</feature>
+                        <!--<feature>server-security-config</feature>-->
+                    </features>
+                    <!--<deploymentConfigs>-->
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
+                        <!--<deploymentConfig>org.apache.geronimo.configs/javaee-builder-support/${project.version}/car</deploymentConfig>-->
+                    <!--</deploymentConfigs>-->
                     <category>JavaEE deployment</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jasper</artifactId>
-                            <type>car</type>
-                            <import>classes</import>
-                        </dependency>
-                    </dependencies>
+                    <!--<dependencies>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                            <!--<artifactId>jasper</artifactId>-->
+                            <!--<type>car</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                    <!--</dependencies>-->
                     <instance>
                         <plugin-artifact>
                             <config-xml-content server="default" />

Modified: geronimo/server/branches/3.0-osgi/plugins/jasper/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/jasper/jasper/pom.xml?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/jasper/jasper/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/jasper/jasper/pom.xml Fri May  6 17:14:07 2011
@@ -36,34 +36,27 @@
     <description>Geronimo Jasper jsp integration including injection support.</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>server-security-config</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-1_6</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>j2ee-server</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>server-security-config</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>transaction-1_6</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces-builder/pom.xml?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces-builder/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces-builder/pom.xml Fri
May  6 17:14:07 2011
@@ -41,6 +41,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web-2.5-builder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-web</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
(original)
+++ geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
Fri May  6 17:14:07 2011
@@ -73,6 +73,7 @@ import org.apache.geronimo.myfaces.info.
 import org.apache.geronimo.myfaces.webapp.GeronimoStartupServletContextListener;
 import org.apache.geronimo.myfaces.webapp.MyFacesWebAppContext;
 import org.apache.geronimo.web.info.WebAppInfo;
+import org.apache.geronimo.web25.deployment.model.WebAppType;
 import org.apache.myfaces.config.annotation.AnnotationConfigurator;
 import org.apache.myfaces.config.element.FacesConfig;
 import org.apache.myfaces.config.element.ManagedBean;
@@ -89,7 +90,6 @@ import org.apache.xbean.osgi.bundle.util
 import org.apache.xbean.osgi.bundle.util.BundleResourceFinder.ResourceFinderCallback;
 import org.apache.xbean.osgi.bundle.util.DiscoveryRange;
 import org.apache.xbean.osgi.bundle.util.ResourceDiscoveryFilter;
-import org.apache.xmlbeans.XmlObject;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.packageadmin.PackageAdmin;
@@ -159,7 +159,7 @@ public class MyFacesModuleBuilderExtensi
             //not a web module, nothing to do
             return;
         }
-        WebModule webModule = (WebModule) module;
+        WebModule<WebAppType> webModule = (WebModule<WebAppType>) module;
         WebApp webApp = webModule.getSpecDD();
         if (!hasFacesServlet(webApp)) {
             return;
@@ -184,7 +184,7 @@ public class MyFacesModuleBuilderExtensi
             //not a web module, nothing to do
             return;
         }
-        WebModule webModule = (WebModule) module;
+        WebModule<WebAppType> webModule = (WebModule<WebAppType>) module;
         WebApp webApp = webModule.getSpecDD();
         if (!hasFacesServlet(webApp)) {
             return;
@@ -213,7 +213,7 @@ public class MyFacesModuleBuilderExtensi
         Holder holder = NamingBuilder.INJECTION_KEY.get(sharedContext);
         buildingContext.put(NamingBuilder.INJECTION_KEY, holder);
 
-        XmlObject jettyWebApp = webModule.getVendorDD();
+        WebAppType jettyWebApp = webModule.getVendorDD();
 
         //Parse default web application faces configuration file WEB-INF/faces-config.xml
         FacesConfig webAppFacesConfig = getWebAppFacesConfig(webModule);

Modified: geronimo/server/branches/3.0-osgi/plugins/myfaces/myfaces-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/myfaces/myfaces-deployer/pom.xml?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/myfaces/myfaces-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/myfaces/myfaces-deployer/pom.xml Fri May  6
17:14:07 2011
@@ -34,6 +34,20 @@
     <packaging>car</packaging>
     
     <dependencies>
+        <dependency>
+             <groupId>org.apache.geronimo.framework.feature</groupId>
+             <artifactId>j2ee-system</artifactId>
+             <version>${project.version}</version>
+             <type>xml</type>
+             <classifier>features</classifier>
+         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.feature</groupId>
+            <artifactId>org.apache.geronimo.javaee-specs</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -62,15 +76,22 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>declarative-services</feature>
+                        <feature>org.apache.geronimo.jaxb-support</feature>
+                        <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>j2ee-system</feature>
+                        <!--<feature>server-security-config</feature>-->
+                    </features>
                     <category>Web Framework</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>myfaces</artifactId>
-                            <type>car</type>
-                            <import>classes</import>
-                        </dependency>
-                    </dependencies>
+                    <!--<dependencies>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                            <!--<artifactId>myfaces</artifactId>-->
+                            <!--<type>car</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                    <!--</dependencies>-->
                     <instance>
                         <plugin-artifact>
                             <config-xml-content server="default" />

Modified: geronimo/server/branches/3.0-osgi/plugins/myfaces/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/myfaces/myfaces/pom.xml?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/myfaces/myfaces/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/myfaces/myfaces/pom.xml Fri May  6 17:14:07
2011
@@ -36,12 +36,6 @@
     <description>Geronimo MyFaces jsf integration</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
 
         <!-- parent -->
         <dependency>

Modified: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java?rev=1100289&r1=1100288&r2=1100289&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
(original)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
Fri May  6 17:14:07 2011
@@ -31,7 +31,7 @@ import org.apache.geronimo.kernel.manage
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.server.ServerService;
 import org.apache.openejb.server.ServiceManager;
-import org.osgi.framework.BundleContext;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 import org.osgi.util.tracker.ServiceTrackerCustomizer;
@@ -48,8 +48,7 @@ public class EjbDaemonGBean implements G
 
     private final Kernel kernel;
     private final AbstractName name;
-    private final BundleContext bundleContext;
-    private final ClassLoader classLoader;
+    private final Bundle bundle;
     private ServiceTracker tracker;
     private ServiceManager serviceManager;
 
@@ -63,20 +62,19 @@ public class EjbDaemonGBean implements G
 
                           @ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
                           @ParamSpecial(type = SpecialAttributeType.abstractName) AbstractName
name,
-                          @ParamSpecial(type = SpecialAttributeType.bundleContext) final
BundleContext bundleContext,
+                          @ParamSpecial(type = SpecialAttributeType.bundle) final Bundle
bundle,
                           @ParamSpecial(type = SpecialAttributeType.classLoader) ClassLoader
classLoader) throws Exception {
         System.setProperty("openejb.nobanner", "true");
         this.kernel = kernel;
         this.name = name;
-        this.bundleContext = bundleContext;
-        this.classLoader = classLoader;
+        this.bundle = bundle;
 
         serviceManager = ServiceManager.getManager();
 
-        tracker = new ServiceTracker(bundleContext, ServerService.class.getName(), new ServiceTrackerCustomizer()
{
+        tracker = new ServiceTracker(bundle.getBundleContext(), ServerService.class.getName(),
new ServiceTrackerCustomizer() {
 
             public Object addingService(ServiceReference reference) {
-                ServerService service = (ServerService) bundleContext.getService(reference);
+                ServerService service = (ServerService) bundle.getBundleContext().getService(reference);
                 return addServerService(service);
             }
 
@@ -136,7 +134,7 @@ public class EjbDaemonGBean implements G
         GBeanData connectorData = new GBeanData(beanName, ServerServiceGBean.getGBeanInfo());
 
         try {
-            kernel.loadGBean(connectorData, bundleContext);
+            kernel.loadGBean(connectorData, bundle);
             kernel.startRecursiveGBean(beanName);
 
             ServerServiceGBean connectorGBean = (ServerServiceGBean) kernel.getGBean(beanName);



Mime
View raw message