[webbeans-commits] Webbeans SVN: r2631 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: jsf and 1 other directory.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Apr 27 14:32:45 EDT 2009


Author: dan.j.allen
Date: 2009-04-27 14:32:45 -0400 (Mon, 27 Apr 2009)
New Revision: 2631

Added:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java
Removed:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JSFApiAbstraction.java
Modified:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
Log:
rename for JSFApiAbstraction to JsfApiAbstraction for consistency


Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java	2009-04-27 15:36:11 UTC (rev 2630)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java	2009-04-27 18:32:45 UTC (rev 2631)
@@ -33,7 +33,7 @@
 import org.jboss.webbeans.introspector.AnnotatedMethod;
 import org.jboss.webbeans.introspector.WrappedAnnotatedField;
 import org.jboss.webbeans.introspector.WrappedAnnotatedMethod;
-import org.jboss.webbeans.jsf.JSFApiAbstraction;
+import org.jboss.webbeans.jsf.JsfApiAbstraction;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 import org.jboss.webbeans.persistence.spi.EntityDiscovery;
@@ -289,7 +289,7 @@
    {
       Class<?> rawType = clazz.getRawType();
       EJBApiAbstraction ejbApiAbstraction = manager.getServices().get(EJBApiAbstraction.class);
-      JSFApiAbstraction jsfApiAbstraction = manager.getServices().get(JSFApiAbstraction.class);
+      JsfApiAbstraction jsfApiAbstraction = manager.getServices().get(JsfApiAbstraction.class);
       ServletApiAbstraction servletApiAbstraction = manager.getServices().get(ServletApiAbstraction.class);
       // TODO: check 3.2.1 for more rules!!!!!!
       return !Reflections.isAbstract(rawType) && 

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	2009-04-27 15:36:11 UTC (rev 2630)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	2009-04-27 18:32:45 UTC (rev 2631)
@@ -50,7 +50,7 @@
 import org.jboss.webbeans.ejb.EjbDescriptorCache;
 import org.jboss.webbeans.ejb.spi.EjbServices;
 import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.jsf.JSFApiAbstraction;
+import org.jboss.webbeans.jsf.JsfApiAbstraction;
 import org.jboss.webbeans.literal.DeployedLiteral;
 import org.jboss.webbeans.literal.InitializedLiteral;
 import org.jboss.webbeans.log.Log;
@@ -126,7 +126,7 @@
    {
       ResourceLoader resourceLoader = getServices().get(ResourceLoader.class);
       getServices().add(EJBApiAbstraction.class, new EJBApiAbstraction(resourceLoader));
-      getServices().add(JSFApiAbstraction.class, new JSFApiAbstraction(resourceLoader));
+      getServices().add(JsfApiAbstraction.class, new JsfApiAbstraction(resourceLoader));
       getServices().add(PersistenceApiAbstraction.class, new PersistenceApiAbstraction(resourceLoader));
       getServices().add(ServletApiAbstraction.class, new ServletApiAbstraction(resourceLoader));
       // Temporary workaround to provide context for building annotated class

Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JSFApiAbstraction.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JSFApiAbstraction.java	2009-04-27 15:36:11 UTC (rev 2630)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JSFApiAbstraction.java	2009-04-27 18:32:45 UTC (rev 2631)
@@ -1,42 +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 org.jboss.webbeans.bootstrap.api.Service;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.util.ApiAbstraction;
-
-/**
- * Utility class for JSF related components, concepts etc.
- * 
- * @author Pete Muir
- * 
- */
-public class JSFApiAbstraction extends ApiAbstraction implements Service
-{
-
-   // An UI component
-   public final Class<?> UICOMPONENT_CLASS;
-   
-   public JSFApiAbstraction(ResourceLoader resourceLoader)
-   {
-      super(resourceLoader);
-      this.UICOMPONENT_CLASS = classForName("javax.faces.component.UIComponent");
-   }
-
-}

Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java (from rev 2627, ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JSFApiAbstraction.java)
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java	                        (rev 0)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java	2009-04-27 18:32:45 UTC (rev 2631)
@@ -0,0 +1,42 @@
+/*
+ * 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 org.jboss.webbeans.bootstrap.api.Service;
+import org.jboss.webbeans.resources.spi.ResourceLoader;
+import org.jboss.webbeans.util.ApiAbstraction;
+
+/**
+ * Utility class for JSF related components, concepts etc.
+ * 
+ * @author Pete Muir
+ * 
+ */
+public class JsfApiAbstraction extends ApiAbstraction implements Service
+{
+
+   // An UI component
+   public final Class<?> UICOMPONENT_CLASS;
+   
+   public JsfApiAbstraction(ResourceLoader resourceLoader)
+   {
+      super(resourceLoader);
+      this.UICOMPONENT_CLASS = classForName("javax.faces.component.UIComponent");
+   }
+
+}




More information about the weld-commits mailing list