Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deprecated Modules #1003 

Added deprecated.properties file to provide more details of deprecated modules
This commit is contained in:
Greg Wilkins 2016-10-14 10:48:51 +11:00
parent d9c2352966
commit 68e86e4d4e
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-home/src/main/resources/modules/deprecated.properties Normal file
View File

@ -0,0 +1,8 @@
gcloud-memcached-sessions : replaced by 'session-store-cache,session-store-gcloud'
gcloud-session-idmgr : no longer required.
gcloud-sessions : replaced by 'session-store-gcloud'
infinispan : replaced by either 'session-store-infinispan-embedded' or 'session-store-infinispan-remote'
jdbc-sessions : replaced by 'session-store-jdbc'
logging : renamed to 'stderrout-capture'
monitor : no longer supported
nosql : replaced by 'session-store-mongo'

27
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
View File

@ -18,6 +18,7 @@
package org.eclipse.jetty.start;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
@ -27,6 +28,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@ -44,6 +46,7 @@ public class Modules implements Iterable<Module>
private final Map<String,Set<Module>> _provided = new HashMap<>();
private final BaseHome _baseHome;
private final StartArgs _args;
private final Properties _deprecated = new Properties();
public Modules(BaseHome basehome, StartArgs args)
{
@ -59,6 +62,19 @@ public class Modules implements Iterable<Module>
args.setProperty("java.version",java_version,"<internal>");
}
}
try
{
Path deprecated_path = _baseHome.getPath("modules/deprecated.properties");
if (deprecated_path!=null && FS.exists(deprecated_path))
{
_deprecated.load(new FileInputStream(deprecated_path.toFile()));
}
}
catch (IOException e)
{
StartLog.debug(e);
}
}
public void dump(List<String> tags)
@ -260,7 +276,7 @@ public class Modules implements Iterable<Module>
{
Module module = get(name);
if (module==null)
throw new UsageException(UsageException.ERR_UNKNOWN,"Unknown module='%s'",name);
throw new UsageException(UsageException.ERR_UNKNOWN,"Unknown module='%s. List available with --list-modules",name);
Set<String> enabled = new HashSet<>();
enable(enabled,module,enabledFrom,false);
@ -354,7 +370,14 @@ public class Modules implements Iterable<Module>
public Module get(String name)
{
return _names.get(name);
Module module = _names.get(name);
if (module==null)
{
String reason = _deprecated.getProperty(name);
if (reason!=null)
StartLog.warn("Deprecated module '%s' is %s",name,reason);
}
return module;
}
@Override