diff options
Diffstat (limited to 'jetty-deploy')
4 files changed, 23 insertions, 12 deletions
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 6779aad7a0..204d680f9b 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.0.6-SNAPSHOT</version> + <version>9.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-deploy</artifactId> @@ -25,7 +25,7 @@ </goals> <configuration> <instructions> - <Import-Package>org.eclipse.jetty.jmx.*;version="9.0";resolution:=optional,*</Import-Package> + <Import-Package>org.eclipse.jetty.jmx.*;version="9.1";resolution:=optional,*</Import-Package> <_nouses>true</_nouses> </instructions> </configuration> @@ -92,12 +92,5 @@ <version>${project.version}</version> <optional>true</optional> </dependency> - <!-- - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-websocket</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> --> </dependencies> </project> diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml index 1b46387213..16e5253a86 100644 --- a/jetty-deploy/src/main/config/etc/jetty-deploy.xml +++ b/jetty-deploy/src/main/config/etc/jetty-deploy.xml @@ -39,14 +39,14 @@ <Call id="webappprovider" name="addAppProvider"> <Arg> <New class="org.eclipse.jetty.deploy.providers.WebAppProvider"> - <Set name="monitoredDirName"><Property name="jetty.home" default="." />/webapps</Set> + <Set name="monitoredDirName"><Property name="jetty.base" default="." />/webapps</Set> <Set name="defaultsDescriptor"><Property name="jetty.home" default="." />/etc/webdefault.xml</Set> <Set name="scanInterval">1</Set> <Set name="extractWars">true</Set> <Set name="configurationManager"> <New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager"> <!-- file of context configuration properties - <Set name="file"><SystemProperty name="jetty.home"/>/etc/some.properties</Set> + <Set name="file"><SystemProperty name="jetty.base"/>/etc/some.properties</Set> --> <!-- set a context configuration property <Call name="put"><Arg>name</Arg><Arg>value</Arg></Call> @@ -56,7 +56,6 @@ </New> </Arg> </Call> - </New> </Arg> </Call> diff --git a/jetty-deploy/src/main/config/modules/deploy.mod b/jetty-deploy/src/main/config/modules/deploy.mod new file mode 100644 index 0000000000..84c90ab5d2 --- /dev/null +++ b/jetty-deploy/src/main/config/modules/deploy.mod @@ -0,0 +1,17 @@ +# +# Deploy Feature +# + +[depend] +webapp + +[lib] +# Deploy jars +lib/jetty-deploy-${jetty.version}.jar + +[files] +webapps/ + +[xml] +# Deploy configuration +etc/jetty-deploy.xml diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java index fdb73aa9a8..ec94b5a390 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java @@ -267,6 +267,8 @@ public class WebAppProvider extends ScanningAppProvider XmlConfiguration xmlc = new XmlConfiguration(resource.getURL()); xmlc.getIdMap().put("Server",getDeploymentManager().getServer()); + xmlc.getProperties().put("jetty.home",System.getProperty("jetty.home",".")); + xmlc.getProperties().put("jetty.base",System.getProperty("jetty.base",".")); xmlc.getProperties().put("jetty.webapp",file.getCanonicalPath()); xmlc.getProperties().put("jetty.webapps",file.getParentFile().getCanonicalPath()); |