Issue #5264 - Moving demo webapps to /demos/ tree
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt
parent
5654437cc9
commit
faf6d80390
|
|
@ -1,18 +1,17 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty.demos</groupId>
|
||||||
<artifactId>example-async-rest</artifactId>
|
<artifactId>demo-async-rest-parent</artifactId>
|
||||||
<version>10.0.0-SNAPSHOT</version>
|
<version>10.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.eclipse.jetty.example-async-rest</groupId>
|
<artifactId>demo-async-rest-jar</artifactId>
|
||||||
<artifactId>example-async-rest-jar</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<name>Example Async Rest :: Jar</name>
|
<name>Demo Async Rest :: Jar</name>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<bundle-symbolic-name>${project.parent.groupId}.examples.async.rest</bundle-symbolic-name>
|
<bundle-symbolic-name>${project.parent.groupId}.async.rest</bundle-symbolic-name>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
@ -38,7 +38,6 @@ import org.eclipse.jetty.http.HttpMethod;
|
||||||
import org.eclipse.jetty.util.BufferUtil;
|
import org.eclipse.jetty.util.BufferUtil;
|
||||||
import org.eclipse.jetty.util.Utf8StringBuilder;
|
import org.eclipse.jetty.util.Utf8StringBuilder;
|
||||||
import org.eclipse.jetty.util.ajax.JSON;
|
import org.eclipse.jetty.util.ajax.JSON;
|
||||||
import org.eclipse.jetty.util.ssl.SslContextFactory;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Servlet implementation class AsyncRESTServlet.
|
* Servlet implementation class AsyncRESTServlet.
|
||||||
|
Before Width: | Height: | Size: 166 B After Width: | Height: | Size: 166 B |
|
Before Width: | Height: | Size: 164 B After Width: | Height: | Size: 164 B |
|
|
@ -1,18 +1,17 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty.demos</groupId>
|
||||||
<artifactId>example-async-rest</artifactId>
|
<artifactId>demo-async-rest-parent</artifactId>
|
||||||
<version>10.0.0-SNAPSHOT</version>
|
<version>10.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.eclipse.jetty.example-async-rest</groupId>
|
<artifactId>demo-async-rest-server</artifactId>
|
||||||
<artifactId>example-async-rest-server</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<name>Example Async Rest :: Server</name>
|
<name>Demo Async Rest :: Server</name>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<bundle-symbolic-name>${project.parent.groupId}.examples.async.rest.server</bundle-symbolic-name>
|
<bundle-symbolic-name>${project.parent.groupId}.async.rest.server</bundle-symbolic-name>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
@ -1,15 +1,14 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty.demos</groupId>
|
||||||
<artifactId>example-async-rest</artifactId>
|
<artifactId>demo-async-rest-parent</artifactId>
|
||||||
<version>10.0.0-SNAPSHOT</version>
|
<version>10.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.eclipse.jetty.example-async-rest</groupId>
|
<artifactId>demo-async-rest-webapp</artifactId>
|
||||||
<artifactId>example-async-rest-webapp</artifactId>
|
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<name>Example Async Rest :: Webapp</name>
|
<name>Demo Async Rest :: Webapp</name>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<finalName>async-rest</finalName>
|
<finalName>async-rest</finalName>
|
||||||
|
|
@ -26,8 +25,8 @@
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty.example-async-rest</groupId>
|
<groupId>org.eclipse.jetty.demos</groupId>
|
||||||
<artifactId>example-async-rest-jar</artifactId>
|
<artifactId>demo-async-rest-jar</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
@ -11,5 +11,5 @@ webapp
|
||||||
deploy
|
deploy
|
||||||
|
|
||||||
[files]
|
[files]
|
||||||
maven://org.eclipse.jetty.example-async-rest/example-async-rest-webapp/${jetty.version}/war|webapps/demo-async-rest.war
|
maven://org.eclipse.jetty.examples/example-async-rest-webapp/${jetty.version}/war|webapps/demo-async-rest.war
|
||||||
|
|
||||||
|
|
@ -1,20 +1,19 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.eclipse.jetty.examples</groupId>
|
<groupId>org.eclipse.jetty.demos</groupId>
|
||||||
<artifactId>examples-parent</artifactId>
|
<artifactId>demos-parent</artifactId>
|
||||||
<version>10.0.0-SNAPSHOT</version>
|
<version>10.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<artifactId>demo-async-rest-parent</artifactId>
|
||||||
<artifactId>example-async-rest</artifactId>
|
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>Example Async Rest</name>
|
<name>Example Async Rest</name>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>async-rest-jar</module>
|
<module>demo-async-rest-jar</module>
|
||||||
<module>async-rest-webapp</module>
|
<module>demo-async-rest-webapp</module>
|
||||||
<module>async-rest-server</module>
|
<module>demo-async-rest-server</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.eclipse.jetty.tests</groupId>
|
<groupId>org.eclipse.jetty.demos</groupId>
|
||||||
<artifactId>test-webapps-parent</artifactId>
|
<artifactId>demos-parent</artifactId>
|
||||||
<version>10.0.0-SNAPSHOT</version>
|
<version>10.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>test-jaas-webapp</artifactId>
|
<artifactId>demo-jaas-webapp</artifactId>
|
||||||
<name>Jetty Tests :: WebApp :: JAAS</name>
|
<name>Jetty Tests :: WebApp :: JAAS</name>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
|
|
@ -20,7 +20,7 @@ demo-realm
|
||||||
basehome:modules/demo.d/demo-jaas.xml|webapps/demo-jaas.xml
|
basehome:modules/demo.d/demo-jaas.xml|webapps/demo-jaas.xml
|
||||||
basehome:modules/demo.d/demo-login.conf|etc/demo-login.conf
|
basehome:modules/demo.d/demo-login.conf|etc/demo-login.conf
|
||||||
basehome:modules/demo.d/demo-login.properties|etc/demo-login.properties
|
basehome:modules/demo.d/demo-login.properties|etc/demo-login.properties
|
||||||
maven://org.eclipse.jetty.tests/test-jaas-webapp/${jetty.version}/war|webapps/demo-jaas.war
|
maven://org.eclipse.jetty.demos/demo-jaas-webapp/${jetty.version}/war|webapps/demo-jaas.war
|
||||||
|
|
||||||
[ini-template]
|
[ini-template]
|
||||||
# Enable security via jaas, and configure it
|
# Enable security via jaas, and configure it
|
||||||
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
|
@ -1,19 +1,18 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.eclipse.jetty.tests</groupId>
|
<groupId>org.eclipse.jetty.demos</groupId>
|
||||||
<artifactId>test-webapps-parent</artifactId>
|
<artifactId>demos-parent</artifactId>
|
||||||
<version>10.0.0-SNAPSHOT</version>
|
<version>10.0.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<artifactId>demo-jetty-webapp</artifactId>
|
||||||
<artifactId>test-jetty-webapp</artifactId>
|
<name>Demo :: Jetty Test Webapp</name>
|
||||||
<name>Test :: Jetty Test Webapp</name>
|
|
||||||
<url>http://www.eclipse.org/jetty</url>
|
<url>http://www.eclipse.org/jetty</url>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
<bundle-symbolic-name>${project.groupId}.tests.webapp</bundle-symbolic-name>
|
<bundle-symbolic-name>${project.groupId}.webapp</bundle-symbolic-name>
|
||||||
</properties>
|
</properties>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|
@ -86,55 +85,7 @@
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-deploy-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<!-- DEMO Project, Must Deploy -->
|
|
||||||
<skip>false</skip>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
<pluginManagement>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-maven-plugin</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-client</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-servlets</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<configuration>
|
|
||||||
<stopPort>8087</stopPort>
|
|
||||||
<stopKey>foo</stopKey>
|
|
||||||
<scan>1</scan>
|
|
||||||
<systemProperties>
|
|
||||||
<fooprop>222</fooprop>
|
|
||||||
</systemProperties>
|
|
||||||
<webApp>
|
|
||||||
<contextPath>/test</contextPath>
|
|
||||||
<tempDirectory>${project.build.directory}/work</tempDirectory>
|
|
||||||
</webApp>
|
|
||||||
<loginServices>
|
|
||||||
<loginService implementation="org.eclipse.jetty.security.HashLoginService">
|
|
||||||
<name>Test Realm</name>
|
|
||||||
<config>src/main/config/demo-base/etc/realm.properties</config>
|
|
||||||
</loginService>
|
|
||||||
</loginServices>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
</plugins>
|
|
||||||
</pluginManagement>
|
|
||||||
</build>
|
</build>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
@ -22,5 +22,5 @@ demo-realm
|
||||||
[files]
|
[files]
|
||||||
webapps/demo-jetty.d/
|
webapps/demo-jetty.d/
|
||||||
basehome:modules/demo.d/demo-jetty.xml|webapps/demo-jetty.xml
|
basehome:modules/demo.d/demo-jetty.xml|webapps/demo-jetty.xml
|
||||||
maven://org.eclipse.jetty/test-jetty-webapp/${jetty.version}/war|webapps/demo-jetty.war
|
|
||||||
basehome:modules/demo.d/demo-jetty-override-web.xml|webapps/demo-jetty.d/demo-jetty-override-web.xml
|
basehome:modules/demo.d/demo-jetty-override-web.xml|webapps/demo-jetty.d/demo-jetty-override-web.xml
|
||||||
|
maven://org.eclipse.jetty.demos/demo-jetty-webapp/${jetty.version}/war|webapps/demo-jetty.war
|
||||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 71 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue