openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1299072 - in /openwebbeans/trunk: samples/conversation-sample/src/main/resources/META-INF/openwebbeans/ samples/ejb-sample/src/main/resources/META-INF/openwebbeans/ samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/ samples/gu...
Date Fri, 09 Mar 2012 22:05:04 GMT
Author: struberg
Date: Fri Mar  9 22:05:04 2012
New Revision: 1299072

URL: http://svn.apache.org/viewvc?rev=1299072&view=rev
Log:
OWB-653 remove ViewScoped extension

This is not needed anymore because it's part of MyFaces CODI and other
portable CDI Extensions

Removed:
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/
Modified:
    openwebbeans/trunk/samples/conversation-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/samples/ejb-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplicationFactory.java
    openwebbeans/trunk/webbeans-test/cditest-owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties

Modified: openwebbeans/trunk/samples/conversation-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1299072&r1=1299071&r2=1299072&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++ openwebbeans/trunk/samples/conversation-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Fri Mar  9 22:05:04 2012
@@ -24,5 +24,4 @@
 
 #general configuration section
 
-org.apache.webbeans.application.useJSF2Extensions=false
-org.apache.webbeans.spi.adaptor.ELAdaptor=org.apache.webbeans.el10.EL10Adaptor
\ No newline at end of file
+org.apache.webbeans.spi.adaptor.ELAdaptor=org.apache.webbeans.el10.EL10Adaptor

Modified: openwebbeans/trunk/samples/ejb-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1299072&r1=1299071&r2=1299072&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++ openwebbeans/trunk/samples/ejb-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Fri Mar  9 22:05:04 2012
@@ -24,8 +24,6 @@
 
 #general configuration section
 
-org.apache.webbeans.application.useJSF2Extensions=false
-
 #use embedded openejb metadata discovery
 org.apache.webbeans.spi.deployer.useEjbMetaDataDiscoveryService=true
 
@@ -34,4 +32,4 @@ org.apache.webbeans.spi.ResourceInjectio
 
 org.apache.webbeans.spi.adaptor.ELAdaptor=org.apache.webbeans.el10.EL10Adaptor
 
-org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.se.DefaultJndiService
\ No newline at end of file
+org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.se.DefaultJndiService

Modified: openwebbeans/trunk/samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1299072&r1=1299071&r2=1299072&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++ openwebbeans/trunk/samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Fri Mar  9 22:05:04 2012
@@ -25,9 +25,7 @@
 #use embedded openejb metadata discovery
 org.apache.webbeans.spi.deployer.useEjbMetaDataDiscoveryService=true
 
-org.apache.webbeans.application.useJSF2Extensions=false
-
 #use resource service
 org.apache.webbeans.spi.ResourceService=org.apache.webbeans.ejb.resource.OpenEjbResourceInjectionService
 org.apache.webbeans.spi.adaptor.ELAdaptor=org.apache.webbeans.el10.EL10Adaptor
-org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.se.DefaultJndiService
\ No newline at end of file
+org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.se.DefaultJndiService

Modified: openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1299072&r1=1299071&r2=1299072&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++ openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Fri Mar  9 22:05:04 2012
@@ -24,8 +24,5 @@
 
 #general configuration section
 
-#use OWB Specific XML Configuration
-org.apache.webbeans.application.useJSF2Extensions=false
-
 org.apache.webbeans.spi.adaptor.ELAdaptor=org.apache.webbeans.el10.EL10Adaptor
 

Modified: openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1299072&r1=1299071&r2=1299072&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++ openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Fri Mar  9 22:05:04 2012
@@ -24,7 +24,5 @@
 
 #general configuration section
 
-org.apache.webbeans.application.useJSF2Extensions=false
-
 #JNDI Enterprise Implementation
 org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.ee.JNDIServiceEnterpriseImpl

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=1299072&r1=1299071&r2=1299072&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
Fri Mar  9 22:05:04 2012
@@ -101,9 +101,6 @@ public class OpenWebBeansConfiguration
     /**Supports conversations*/
     public static final String APPLICATION_SUPPORTS_CONVERSATION = "org.apache.webbeans.application.supportsConversation";
 
-    /**Use of JSF2 extensions*/
-    public static final String USE_JSF2_EXTENSIONS = "org.apache.webbeans.application.useJSF2Extensions";
-    
     /**Use of EJB interceptor to inject EJBs*/
     public static final String USE_EJBINTERCEPTOR_INJECTION = "org.apache.webbeans.application.useEJBInterceptorInjection";
     
@@ -186,9 +183,6 @@ public class OpenWebBeansConfiguration
         value = properties.getProperty(CONTAINER_LIFECYCLE);
         setPropertyFromSystemProperty(CONTAINER_LIFECYCLE, value);
 
-        value = properties.getProperty(USE_JSF2_EXTENSIONS);
-        setPropertyFromSystemProperty(USE_JSF2_EXTENSIONS, value);
-
         value = properties.getProperty(APPLICATION_IS_JSP);
         setPropertyFromSystemProperty(APPLICATION_IS_JSP, value);
 
@@ -297,18 +291,7 @@ public class OpenWebBeansConfiguration
         configProperties.put(key, value);
     }
     
-    /**
-     * Return true if use JSF2.
-     * @return true if use JSF2
-     */
-    public boolean isUseJSF2Extensions()
-    {
-        String value = getProperty(USE_JSF2_EXTENSIONS);
-        
-        return Boolean.valueOf(value);
-        
-    }
-    
+
     /**
      * Gets jsp property.
      * @return true if jsp

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java?rev=1299072&r1=1299071&r2=1299072&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java (original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java Fri
Mar  9 22:05:04 2012
@@ -66,13 +66,13 @@ public final class JSFUtil
     {
         Asserts.assertNotNull(redirectId, "redirectId parameter can not be null");      
 
 
-        StringBuffer buffer = new StringBuffer(redirectId);
+        StringBuilder buffer = new StringBuilder(redirectId);
         int index = buffer.lastIndexOf("/");        
         
         String remainder = buffer.substring(index+1, buffer.length());
         int indexOfQuery = remainder.indexOf('?');
         
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         if(indexOfQuery != -1)
         {
             result.append(buffer.substring(0,index+1));
@@ -139,8 +139,7 @@ public final class JSFUtil
 
     public static String getConversationId()
     {
-        String cid = getJSFRequestParameter("cid");
-        return cid;
+        return getJSFRequestParameter("cid");
     }
 
 }

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java?rev=1299072&r1=1299071&r2=1299072&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
Fri Mar  9 22:05:04 2012
@@ -42,7 +42,7 @@ public class OwbApplication extends Appl
     @Override
     public ExpressionFactory getExpressionFactory()
     {
-        if(this.expressionFactory == null)
+        if(expressionFactory == null)
         {
             expressionFactory = wrappedApplication.getExpressionFactory();
             expressionFactory = WebBeansContext.getInstance().getBeanManagerImpl().wrapExpressionFactory(expressionFactory);

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplicationFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplicationFactory.java?rev=1299072&r1=1299071&r2=1299072&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplicationFactory.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplicationFactory.java
Fri Mar  9 22:05:04 2012
@@ -31,7 +31,7 @@ public class OwbApplicationFactory exten
     
     public OwbApplicationFactory(ApplicationFactory applicationFactory)
     {
-        this.wrapped = applicationFactory;        
+        wrapped = applicationFactory;
     }
 
     @Override
@@ -53,7 +53,7 @@ public class OwbApplicationFactory exten
     @Override
     public void setApplication(Application arg0)
     {
-        this.wrapped.setApplication(arg0);
+        wrapped.setApplication(arg0);
     }
 
     /* (non-Javadoc)

Modified: openwebbeans/trunk/webbeans-test/cditest-owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-test/cditest-owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1299072&r1=1299071&r2=1299072&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-test/cditest-owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++ openwebbeans/trunk/webbeans-test/cditest-owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Fri Mar  9 22:05:04 2012
@@ -18,8 +18,6 @@
 # this is the test configuration, thus it has anordinal between the plugins and the application
 configuration.ordinal=60
 
-# make ViewScoped available
-#org.apache.webbeans.application.useJSF2Extensions=true
 # use non-JTA resource injection
 org.apache.webbeans.spi.ResourceInjectionService=org.apache.webbeans.resource.spi.se.StandaloneResourceInjectionService
 

Modified: openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1299072&r1=1299071&r2=1299072&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Fri Mar  9 22:05:04 2012
@@ -53,11 +53,6 @@ org.apache.webbeans.spi.ResourceInjectio
 org.apache.webbeans.application.jsp=false
 ################################################################################################
 
-################################# Application Development JSF Version is 2.0 ###################
-#Add extra extensions for JSF2, for example adding ViewScope
-org.apache.webbeans.application.useJSF2Extensions=false
-################################################################################################
-
 ################################ Failover Service #############################################
 org.apache.webbeans.spi.FailOverService=org.apache.webbeans.web.failover.DefaultOwbFailOverService
 org.apache.webbeans.web.failover.issupportfailover=false



Mime
View raw message