[webbeans-commits] Webbeans SVN: r3671 - in ri/branches/kabir-builder: impl/src/main/java/org/jboss/webbeans/el and 4 other directories.

Author: kabir.khan(a)jboss.com Date: 2009-09-15 11:39:18 -0400 (Tue, 15 Sep 2009) New Revision: 3671 Removed: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/ForwardingApplication.java ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/ForwardingApplicationFactory.java ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/JsfWebBeansELResolver.java ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplication.java ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplicationFactory.java Modified: ri/branches/kabir-builder/ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/el/WebBeansExpressionFactory.java ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java ri/branches/kabir-builder/jboss-as/build.properties ri/branches/kabir-builder/version-matrix/pom.xml Log: Merged revisions 3666 via svnmerge from https://svn.jboss.org/repos/webbeans/ri/trunk ....... r3666 | pete.muir(a)jboss.org | 2009-09-15 14:00:42 +0100 (Tue, 15 Sep 2009) | 1 line update JBoss AS version, and remove old JSF/JSP integration classes ....... Property changes on: ri/branches/kabir-builder ___________________________________________________________________ Name: svnmerge-integrated - /ri/trunk:1-3665 + /ri/trunk:1-3669 Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/el/WebBeansExpressionFactory.java =================================================================== --- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/el/WebBeansExpressionFactory.java 2009-09-15 15:33:16 UTC (rev 3670) +++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/el/WebBeansExpressionFactory.java 2009-09-15 15:39:18 UTC (rev 3671) @@ -34,6 +34,10 @@ public WebBeansExpressionFactory(ExpressionFactory expressionFactory) { + if (expressionFactory == null) + { + throw new IllegalArgumentException("Cannot pass null expressionFactory"); + } this.delegate = expressionFactory; } Deleted: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/ForwardingApplication.java =================================================================== --- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/ForwardingApplication.java 2009-09-15 15:33:16 UTC (rev 3670) +++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/ForwardingApplication.java 2009-09-15 15:39:18 UTC (rev 3671) @@ -1,289 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.jsf; - -import java.util.Collection; -import java.util.Iterator; -import java.util.Locale; - -import javax.faces.FacesException; -import javax.faces.application.Application; -import javax.faces.application.NavigationHandler; -import javax.faces.application.StateManager; -import javax.faces.application.ViewHandler; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.el.MethodBinding; -import javax.faces.el.PropertyResolver; -import javax.faces.el.ReferenceSyntaxException; -import javax.faces.el.ValueBinding; -import javax.faces.el.VariableResolver; -import javax.faces.event.ActionListener; -import javax.faces.validator.Validator; - -/** - * @author pmuir - * - */ -public abstract class ForwardingApplication extends Application -{ - - protected abstract Application delegate(); - - @Override - public void addComponent(String componentType, String componentClass) - { - delegate().addComponent(componentType, componentClass); - } - - @Override - public void addConverter(String converterId, String converterClass) - { - delegate().addConverter(converterId, converterClass); - } - - @SuppressWarnings("unchecked") - @Override - public void addConverter(Class targetClass, String converterClass) - { - delegate().addConverter(targetClass, converterClass); - } - - @Override - public void addValidator(String validatorId, String validatorClass) - { - delegate().addValidator(validatorId, validatorClass); - } - - @Override - public UIComponent createComponent(String componentType) throws FacesException - { - return delegate().createComponent(componentType); - } - - @Override - @Deprecated - public UIComponent createComponent(ValueBinding componentBinding, FacesContext context, String componentType) throws FacesException - { - return delegate().createComponent(componentBinding, context, componentType); - } - - @Override - public Converter createConverter(String converterId) - { - return delegate().createConverter(converterId); - } - - @SuppressWarnings("unchecked") - @Override - public Converter createConverter(Class targetClass) - { - return delegate().createConverter(targetClass); - } - - @SuppressWarnings("unchecked") - @Deprecated - @Override - public MethodBinding createMethodBinding(String ref, Class[] params) throws ReferenceSyntaxException - { - return delegate().createMethodBinding(ref, params); - } - - @Override - public Validator createValidator(String validatorId) throws FacesException - { - return delegate().createValidator(validatorId); - } - - @Override - @Deprecated - public ValueBinding createValueBinding(String ref) throws ReferenceSyntaxException - { - return delegate().createValueBinding(ref); - } - - @Override - public ActionListener getActionListener() - { - return delegate().getActionListener(); - } - - @Override - public Iterator<String> getComponentTypes() - { - return delegate().getComponentTypes(); - } - - @Override - public Iterator<String> getConverterIds() - { - return delegate().getConverterIds(); - } - - @SuppressWarnings("unchecked") - @Override - public Iterator<Class> getConverterTypes() - { - return delegate().getConverterTypes(); - } - - @Override - public Locale getDefaultLocale() - { - return delegate().getDefaultLocale(); - } - - @Override - public String getDefaultRenderKitId() - { - return delegate().getDefaultRenderKitId(); - } - - @Override - public String getMessageBundle() - { - return delegate().getMessageBundle(); - } - - @Override - public NavigationHandler getNavigationHandler() - { - return delegate().getNavigationHandler(); - } - - @Override - @Deprecated - public PropertyResolver getPropertyResolver() - { - return delegate().getPropertyResolver(); - } - - @Override - public StateManager getStateManager() - { - return delegate().getStateManager(); - } - - @Override - public Iterator<Locale> getSupportedLocales() - { - return delegate().getSupportedLocales(); - } - - @Override - public Iterator<String> getValidatorIds() - { - return delegate().getValidatorIds(); - } - - @Override - @Deprecated - public VariableResolver getVariableResolver() - { - return delegate().getVariableResolver(); - } - - @Override - public ViewHandler getViewHandler() - { - return delegate().getViewHandler(); - } - - @Override - public void setActionListener(ActionListener listener) - { - delegate().setActionListener(listener); - } - - @Override - public void setDefaultLocale(Locale locale) - { - delegate().setDefaultLocale(locale); - } - - @Override - public void setDefaultRenderKitId(String renderKitId) - { - delegate().setDefaultRenderKitId(renderKitId); - } - - @Override - public void setMessageBundle(String bundle) - { - delegate().setMessageBundle(bundle); - } - - @Override - public void setNavigationHandler(NavigationHandler handler) - { - delegate().setNavigationHandler(handler); - } - - - @Override - @Deprecated - public void setPropertyResolver(PropertyResolver resolver) - { - delegate().setPropertyResolver(resolver); - } - - @Override - public void setStateManager(StateManager manager) - { - delegate().setStateManager(manager); - } - - @Override - public void setSupportedLocales(Collection<Locale> locales) - { - delegate().setSupportedLocales(locales); - - } - - @Override - @Deprecated - public void setVariableResolver(VariableResolver resolver) - { - delegate().setVariableResolver(resolver); - } - - @Override - public void setViewHandler(ViewHandler handler) - { - delegate().setViewHandler(handler); - } - - @Override - public boolean equals(Object obj) - { - return delegate().equals(obj); - } - - @Override - public int hashCode() - { - return delegate().hashCode(); - } - - @Override - public String toString() - { - return delegate().toString(); - } - -} Deleted: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/ForwardingApplicationFactory.java =================================================================== --- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/ForwardingApplicationFactory.java 2009-09-15 15:33:16 UTC (rev 3670) +++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/ForwardingApplicationFactory.java 2009-09-15 15:39:18 UTC (rev 3671) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.jsf; - -import javax.faces.application.Application; -import javax.faces.application.ApplicationFactory; - -/** - * @author pmuir - * - */ -public abstract class ForwardingApplicationFactory extends ApplicationFactory -{ - - protected abstract ApplicationFactory delegate(); - - @Override - public Application getApplication() - { - return delegate().getApplication(); - } - - @Override - public void setApplication(Application application) - { - delegate().setApplication(application); - } - - @Override - public boolean equals(Object obj) - { - return delegate().equals(obj); - } - - @Override - public int hashCode() - { - return delegate().hashCode(); - } - - @Override - public String toString() - { - return delegate().toString(); - } - -} Deleted: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/JsfWebBeansELResolver.java =================================================================== --- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/JsfWebBeansELResolver.java 2009-09-15 15:33:16 UTC (rev 3670) +++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/JsfWebBeansELResolver.java 2009-09-15 15:39:18 UTC (rev 3671) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.jsf; - -import javax.el.ELContext; -import javax.faces.context.FacesContext; - -import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.el.AbstractWebBeansELResolver; - -/** - * @author pmuir - * - */ -public class JsfWebBeansELResolver extends AbstractWebBeansELResolver -{ - - @Override - protected BeanManagerImpl getManager(ELContext context) - { - if (context.getContext(FacesContext.class) == null) - { - throw new IllegalStateException("Cannot use " + getClass().getSimpleName() + " outside JSF"); - } - else - { - return JsfHelper.getModuleBeanManager((FacesContext) context.getContext(FacesContext.class)); - } - } - -} Deleted: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplication.java =================================================================== --- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplication.java 2009-09-15 15:33:16 UTC (rev 3670) +++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplication.java 2009-09-15 15:39:18 UTC (rev 3671) @@ -1,79 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.jsf; - -import java.util.ArrayList; -import java.util.Collection; - -import javax.el.ELContextListener; -import javax.el.ExpressionFactory; -import javax.faces.application.Application; - -import org.jboss.webbeans.el.WebBeansELContextListener; -import org.jboss.webbeans.el.WebBeansExpressionFactory; - -/** - * @author pmuir - * - */ -public class WebBeansApplication extends ForwardingApplication -{ - - private static final ELContextListener[] EMPTY_LISTENERS = {}; - - private final Application application; - private final Collection<ELContextListener> elContextListeners; - - public WebBeansApplication(Application application) - { - this.application = application; - this.elContextListeners = new ArrayList<ELContextListener>(); - this.elContextListeners.add(new WebBeansELContextListener()); - application.addELResolver(new JsfWebBeansELResolver()); - } - - @Override - protected Application delegate() - { - return application; - } - - @Override - public ExpressionFactory getExpressionFactory() - { - return new WebBeansExpressionFactory(delegate().getExpressionFactory()); - } - - @Override - public ELContextListener[] getELContextListeners() - { - return elContextListeners.toArray(EMPTY_LISTENERS); - } - - @Override - public void addELContextListener(ELContextListener listener) - { - elContextListeners.add(listener); - } - - @Override - public void removeELContextListener(ELContextListener listener) - { - elContextListeners.remove(listener); - } - -} Deleted: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplicationFactory.java =================================================================== --- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplicationFactory.java 2009-09-15 15:33:16 UTC (rev 3670) +++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplicationFactory.java 2009-09-15 15:39:18 UTC (rev 3671) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.jsf; - -import javax.faces.application.Application; -import javax.faces.application.ApplicationFactory; - - -/** - * @author pmuir - * - */ -public class WebBeansApplicationFactory extends ForwardingApplicationFactory -{ - - private final ApplicationFactory applicationFactory; - - private Application application; - - public WebBeansApplicationFactory(ApplicationFactory applicationFactory) - { - this.applicationFactory = applicationFactory; - } - - @Override - protected ApplicationFactory delegate() - { - return applicationFactory; - } - - @Override - public Application getApplication() - { - if (application == null) - { - application = new WebBeansApplication(delegate().getApplication()); - } - return application; - } - -} Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java =================================================================== --- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java 2009-09-15 15:33:16 UTC (rev 3670) +++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java 2009-09-15 15:39:18 UTC (rev 3671) @@ -22,14 +22,12 @@ */ package org.jboss.webbeans.servlet; -import javax.servlet.ServletContextEvent; import javax.servlet.ServletRequestEvent; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSessionEvent; import org.jboss.webbeans.Container; import org.jboss.webbeans.context.ContextLifecycle; -import org.jboss.webbeans.jsp.JspInitialization; import org.jboss.webbeans.servlet.api.helpers.AbstractServletListener; /** @@ -55,16 +53,6 @@ } return lifecycle; } - - @Override - public void contextInitialized(ServletContextEvent sce) - { - // JBoss AS will still start the deployment even if WB fails - if (Container.instance() != null && Container.instance().isInitialized()) - { - new JspInitialization().init(sce.getServletContext()); - } - } /** * Called when the session is created Modified: ri/branches/kabir-builder/jboss-as/build.properties =================================================================== --- ri/branches/kabir-builder/jboss-as/build.properties 2009-09-15 15:33:16 UTC (rev 3670) +++ ri/branches/kabir-builder/jboss-as/build.properties 2009-09-15 15:39:18 UTC (rev 3671) @@ -1,5 +1,5 @@ # Container a number of properties associated with installing Web Beans into JBoss AS and running the TCK in JBoss AS -#jboss.home=/Applications/jboss-5.1.0.GA +#jboss.home=/Applications/jboss-5.2.0.Beta1 org.jboss.testharness.container.javaOpts=-Xms128m -Xmx384m -XX:MaxPermSize=128m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 # time to allow before attempting to restart JBoss AS Modified: ri/branches/kabir-builder/version-matrix/pom.xml =================================================================== --- ri/branches/kabir-builder/version-matrix/pom.xml 2009-09-15 15:33:16 UTC (rev 3670) +++ ri/branches/kabir-builder/version-matrix/pom.xml 2009-09-15 15:39:18 UTC (rev 3671) @@ -128,7 +128,7 @@ <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> <version>2.1</version> - </dependency> + </dependency> <dependency> <groupId>javax.transaction</groupId>