Author: gerdogdu
Date: Sun Mar  7 00:14:46 2010
New Revision: 919894

URL: http://svn.apache.org/viewvc?rev=919894&view=rev
Log:
[OWB-320] Remove Java EE Dependencies from WebBeans Core

Removed:
    openwebbeans/trunk/samples/ejb-sample/src/main/resources/log4j.properties
    openwebbeans/trunk/samples/ejb-telephone/src/main/resources/log4j.properties
    openwebbeans/trunk/samples/guess/src/main/resources/log4j.properties
    openwebbeans/trunk/samples/jms-sample/src/main/resources/log4j.properties
    
openwebbeans/trunk/samples/standalone-sample/src/main/resources/META-INF/openwebbeans/
Modified:
    openwebbeans/trunk/pom.xml
    openwebbeans/trunk/samples/ejb-sample/pom.xml
    openwebbeans/trunk/samples/ejb-telephone/pom.xml
    openwebbeans/trunk/samples/guess/pom.xml
    openwebbeans/trunk/samples/jms-sample/pom.xml
    openwebbeans/trunk/samples/jsf2sample/pom.xml
    openwebbeans/trunk/samples/standalone-sample/pom.xml
    openwebbeans/trunk/samples/standalone-sample/src/assembly/dist-binary.xml
    
openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java
    openwebbeans/trunk/src/site/apt/index.apt

Modified: openwebbeans/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/pom.xml?rev=919894&r1=919893&r2=919894&view=diff
==============================================================================
--- openwebbeans/trunk/pom.xml (original)
+++ openwebbeans/trunk/pom.xml Sun Mar  7 00:14:46 2010
@@ -344,6 +344,9 @@
         <module>webbeans-jsf</module>
         <module>webbeans-resource</module>
         <module>webbeans-porting</module>
+        <module>webbeans-ee-common</module>
+        <module>webbeans-web</module>
+        <module>webbeans-ee</module>
         <module>samples</module>
         <module>atinject-tck</module>
         <!--<module>webbeans-tck</module>-->

Modified: openwebbeans/trunk/samples/ejb-sample/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-sample/pom.xml?rev=919894&r1=919893&r2=919894&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-sample/pom.xml (original)
+++ openwebbeans/trunk/samples/ejb-sample/pom.xml Sun Mar  7 00:14:46 2010
@@ -95,6 +95,13 @@
                        <version>${project.version}</version>
                </dependency>
                                
+               <!-- Web Plugin -->
+               <dependency>
+                       <groupId>org.apache.openwebbeans</groupId>
+                       <artifactId>openwebbeans-web</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+                                               
                <!-- MyFaces API -->
                <dependency>
                        <groupId>org.apache.myfaces.core</groupId>
@@ -148,13 +155,7 @@
                        <artifactId>geronimo-jpa_2.0_spec</artifactId>
                        <scope>provided</scope>
                </dependency>           
-                       
-                 <!-- Validator API -->
-                 <dependency>
-                         <groupId>org.apache.geronimo.specs</groupId>
-                          <artifactId>geronimo-validation_1.0_spec</artifactId>
-                  </dependency>
-       
+                               
        </dependencies>
 
 </project>

Modified: openwebbeans/trunk/samples/ejb-telephone/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-telephone/pom.xml?rev=919894&r1=919893&r2=919894&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-telephone/pom.xml (original)
+++ openwebbeans/trunk/samples/ejb-telephone/pom.xml Sun Mar  7 00:14:46 2010
@@ -86,6 +86,12 @@
                        <artifactId>openwebbeans-jsf</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               
+               <dependency>
+                       <groupId>org.apache.openwebbeans</groupId>
+                       <artifactId>openwebbeans-web</artifactId>
+                       <version>${project.version}</version>
+               </dependency>                   
                                
                <!-- MyFaces API -->
                <dependency>
@@ -141,12 +147,6 @@
                        <scope>provided</scope>
                </dependency>           
 
-        <!-- Validator API -->
-        <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                 <artifactId>geronimo-validation_1.0_spec</artifactId>
-         </dependency>
-       
        </dependencies>
 
 </project>

Modified: openwebbeans/trunk/samples/guess/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/pom.xml?rev=919894&r1=919893&r2=919894&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/pom.xml (original)
+++ openwebbeans/trunk/samples/guess/pom.xml Sun Mar  7 00:14:46 2010
@@ -69,6 +69,11 @@
                  <artifactId>openwebbeans-impl</artifactId>
                  <version>${project.version}</version>
          </dependency>
+         <dependency>
+               <groupId>org.apache.openwebbeans</groupId>
+               <artifactId>openwebbeans-web</artifactId>
+               <version>${project.version}</version>
+         </dependency>
 
                                
        </dependencies>
@@ -99,13 +104,6 @@
                                        
<artifactId>geronimo-interceptor_1.1_spec</artifactId>
                                </dependency>
 
-                               <!-- Validator API -->
-                               <dependency>
-                                       
<groupId>org.apache.geronimo.specs</groupId>
-                                       
<artifactId>geronimo-validation_1.0_spec</artifactId>
-                               </dependency>
-
-                               
                        </dependencies>
 
                        <build>

Modified: openwebbeans/trunk/samples/jms-sample/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jms-sample/pom.xml?rev=919894&r1=919893&r2=919894&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jms-sample/pom.xml (original)
+++ openwebbeans/trunk/samples/jms-sample/pom.xml Sun Mar  7 00:14:46 2010
@@ -48,6 +48,13 @@
                        <artifactId>openwebbeans-jsf</artifactId>
                </dependency>
                
+               <!-- Web Plugin -->
+               <dependency>
+                       <groupId>org.apache.openwebbeans</groupId>
+                       <artifactId>openwebbeans-web</artifactId>
+                       <version>${project.version}</version>
+               </dependency>           
+               
                <!-- MyFaces API -->
                <dependency>
                        <groupId>org.apache.myfaces.core</groupId>
@@ -74,16 +81,9 @@
                <dependency>
                        <groupId>org.apache.openwebbeans</groupId>
                        <artifactId>openwebbeans-jms</artifactId>
-                        <version>${project.version}</version>
+             <version>${project.version}</version>
                </dependency>                                   
 
-                 <!-- Validator API -->
-                 <dependency>
-                         <groupId>org.apache.geronimo.specs</groupId>
-                         <artifactId>geronimo-validation_1.0_spec</artifactId>
-                         <scope>provided</scope> 
-                  </dependency>
-       
                        
        </dependencies>
 

Modified: openwebbeans/trunk/samples/jsf2sample/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jsf2sample/pom.xml?rev=919894&r1=919893&r2=919894&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jsf2sample/pom.xml (original)
+++ openwebbeans/trunk/samples/jsf2sample/pom.xml Sun Mar  7 00:14:46 2010
@@ -50,6 +50,12 @@
                </dependency>
                
                <dependency>
+                       <groupId>org.apache.openwebbeans</groupId>
+                       <artifactId>openwebbeans-web</artifactId>
+                       <version>${project.version}</version>
+               </dependency>                   
+               
+               <dependency>
                        <groupId>javax.annotation</groupId>
                        <artifactId>jsr250-api</artifactId>
                        <version>1.0</version>

Modified: openwebbeans/trunk/samples/standalone-sample/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/standalone-sample/pom.xml?rev=919894&r1=919893&r2=919894&view=diff
==============================================================================
--- openwebbeans/trunk/samples/standalone-sample/pom.xml (original)
+++ openwebbeans/trunk/samples/standalone-sample/pom.xml Sun Mar  7 00:14:46 
2010
@@ -46,18 +46,6 @@
                        <optional>true</optional>
                </dependency>
 
-               <dependency>
-                       <groupId>org.apache.geronimo.specs</groupId>
-                       <artifactId>geronimo-jta_1.1_spec</artifactId>
-                       <optional>true</optional>
-               </dependency>
-
-                 <!-- Validator API -->
-                 <dependency>
-                         <groupId>org.apache.geronimo.specs</groupId>
-                         <artifactId>geronimo-validation_1.0_spec</artifactId>
-                         <optional>true</optional> 
-                  </dependency>
 
                 <dependency>
                         <groupId>org.apache.geronimo.specs</groupId>

Modified: 
openwebbeans/trunk/samples/standalone-sample/src/assembly/dist-binary.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/standalone-sample/src/assembly/dist-binary.xml?rev=919894&r1=919893&r2=919894&view=diff
==============================================================================
--- openwebbeans/trunk/samples/standalone-sample/src/assembly/dist-binary.xml 
(original)
+++ openwebbeans/trunk/samples/standalone-sample/src/assembly/dist-binary.xml 
Sun Mar  7 00:14:46 2010
@@ -39,20 +39,15 @@
         <dependencySet>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>org.apache.openwebbeans:atinject-api</include>
-                <include>org.apache.openwebbeans:openwebbeans-api</include>
                 <include>org.apache.openwebbeans:openwebbeans-impl</include>
                 <include>org.apache.openwebbeans:openwebbeans-spi</include>
                 
<include>org.apache.geronimo.specs:geronimo-el_2.2_spec</include>
-               
<include>org.apache.geronimo.specs:geronimo-interceptor_1.1_spec</include>
-               
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+                               
<include>org.apache.geronimo.specs:geronimo-interceptor_1.1_spec</include>
                 
<include>org.apache.geronimo.specs:geronimo-atinject_1.0_spec</include>
                 
<include>org.apache.geronimo.specs:geronimo-jcdi_1.0_spec</include>
-                
<include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
-               <include>log4j:log4j</include>
-               <include>dom4j:dom4j</include>
-               <include>javassist:javassist</include>
-               <include>net.sf.scannotation:scannotation</include>
+                               <include>dom4j:dom4j</include>
+                               <include>javassist:javassist</include>
+                               
<include>net.sf.scannotation:scannotation</include>
                 
             </includes>
            <excludes>

Modified: 
openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java?rev=919894&r1=919893&r2=919894&view=diff
==============================================================================
--- 
openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java
 (original)
+++ 
openwebbeans/trunk/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java
 Sun Mar  7 00:14:46 2010
@@ -36,7 +36,7 @@
         try
         {
             lifecycle = LifecycleFactory.getInstance().getLifecycle();
-            lifecycle.start(startupObject);
+            lifecycle.startApplication(startupObject);
             
         }catch(Exception e)
         {
@@ -48,8 +48,7 @@
     {
         try
         {
-            lifecycle = LifecycleFactory.getInstance().getLifecycle();
-            lifecycle.stop(endObject);
+            lifecycle.stopApplication(endObject);
             
         }catch(Exception e)
         {

Modified: openwebbeans/trunk/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/src/site/apt/index.apt?rev=919894&r1=919893&r2=919894&view=diff
==============================================================================
--- openwebbeans/trunk/src/site/apt/index.apt (original)
+++ openwebbeans/trunk/src/site/apt/index.apt Sun Mar  7 00:14:46 2010
@@ -21,6 +21,10 @@
 
 * Recent News
  
+  * 05.03.2010 - M4 is released
+ 
+  * 04.03.2010 - New committer: Ying Wang
+   
   * 17.11.2009 - New committer: Eric Covener
 
   * 10.11.2009 - New committer: Joe Bergmark


Reply via email to