You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/08/11 01:52:43 UTC
svn commit: r984267 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: commons/
config/annotation/DefaultLifecycleProviderFactory.java
config/annotation/LifecycleProviderFactory.java
webapp/StartupServletContextListener.java
Author: lu4242
Date: Tue Aug 10 23:52:42 2010
New Revision: 984267
URL: http://svn.apache.org/viewvc?rev=984267&view=rev
Log:
MYFACES-2861 Remove commons-discovery dependency (reverting changes)
Removed:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/commons/
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java?rev=984267&r1=984266&r2=984267&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java Tue Aug 10 23:52:42 2010
@@ -22,14 +22,8 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.commons.discovery.ResourceNameIterator;
-import org.apache.myfaces.commons.discovery.resource.ClassLoaders;
-import org.apache.myfaces.commons.discovery.resource.names.DiscoverServiceNames;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
import javax.faces.FacesException;
import javax.faces.context.ExternalContext;
@@ -37,6 +31,10 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.apache.commons.discovery.ResourceNameIterator;
+import org.apache.commons.discovery.resource.ClassLoaders;
+import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.shared_impl.util.ClassUtils;
/*
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java?rev=984267&r1=984266&r2=984267&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java Tue Aug 10 23:52:42 2010
@@ -21,12 +21,11 @@ package org.apache.myfaces.config.annota
import java.security.AccessController;
import java.security.PrivilegedActionException;
-import org.apache.myfaces.commons.discovery.tools.DiscoverSingleton;
-
-
import javax.faces.FacesException;
import javax.faces.context.ExternalContext;
+import org.apache.commons.discovery.tools.DiscoverSingleton;
+
public abstract class LifecycleProviderFactory {
protected static final String FACTORY_DEFAULT = DefaultLifecycleProviderFactory.class.getName();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java?rev=984267&r1=984266&r2=984267&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java Tue Aug 10 23:52:42 2010
@@ -37,8 +37,8 @@ import javax.servlet.http.HttpSessionBin
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
+import org.apache.commons.discovery.tools.DiscoverSingleton;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.commons.discovery.tools.DiscoverSingleton;
import org.apache.myfaces.shared_impl.util.ClassUtils;
/**