myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skitch...@apache.org
Subject svn commit: r666570 - /myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
Date Wed, 11 Jun 2008 08:41:37 GMT
Author: skitching
Date: Wed Jun 11 01:41:36 2008
New Revision: 666570

URL: http://svn.apache.org/viewvc?rev=666570&view=rev
Log:
* Fix error message about "two versions of tomahawk-sandbox present" due to thinking that
"tomahawk-sandbox15" is a version of tomahawk-sandbox.
* Remove a couple of methods that are never called (and don't make sense to call).

Modified:
    myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java

Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java?rev=666570&r1=666569&r2=666570&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
(original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
Wed Jun 11 01:41:36 2008
@@ -111,6 +111,7 @@
     public static final String MYFACES_IMPL_PACKAGE_NAME = "myfaces-impl";
     public static final String MYFACES_TOMAHAWK_PACKAGE_NAME = "tomahawk";
     public static final String MYFACES_TOMAHAWK_SANDBOX_PACKAGE_NAME = "tomahawk-sandbox";
+    public static final String MYFACES_TOMAHAWK_SANDBOX15_PACKAGE_NAME = "tomahawk-sandbox15";
     public static final String COMMONS_EL_PACKAGE_NAME = "commons-el";
     public static final String JSP_API_PACKAGE_NAME = "jsp-api";
 
@@ -304,6 +305,7 @@
             List<VersionInfo> li = new ArrayList<VersionInfo>();
             li.add(new VersionInfo(MYFACES_API_PACKAGE_NAME));
             li.add(new VersionInfo(MYFACES_IMPL_PACKAGE_NAME));
+            li.add(new VersionInfo(MYFACES_TOMAHAWK_SANDBOX15_PACKAGE_NAME));
             li.add(new VersionInfo(MYFACES_TOMAHAWK_SANDBOX_PACKAGE_NAME));
             li.add(new VersionInfo(MYFACES_TOMAHAWK_PACKAGE_NAME));
 
@@ -917,11 +919,6 @@
             return packageName;
         }
 
-        public void setPackageName(String packageName)
-        {
-            this.packageName = packageName;
-        }
-
         public void addJarInfo(String path, String version)
         {
             if (jarInfos == null)
@@ -992,20 +989,10 @@
             return version;
         }
 
-        public void setVersion(String version)
-        {
-            this.version = version;
-        }
-
         public String getUrl()
         {
             return url;
         }
-
-        public void setUrl(String url)
-        {
-            this.url = url;
-        }
     }
 
     private void handleSerialFactory()



Mime
View raw message