452323 - Start --list-config makes no hint on transitive enabled modules
+ Eliminating lots of now dead code (#uncoding) + Making ambiguous add detection more sane.
This commit is contained in:
Joakim Erdfelt
parent
005b513653
commit
89baf907b6
|
|
@ -311,7 +311,6 @@ public class Main
|
|||
|
||||
args.setAllModules(modules);
|
||||
List<Module> activeModules = modules.getEnabled();
|
||||
modules.assertModulesValid(activeModules);
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// 5) Lib & XML Expansion / Resolution
|
||||
|
|
|
|||
|
|
@ -21,17 +21,13 @@ package org.eclipse.jetty.start;
|
|||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.jetty.start.graph.Graph;
|
||||
import org.eclipse.jetty.start.graph.GraphException;
|
||||
import org.eclipse.jetty.start.graph.NodeDepthComparator;
|
||||
import org.eclipse.jetty.start.graph.OnlyTransitivePredicate;
|
||||
import org.eclipse.jetty.start.graph.Selection;
|
||||
|
||||
|
|
@ -43,13 +39,6 @@ public class Modules extends Graph<Module>
|
|||
private final BaseHome baseHome;
|
||||
private final StartArgs args;
|
||||
|
||||
// /*
|
||||
// * modules that may appear in the resolved graph but are undefined in the module system
|
||||
// *
|
||||
// * ex: modules/npn/npn-1.7.0_01.mod (property expansion resolves to non-existent file)
|
||||
// */
|
||||
// private Set<String> missingModules = new HashSet<String>();
|
||||
|
||||
public Modules(BaseHome basehome, StartArgs args)
|
||||
{
|
||||
this.baseHome = basehome;
|
||||
|
|
@ -58,11 +47,6 @@ public class Modules extends Graph<Module>
|
|||
this.setNodeTerm("module");
|
||||
}
|
||||
|
||||
// public void clearMissing()
|
||||
// {
|
||||
// missingModules.clear();
|
||||
// }
|
||||
|
||||
public void dump()
|
||||
{
|
||||
List<Module> ordered = new ArrayList<>();
|
||||
|
|
@ -122,112 +106,6 @@ public class Modules extends Graph<Module>
|
|||
}
|
||||
}
|
||||
|
||||
// public int enableAll(List<String> names, String source) throws IOException
|
||||
// {
|
||||
// if ((names == null) || (names.isEmpty()))
|
||||
// {
|
||||
// // nothing to do
|
||||
// return 0;
|
||||
// }
|
||||
//
|
||||
// List<String> sources = Collections.singletonList(source);
|
||||
//
|
||||
// int count = 0;
|
||||
// for (String name : names)
|
||||
// {
|
||||
// count += enable(name,sources);
|
||||
// }
|
||||
// return count;
|
||||
// }
|
||||
|
||||
// public int enable(String name, List<String> sources) throws IOException
|
||||
// {
|
||||
// int count = 0;
|
||||
//
|
||||
// if (name.contains("*"))
|
||||
// {
|
||||
// // A regex!
|
||||
// List<Module> matching = getMatching(new RegexNamePredicate(name));
|
||||
//
|
||||
// // enable them
|
||||
// for (Module module : matching)
|
||||
// {
|
||||
// count += enableModule(module,sources);
|
||||
// }
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Module module = get(name);
|
||||
// if (module == null)
|
||||
// {
|
||||
// System.err.printf("WARNING: Cannot enable requested module [%s]: not a valid module name.%n",name);
|
||||
// return count;
|
||||
// }
|
||||
// count += enableModule(module,sources);
|
||||
// }
|
||||
// return count;
|
||||
// }
|
||||
|
||||
// private int enableModule(Module module, List<String> sources) throws IOException
|
||||
// {
|
||||
// int count = 0;
|
||||
// if (sources == null)
|
||||
// {
|
||||
// // We use source for tagging how a node was selected, it should
|
||||
// // always be required
|
||||
// throw new RuntimeException("sources should never be empty");
|
||||
// }
|
||||
//
|
||||
// module.addSources(sources);
|
||||
// String via = Utils.join(sources,", ");
|
||||
//
|
||||
// // If already enabled, nothing else to do
|
||||
// if (module.isEnabled())
|
||||
// {
|
||||
// StartLog.debug("Enabled module: %s (via %s)",module.getName(),via);
|
||||
// return count;
|
||||
// }
|
||||
//
|
||||
// StartLog.debug("Enabling module: %s (via %s)",module.getName(),via);
|
||||
// module.setEnabled(true);
|
||||
// count++;
|
||||
// args.parseModule(module);
|
||||
// module.expandProperties(args.getProperties());
|
||||
//
|
||||
// // enable any parents that haven't been enabled (yet)
|
||||
// Set<String> parentNames = new HashSet<>();
|
||||
// parentNames.addAll(module.getParentNames());
|
||||
// for (String name : parentNames)
|
||||
// {
|
||||
// StartLog.debug("Enable parent '%s' of module: %s",name,module.getName());
|
||||
// Module parent = get(name);
|
||||
// if (parent == null)
|
||||
// {
|
||||
// // parent module doesn't exist, yet
|
||||
// Path file = baseHome.getPath("modules/" + name + ".mod");
|
||||
// if (FS.canReadFile(file))
|
||||
// {
|
||||
// parent = registerModule(file);
|
||||
// parent.expandProperties(args.getProperties());
|
||||
// updateParentReferencesTo(parent);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// if (!Props.hasPropertyKey(name))
|
||||
// {
|
||||
// StartLog.debug("Missing module definition: [ Mod: %s | File: %s ]",name,file);
|
||||
// missingModules.add(name);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// if (parent != null)
|
||||
// {
|
||||
// count += enableModule(parent,sources);
|
||||
// }
|
||||
// }
|
||||
// return count;
|
||||
// }
|
||||
|
||||
@Override
|
||||
public Module resolveNode(String name)
|
||||
{
|
||||
|
|
@ -295,24 +173,6 @@ public class Modules extends Graph<Module>
|
|||
return xmls;
|
||||
}
|
||||
|
||||
public void registerParentsIfMissing(Module module) throws IOException
|
||||
{
|
||||
Set<String> parents = new HashSet<>(module.getParentNames());
|
||||
for (String name : parents)
|
||||
{
|
||||
if (!containsNode(name))
|
||||
{
|
||||
Path file = baseHome.getPath("modules/" + name + ".mod");
|
||||
if (FS.canReadFile(file))
|
||||
{
|
||||
Module parent = registerModule(file);
|
||||
updateParentReferencesTo(parent);
|
||||
registerParentsIfMissing(parent);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void registerAll() throws IOException
|
||||
{
|
||||
for (Path path : baseHome.getPaths("modules/*.mod"))
|
||||
|
|
@ -395,56 +255,6 @@ public class Modules extends Graph<Module>
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve the execution order of the enabled modules, and all dependent modules, based on depth first transitive
|
||||
* reduction.
|
||||
*
|
||||
* @return the list of active modules (plus dependent modules), in execution order.
|
||||
* @deprecated use {@link #getEnabled()} and {@link #assertModulesValid(Collection)} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public List<Module> resolveEnabled()
|
||||
{
|
||||
Map<String, Module> active = new HashMap<String, Module>();
|
||||
|
||||
for (Module module : getNodes())
|
||||
{
|
||||
if (module.isEnabled())
|
||||
{
|
||||
findParents(module,active);
|
||||
}
|
||||
}
|
||||
|
||||
assertModulesValid(active.values());
|
||||
|
||||
List<Module> ordered = new ArrayList<>();
|
||||
ordered.addAll(active.values());
|
||||
Collections.sort(ordered,new NodeDepthComparator());
|
||||
return ordered;
|
||||
}
|
||||
|
||||
public void assertModulesValid(Collection<Module> active)
|
||||
{
|
||||
// /*
|
||||
// * check against the missing modules
|
||||
// *
|
||||
// * Ex: npn should match anything under npn/
|
||||
// */
|
||||
// for (String missing : missingModules)
|
||||
// {
|
||||
// for (Module module : active)
|
||||
// {
|
||||
// if (missing.startsWith(module.getName()))
|
||||
// {
|
||||
// StartLog.warn("** Unable to continue, required dependency missing. [%s]",missing);
|
||||
// StartLog.warn("** As configured, Jetty is unable to start due to a missing enabled module dependency.");
|
||||
// StartLog.warn("** This may be due to a transitive dependency akin to spdy on npn, which resolves based on the JDK in use.");
|
||||
// throw new UsageException(UsageException.ERR_BAD_ARG,"Missing referenced dependency: " + missing);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
/**
|
||||
* Modules can have a different logical name than to their filesystem reference. This updates existing references to
|
||||
* the filesystem form to use the logical
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import java.util.Set;
|
|||
public class HowSetMatcher implements Predicate
|
||||
{
|
||||
private final Set<String> howSet;
|
||||
|
||||
|
||||
public HowSetMatcher(String... hows)
|
||||
{
|
||||
this.howSet = new HashSet<>();
|
||||
|
|
@ -45,20 +45,22 @@ public class HowSetMatcher implements Predicate
|
|||
return false;
|
||||
}
|
||||
|
||||
if (selections.size() != howSet.size())
|
||||
Set<String> actualHows = node.getSelectedHowSet();
|
||||
|
||||
if (actualHows.size() != howSet.size())
|
||||
{
|
||||
// non-equal sized set
|
||||
return false;
|
||||
}
|
||||
|
||||
for (Selection selection : selections)
|
||||
for (String how : actualHows)
|
||||
{
|
||||
if (!this.howSet.contains(selection.getHow()))
|
||||
if (!this.howSet.contains(how))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
//
|
||||
// ========================================================================
|
||||
// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
|
||||
// ------------------------------------------------------------------------
|
||||
// All rights reserved. This program and the accompanying materials
|
||||
// are made available under the terms of the Eclipse Public License v1.0
|
||||
// and Apache License v2.0 which accompanies this distribution.
|
||||
//
|
||||
// The Eclipse Public License is available at
|
||||
// http://www.eclipse.org/legal/epl-v10.html
|
||||
//
|
||||
// The Apache License v2.0 is available at
|
||||
// http://www.opensource.org/licenses/apache2.0.php
|
||||
//
|
||||
// You may elect to redistribute this code under either of these licenses.
|
||||
// ========================================================================
|
||||
//
|
||||
|
||||
package org.eclipse.jetty.start;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.jetty.toolchain.test.IO;
|
||||
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
|
||||
import org.eclipse.jetty.toolchain.test.OS;
|
||||
import org.eclipse.jetty.toolchain.test.TestingDir;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* Test various things with a semi-valid src/test/resources/dist-home/
|
||||
*/
|
||||
public class DistTest
|
||||
{
|
||||
@Rule
|
||||
public TestingDir testdir = new TestingDir();
|
||||
|
||||
@Rule
|
||||
public SystemExitAsException exitrule = new SystemExitAsException();
|
||||
|
||||
protected String assertFileExists(File basePath, String name) throws IOException
|
||||
{
|
||||
File file = new File(basePath, OS.separators(name));
|
||||
FS.exists(file.toPath());
|
||||
return IO.readToString(file);
|
||||
}
|
||||
|
||||
private void execMain(List<String> cmds) throws Exception
|
||||
{
|
||||
int len = cmds.size();
|
||||
String args[] = cmds.toArray(new String[len]);
|
||||
|
||||
Main main = new Main();
|
||||
StartArgs startArgs = main.processCommandLine(args);
|
||||
main.start(startArgs);
|
||||
}
|
||||
|
||||
public List<String> getBaseCommandLine(File basePath)
|
||||
{
|
||||
List<String> cmds = new ArrayList<String>();
|
||||
cmds.add("-Djava.io.tmpdir=" + MavenTestingUtils.getTargetDir().getAbsolutePath());
|
||||
cmds.add("-Djetty.home=" + MavenTestingUtils.getTestResourceDir("dist-home").getAbsolutePath());
|
||||
cmds.add("-Djetty.base=" + basePath.getAbsolutePath());
|
||||
cmds.add("--testing-mode");
|
||||
|
||||
return cmds;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLikeDistro_SetupHome() throws Exception
|
||||
{
|
||||
File basePath = testdir.getEmptyDir();
|
||||
|
||||
List<String> cmds = getBaseCommandLine(basePath);
|
||||
|
||||
cmds.add("--add-to-start=deploy,websocket,ext,resources,jsp,jstl,http");
|
||||
|
||||
execMain(cmds);
|
||||
}
|
||||
}
|
||||
|
|
@ -71,6 +71,11 @@ public class RebuildTestResources
|
|||
@Override
|
||||
public void copy(Path from, Path to) throws IOException
|
||||
{
|
||||
if(Files.exists(to))
|
||||
{
|
||||
// skip if it exists
|
||||
return;
|
||||
}
|
||||
Files.createFile(to);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ jsp
|
|||
|
||||
[files]
|
||||
lib/weld/
|
||||
http://central.maven.org/maven2/org/jboss/weld/servlet/weld-servlet/2.2.5.Final/weld-servlet-2.2.5.Final.jar|lib/weld/weld-servlet-2.2.5.Final.jar
|
||||
maven://org.jboss.weld.servlet/weld-servlet/2.2.5.Final|lib/weld/weld-servlet-2.2.5.Final.jar
|
||||
|
||||
[lib]
|
||||
lib/weld/weld-servlet-2.2.5.Final.jar
|
||||
|
|
|
|||
|
|
@ -5,5 +5,8 @@
|
|||
[depend]
|
||||
server
|
||||
|
||||
[files]
|
||||
logs/
|
||||
|
||||
[xml]
|
||||
etc/jetty-debug.xml
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
#
|
||||
# GZIP module
|
||||
# Applies GzipHandler to entire server
|
||||
#
|
||||
|
||||
[depend]
|
||||
server
|
||||
|
||||
[xml]
|
||||
etc/jetty-gzip.xml
|
||||
|
||||
[ini-template]
|
||||
### Gzip Handler
|
||||
|
||||
gzip.minGzipSize=2048
|
||||
gzip.checkGzExists=false
|
||||
gzip.compressionLevel=-1
|
||||
gzip.excludedUserAgent=.*MSIE.6\.0.*
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
#
|
||||
# HTTP2 Support Module
|
||||
#
|
||||
|
||||
[depend]
|
||||
ssl
|
||||
protonego
|
||||
|
||||
[lib]
|
||||
lib/http2/*.jar
|
||||
|
||||
[xml]
|
||||
etc/protonego-${protonego}.xml
|
||||
etc/jetty-http2.xml
|
||||
|
||||
[ini-template]
|
||||
## HTTP2 Configuration
|
||||
|
||||
# http2.maxConcurrentStreams=1024
|
||||
|
|
@ -8,12 +8,3 @@ ssl
|
|||
[xml]
|
||||
etc/jetty-https.xml
|
||||
|
||||
[ini-template]
|
||||
## HTTPS Configuration
|
||||
# HTTP port to listen on
|
||||
https.port=8443
|
||||
# HTTPS idle timeout in milliseconds
|
||||
https.timeout=30000
|
||||
# HTTPS Socket.soLingerTime in seconds. (-1 to disable)
|
||||
# https.soLingerTime=-1
|
||||
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ etc/jamon.xml
|
|||
|
||||
[files]
|
||||
lib/jamon/
|
||||
http://central.maven.org/maven2/com/jamonapi/jamon/2.79/jamon-2.79.jar|lib/jamon/jamon-2.79.jar
|
||||
http://central.maven.org/maven2/com/jamonapi/jamon_war/2.79/jamon_war-2.79.war|lib/jamon/jamon.war
|
||||
maven://com.jamonapi/jamon/2.79|lib/jamon/jamon-2.79.jar
|
||||
maven://com.jamonapi/jamon_war/2.79/war|lib/jamon/jamon.war
|
||||
|
||||
[lib]
|
||||
lib/jamon/**.jar
|
||||
|
|
|
|||
|
|
@ -11,21 +11,21 @@ etc/jminix.xml
|
|||
|
||||
[files]
|
||||
lib/jminix/
|
||||
http://central.maven.org/maven2/org/jminix/jminix/1.1.0/jminix-1.1.0.jar|lib/jminix/jminix-1.1.0.jar
|
||||
maven://org.jminix/jminix/1.1.0|lib/jminix/jminix-1.1.0.jar
|
||||
http://maven.restlet.com/org/restlet/org.restlet/1.1.5/org.restlet-1.1.5.jar|lib/jminix/org.restlet-1.1.5.jar
|
||||
http://maven.restlet.com/org/restlet/org.restlet.ext.velocity/1.1.5/org.restlet.ext.velocity-1.1.5.jar|lib/jminix/org.restlet.ext.velocity-1.1.5.jar
|
||||
http://central.maven.org/maven2/org/apache/velocity/velocity/1.5/velocity-1.5.jar|lib/jminix/velocity-1.5.jar
|
||||
http://central.maven.org/maven2/oro/oro/2.0.8/oro-2.0.8.jar|lib/jminix/oro-2.0.8.jar
|
||||
maven://org.apache.velocity/velocity/1.5|lib/jminix/velocity-1.5.jar
|
||||
maven://oro/oro/2.0.8|lib/jminix/oro-2.0.8.jar
|
||||
http://maven.restlet.com/com/noelios/restlet/com.noelios.restlet/1.1.5/com.noelios.restlet-1.1.5.jar|lib/jminix/com.noelios.restlet-1.1.5.jar
|
||||
http://maven.restlet.com/com/noelios/restlet/com.noelios.restlet.ext.servlet/1.1.5/com.noelios.restlet.ext.servlet-1.1.5.jar|lib/jminix/com.noelios.restlet.ext.servlet-1.1.5.jar
|
||||
http://central.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar|lib/jminix/commons-logging-1.1.1.jar
|
||||
http://repo2.maven.org/maven2/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3-jdk15.jar|lib/jminix/json-lib-2.2.3-jdk15.jar
|
||||
http://central.maven.org/maven2/commons-lang/commons-lang/2.4/commons-lang-2.4.jar|lib/jminix/commons-lang-2.4.jar
|
||||
http://central.maven.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar|lib/jminix/commons-beanutils-1.7.0.jar
|
||||
http://central.maven.org/maven2/commons-collections/commons-collections/3.2/commons-collections-3.2.jar|lib/jminix/commons-collections-3.2.jar
|
||||
http://central.maven.org/maven2/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar|lib/jminix/ezmorph-1.0.6.jar
|
||||
http://central.maven.org/maven2/org/jgroups/jgroups/2.12.1.3.Final/jgroups-2.12.1.3.Final.jar|lib/jminix/jgroups-2.12.1.3.Final.jar
|
||||
http://central.maven.org/maven2/org/jasypt/jasypt/1.8/jasypt-1.8.jar|lib/jminix/jasypt-1.8.jar
|
||||
maven://commons-logging/commons-logging/1.1.1|lib/jminix/commons-logging-1.1.1.jar
|
||||
maven://net.sf.json-lib/json-lib/2.2.3/jar/jdk15|lib/jminix/json-lib-2.2.3-jdk15.jar
|
||||
maven://commons-lang/commons-lang/2.4|lib/jminix/commons-lang-2.4.jar
|
||||
maven://commons-beanutils/commons-beanutils/1.7.0|lib/jminix/commons-beanutils-1.7.0.jar
|
||||
maven://commons-collections/commons-collections/3.2|lib/jminix/commons-collections-3.2.jar
|
||||
maven://net.sf.ezmorph/ezmorph/1.0.6|lib/jminix/ezmorph-1.0.6.jar
|
||||
maven://org.jgroups/jgroups/2.12.1.3.Final|lib/jminix/jgroups-2.12.1.3.Final.jar
|
||||
maven://org.jasypt/jasypt/1.8|lib/jminix/jasypt-1.8.jar
|
||||
|
||||
[lib]
|
||||
lib/jminix/**.jar
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ jmx
|
|||
etc/jolokia.xml
|
||||
|
||||
[files]
|
||||
http://repo1.maven.org/maven2/org/jolokia/jolokia-war/1.2.2/jolokia-war-1.2.2.war|lib/jolokia/jolokia.war
|
||||
maven://org.jolokia/jolokia-war/1.2.2/war|lib/jolokia/jolokia.war
|
||||
|
||||
[license]
|
||||
Jolokia is released under the Apache License 2.0
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.1.v20141016/alpn-boot-7.1.1.v20141016.jar|lib/alpn/alpn-boot-7.1.1.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.1.v20141016|lib/alpn/alpn-boot-7.1.1.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.1.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.1.v20141016/alpn-boot-7.1.1.v20141016.jar|lib/alpn/alpn-boot-7.1.1.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.1.v20141016|lib/alpn/alpn-boot-7.1.1.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.1.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.1.v20141016/alpn-boot-8.1.1.v20141016.jar|lib/alpn/alpn-boot-8.1.1.v20141016.jar
|
||||
maven://org.mortbay.jetty.alpn/alpn-boot/8.1.1.v20141016|lib/alpn/alpn-boot-8.1.1.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.1.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -27,9 +27,6 @@ protonego-impl/alpn-${java.version}
|
|||
lib/jetty-alpn-client-${jetty.version}.jar
|
||||
lib/jetty-alpn-server-${jetty.version}.jar
|
||||
|
||||
[xml]
|
||||
etc/protonego-alpn.xml
|
||||
|
||||
[files]
|
||||
lib/
|
||||
lib/alpn/
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.0.v20120525/npn-boot-1.1.0.v20120525.jar|lib/npn/npn-boot-1.1.0.v20120525.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.0.v20120525|lib/npn/npn-boot-1.1.0.v20120525.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.0.v20120525.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.0.v20120525/npn-boot-1.1.0.v20120525.jar|lib/npn/npn-boot-1.1.0.v20120525.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.0.v20120525|lib/npn/npn-boot-1.1.0.v20120525.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.0.v20120525.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.1.v20121030/npn-boot-1.1.1.v20121030.jar|lib/npn/npn-boot-1.1.1.v20121030.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.1.v20121030|lib/npn/npn-boot-1.1.1.v20121030.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.1.v20121030.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.1.v20121030/npn-boot-1.1.1.v20121030.jar|lib/npn/npn-boot-1.1.1.v20121030.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.1.v20121030|lib/npn/npn-boot-1.1.1.v20121030.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.1.v20121030.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.3.v20130313|lib/npn/npn-boot-1.1.3.v20130313.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.3.v20130313.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.3.v20130313|lib/npn/npn-boot-1.1.3.v20130313.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.3.v20130313.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.3.v20130313|lib/npn/npn-boot-1.1.3.v20130313.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.3.v20130313.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.4.v20130313/npn-boot-1.1.4.v20130313.jar|lib/npn/npn-boot-1.1.4.v20130313.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.4.v20130313|lib/npn/npn-boot-1.1.4.v20130313.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.4.v20130313.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.5.v20130313|lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.5.v20130313|lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.5.v20130313|lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.5.v20130313|lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.6.v20130911|lib/npn/npn-boot-1.1.6.v20130911.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.6.v20130911.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.6.v20130911|lib/npn/npn-boot-1.1.6.v20130911.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.6.v20130911.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.6.v20130911|lib/npn/npn-boot-1.1.6.v20130911.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.6.v20130911.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.8.v20141013|lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.8.v20141013|lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.8.v20141013|lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.8.v20141013|lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.9.v20141016/npn-boot-1.1.9.v20141016.jar|lib/npn/npn-boot-1.1.9.v20141016.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.9.v20141016|lib/npn/npn-boot-1.1.9.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.9.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
protonego-boot
|
||||
|
||||
[files]
|
||||
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.9.v20141016/npn-boot-1.1.9.v20141016.jar|lib/npn/npn-boot-1.1.9.v20141016.jar
|
||||
maven://org.mortbay.jetty.npn/npn-boot/1.1.9.v20141016|lib/npn/npn-boot-1.1.9.v20141016.jar
|
||||
|
||||
[exec]
|
||||
-Xbootclasspath/p:lib/npn/npn-boot-1.1.9.v20141016.jar
|
||||
|
|
|
|||
|
|
@ -23,8 +23,9 @@ protonego-impl
|
|||
[depend]
|
||||
protonego-impl/npn-${java.version}
|
||||
|
||||
[xml]
|
||||
etc/protonego-npn.xml
|
||||
[lib]
|
||||
lib/jetty-npn-client-${jetty.version}.jar
|
||||
lib/jetty-npn-server-${jetty.version}.jar
|
||||
|
||||
[files]
|
||||
lib/
|
||||
|
|
|
|||
|
|
@ -45,5 +45,5 @@ jetty.send.date.header=false
|
|||
jetty.dump.start=false
|
||||
# Dump the state of the Jetty server, before stop
|
||||
jetty.dump.stop=false
|
||||
|
||||
|
||||
# Enable delayed dispatch optimisation
|
||||
jetty.delayDispatchOnContent=false
|
||||
|
|
|
|||
|
|
@ -10,17 +10,12 @@ protonego
|
|||
lib/spdy/*.jar
|
||||
|
||||
[xml]
|
||||
etc/protonego-${protonego}.xml
|
||||
etc/jetty-ssl.xml
|
||||
etc/jetty-spdy.xml
|
||||
|
||||
[ini-template]
|
||||
## SPDY Configuration
|
||||
|
||||
# Port for SPDY connections
|
||||
spdy.port=8443
|
||||
|
||||
# SPDY idle timeout in milliseconds
|
||||
spdy.timeout=30000
|
||||
|
||||
# Initial Window Size for SPDY
|
||||
#spdy.initialWindowSize=65536
|
||||
|
|
|
|||
|
|
@ -16,6 +16,13 @@ http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/
|
|||
# define the port to use for secure redirection
|
||||
jetty.secure.port=8443
|
||||
|
||||
# SSL port to listen on
|
||||
ssl.port=8443
|
||||
# SSL idle timeout in milliseconds
|
||||
ssl.timeout=30000
|
||||
# HTTPS Socket.soLingerTime in seconds. (-1 to disable)
|
||||
# ssl.soLingerTime=-1
|
||||
|
||||
## Setup a demonstration keystore and truststore
|
||||
jetty.keystore=etc/keystore
|
||||
jetty.truststore=etc/keystore
|
||||
|
|
|
|||
Loading…
Reference in New Issue