[jboss-cvs] JBossAS SVN: r82506 - in projects/webbeans-ri-int/trunk: microcontainer and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-12-23 05:46:56 -0500 (Tue, 23 Dec 2008)
New Revision: 82506

Modified:
   projects/webbeans-ri-int/trunk/jbossas/pom.xml
   projects/webbeans-ri-int/trunk/microcontainer/pom.xml
   projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryEnvironment.java
Log:
Fix dependencies.

Modified: projects/webbeans-ri-int/trunk/jbossas/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/pom.xml	2008-12-23 10:46:15 UTC (rev 82505)
+++ projects/webbeans-ri-int/trunk/jbossas/pom.xml	2008-12-23 10:46:56 UTC (rev 82506)
@@ -15,7 +15,32 @@
   <dependencies>
   
     <!-- Global dependencies -->
+        
     <dependency>
+      <groupId>org.jboss.webbeans</groupId>
+      <artifactId>webbeans-ri-spi</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+     <groupId>org.jboss</groupId>
+     <artifactId>jboss-vfs</artifactId>
+     <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-common</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
       <groupId>org.jboss.webbeans.integration</groupId>
       <artifactId>webbeans-ri-int-microcontainer</artifactId>
     </dependency>
@@ -173,30 +198,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.webbeans</groupId>
-      <artifactId>webbeans-ri-spi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
-     <groupId>org.jboss</groupId>
-     <artifactId>jboss-vfs</artifactId>
-     <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
   </dependencies>  
 </project>

Modified: projects/webbeans-ri-int/trunk/microcontainer/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/pom.xml	2008-12-23 10:46:15 UTC (rev 82505)
+++ projects/webbeans-ri-int/trunk/microcontainer/pom.xml	2008-12-23 10:46:56 UTC (rev 82506)
@@ -28,10 +28,6 @@
   <dependencies>
   
     <!-- Global dependencies -->
-    <dependency>
-      <groupId>org.jboss.webbeans</groupId>
-      <artifactId>webbeans-ri-spi</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.jboss</groupId>

Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryEnvironment.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryEnvironment.java	2008-12-23 10:46:15 UTC (rev 82505)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryEnvironment.java	2008-12-23 10:46:56 UTC (rev 82506)
@@ -26,7 +26,7 @@
 import java.util.Set;
 
 /**
- * WBD impl.
+ * WBD env impl.
  * 
  * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
  */
@@ -35,21 +35,41 @@
    private Set<Class<?>> classes = new HashSet<Class<?>>();
    private Set<URL> urls = new HashSet<URL>();
 
-   public void addWebBeanClass(Class<?> clazz)
+   /**
+    * Add wb class.
+    *
+    * @param clazz the wb class
+    */
+   void addWebBeanClass(Class<?> clazz)
    {
       classes.add(clazz);
    }
 
-   public void addWebBeansXmlURL(URL url)
+   /**
+    * Add wb xml url.
+    *
+    * @param url the wb xml url
+    */
+   void addWebBeansXmlURL(URL url)
    {
       urls.add(url);      
    }
 
+   /**
+    * Get wb classes.
+    *
+    * @return the wb classes
+    */
    public Iterable<Class<?>> getWebBeanClasses()
    {
       return classes;
    }
 
+   /**
+    * Get wb xmls.
+    *
+    * @return the wb xmls
+    */
    public Iterable<URL> getWebBeansXml()
    {
       return urls;