[gatein-commits] gatein SVN: r1784 - in components/wsrp/trunk/admin-gui: src/main/java/org/gatein/wsrp/admin/ui and 1 other directory.

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2010-02-19 09:52:25 -0500 (Fri, 19 Feb 2010)
New Revision: 1784

Modified:
   components/wsrp/trunk/admin-gui/pom.xml
   components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
   components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java
   components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java
Log:
- GTNWSRP-3: Removed dependency on eXo kernel as services should be injected at the integration point, not component level.

Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml	2010-02-19 14:47:04 UTC (rev 1783)
+++ components/wsrp/trunk/admin-gui/pom.xml	2010-02-19 14:52:25 UTC (rev 1784)
@@ -21,7 +21,8 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <parent>
       <groupId>org.gatein.wsrp</groupId>
       <artifactId>wsrp-parent</artifactId>
@@ -80,12 +81,6 @@
          <artifactId>jsf-facelets</artifactId>
          <version>1.1.15</version>
       </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.container</artifactId>
-         <scope>provided</scope>
-         <version>2.2.0-Beta06</version>
-      </dependency>
    </dependencies>
 
    <!-- Disable some tests for now until we can find some time to work on migrating them -->

Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java	2010-02-19 14:47:04 UTC (rev 1783)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java	2010-02-19 14:52:25 UTC (rev 1784)
@@ -23,7 +23,6 @@
 
 package org.gatein.wsrp.admin.ui;
 
-import org.exoplatform.container.ExoContainerContext;
 import org.gatein.wsrp.WSRPConsumer;
 import org.gatein.wsrp.consumer.EndpointConfigurationInfo;
 import org.gatein.wsrp.consumer.ProducerInfo;
@@ -478,11 +477,6 @@
 
    public ConsumerRegistry getRegistry()
    {
-      // todo: fix this, the registry needs to be injected more cleanly
-      if (registry == null)
-      {
-         registry = (ConsumerRegistry)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ConsumerRegistry.class);
-      }
       return registry;
    }
 }

Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java	2010-02-19 14:47:04 UTC (rev 1783)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java	2010-02-19 14:52:25 UTC (rev 1784)
@@ -23,7 +23,6 @@
 
 package org.gatein.wsrp.admin.ui;
 
-import org.exoplatform.container.ExoContainerContext;
 import org.gatein.common.util.ParameterValidation;
 import org.gatein.pc.api.PortletInvokerException;
 import org.gatein.wsrp.WSRPConsumer;
@@ -63,11 +62,6 @@
 
    public ConsumerRegistry getRegistry()
    {
-      // todo: fix this, the registry needs to be injected more cleanly
-      if (registry == null)
-      {
-         registry = (ConsumerRegistry)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ConsumerRegistry.class);
-      }
       return registry;
    }
 

Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java	2010-02-19 14:47:04 UTC (rev 1783)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java	2010-02-19 14:52:25 UTC (rev 1784)
@@ -23,7 +23,6 @@
 
 package org.gatein.wsrp.admin.ui;
 
-import org.exoplatform.container.ExoContainerContext;
 import org.gatein.registration.RegistrationPolicy;
 import org.gatein.registration.policies.DefaultRegistrationPolicy;
 import org.gatein.wsrp.producer.config.ProducerConfiguration;
@@ -57,11 +56,6 @@
 
    public ProducerConfigurationService getConfigurationService()
    {
-      // todo: fix this, the configuration service needs to be injected more cleanly
-      if (configurationService == null)
-      {
-         configurationService = (ProducerConfigurationService)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ProducerConfigurationService.class);
-      }
       return configurationService;
    }