Abandoned project, use jetty-logback and jetty-webapp-logging instead (both now found at codehaus)
diff --git a/jetty-distribution-with-logback/pom.xml b/jetty-distribution-with-logback/pom.xml
deleted file mode 100644
index 9e90530..0000000
--- a/jetty-distribution-with-logback/pom.xml
+++ /dev/null
@@ -1,574 +0,0 @@
-<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>
- <parent>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-project</artifactId>
- <version>7.0.2-SNAPSHOT</version>
- </parent>
- <artifactId>jetty-distribution-with-logback</artifactId>
- <name>Jetty :: Distribution Assemblies</name>
- <packaging>pom</packaging>
- <properties>
- <assembly.directory>target/distribution</assembly.directory>
- <slf4j.version>1.5.6</slf4j.version>
- <logback.version>0.9.9</logback.version>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <includeEmptyDirs>true</includeEmptyDirs>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="orbit.base.url" value="http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles" />
- <mkdir dir="${assembly.directory}/lib" />
- <get src="${orbit.base.url}/javax.servlet_2.5.0.v200806031605.jar" dest="${assembly.directory}/lib/servlet-api-2.5.jar" usetimestamp="true" verbose="true" />
- <mkdir dir="${assembly.directory}/lib/jndi" />
- <get src="${orbit.base.url}/javax.activation_1.1.0.v200905021805.jar" dest="${assembly.directory}/lib/jndi/activation-1.1.jar" usetimestamp="true" verbose="true" />
- <get src="${orbit.base.url}/javax.mail_1.4.0.v200905040518.jar" dest="${assembly.directory}/lib/jndi/mail-1.4.jar" usetimestamp="true" verbose="true" />
- <copy file="../VERSION.txt" todir="${assembly.directory}" />
- <chmod dir="${assembly.directory}/bin" perm="755" includes="**/*.sh" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.eclipse.jetty.toolchain:jetty-artifact-remote-resources:1.0</resourceBundle>
- <resourceBundle>org.eclipse.jetty.toolchain:jetty-distribution-remote-resources:1.1</resourceBundle>
- </resourceBundles>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-rewrite</artifactId>
- <version>${project.version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-ajp</artifactId>
- <version>${project.version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>test-jetty-webapp</artifactId>
- <version>${project.version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jmx</artifactId>
- <version>${project.version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${project.version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${project.version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>${project.version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${project.version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-policy</artifactId>
- <version>${project.version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-logback</artifactId>
- <version>${project.version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-xml</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <!-- Jetty Deploy -->
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-deploy</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jmx</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-rewrite</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-ajp</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-annotations</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jndi</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-policy</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>test-jetty-webapp</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/webapps</outputDirectory>
- <destFileName>test.war</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-start</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- <destFileName>start.jar</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-websocket</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib/logback</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib/logback</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib/logback</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib/logback</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}/lib/logback</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <!--
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
- <outputDirectory>${assembly.directory}/lib/annotations</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
- <version>3.1</version>
- <outputDirectory>${assembly.directory}/lib/annotations</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.1</version>
- <outputDirectory>${assembly.directory}/lib/annotations</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>asm</groupId>
- <artifactId>asm-tree</artifactId>
- <version>3.1</version>
- <outputDirectory>${assembly.directory}/lib/annotations</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- -->
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/jetty-assembly.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-deploy</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-rewrite</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-ajp</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-annotations</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>test-jetty-webapp</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jmx</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jndi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-start</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-policy</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-websocket</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/jetty-distribution-with-logback/src/main/assembly/jetty-assembly.xml b/jetty-distribution-with-logback/src/main/assembly/jetty-assembly.xml
deleted file mode 100644
index 3c5a9cc..0000000
--- a/jetty-distribution-with-logback/src/main/assembly/jetty-assembly.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<assembly>
- <formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${assembly.directory}</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/META-INF/**</exclude>
- <exclude>*-config.jar</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/jetty-distribution-with-logback/src/main/assembly/jetty-src.xml b/jetty-distribution-with-logback/src/main/assembly/jetty-src.xml
deleted file mode 100644
index b1b6bd8..0000000
--- a/jetty-distribution-with-logback/src/main/assembly/jetty-src.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<assembly>
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${basedir}/target/dist-src</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/.svn/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/jetty-distribution-with-logback/src/main/assembly/site-component.xml b/jetty-distribution-with-logback/src/main/assembly/site-component.xml
deleted file mode 100644
index c87eab9..0000000
--- a/jetty-distribution-with-logback/src/main/assembly/site-component.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<assembly>
- <id>site-component</id>
- <formats>
- <format>jar</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${basedir}/target/dist-src</directory>
- <outputDirectory>jetty-distribution-${version}-site-component</outputDirectory>
- <includes>
- <include>target/site/**</include>
- <include>README**</include>
- <include>VERSION**</include>
- <include>LICENSES/**</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/jetty-distribution-with-logback/src/main/resources/README.txt b/jetty-distribution-with-logback/src/main/resources/README.txt
deleted file mode 100644
index 5d41b2c..0000000
--- a/jetty-distribution-with-logback/src/main/resources/README.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-
-JETTY
-=====
-
-The Jetty project is a 100% Java HTTP Server, HTTP Client
-and Servlet Container. The core project is hosted by
-the Eclipse Foundation at
-
- http://www.eclipse.org/jetty/
-
-The jetty integrations with 3rd party modules are hosted
-by the Codehaus at
-
- http://jetty.codehaus.org
-
-
-JETTY DISTRIBUTION
-==================
-
-This is the jetty-distribution module from Jetty @ eclipse
-project and is based on the Jetty modules from eclipse plus
-dependencies that have been through the eclipse IP
-process and conditioning.
-
-This distribution and its dependencies are provided under
-the terms and conditions of the Eclipse Foundation Software
-User Agreement unless otherwise specified.
-
-This distribution contains only the core functionality
-of a servlet server and the HTTP client.
-
-Some modules (eg annotations) are missing dependencies
-which may be discovered by using the command
- mvn dependency:tree
-within the source module and placing them in the
-lib/ext directory. Alternately we recommend the jetty-hightide
-distribution for users that desire more third party integrations.
-
-
-JETTY HIGHTIDE
-==============
-
-The Jetty-hightide distribution is available for
-download via http://jetty.codehaus.org and contains
-the core jetty modules, plus the 3rd party dependencies
-and integrations needed to create a full featured
-application server.
-
-
-MAVEN
-=====
-All Jetty artifacts are available as maven dependencies
-under the org.eclipse.jetty and org.mortbay.hightide group IDs
-
- http://repo1.maven.org/maven2/org/eclipse/jetty/
- http://repo2.maven.org/maven2/org/mortbay/jetty/
-
-
-RUNNING JETTY
-=============
-
-The run directory is either the top-level of a distribution
-or jetty-distribution/target/distribution directory when built from
-source.
-
-To run with the default options:
-
- java -jar start.jar
-
-To run with specific configuration file(s)
-
- java -jar start.jar etc/jetty.xml
-
-To see the available options
-
- java -jar start.jar --help
-
-To run with JSP support (if available)
-
- java -jar start.jar OPTIONS=Server,jsp
-
-To run with JMX support
-
- java -jar start.jar OPTIONS=Server,jmx etc/jetty-jmx.xml etc/jetty.xml
-
-To run with JSP & JMX support
-
- java -jar start.jar OPTIONS=Server,jsp,jmx etc/jetty-jmx.xml etc/jetty.xml
-
-
diff --git a/jetty-distribution-with-logback/src/main/resources/bin/README.jetty-cygwin.txt.txt b/jetty-distribution-with-logback/src/main/resources/bin/README.jetty-cygwin.txt.txt
deleted file mode 100644
index 6ac050d..0000000
--- a/jetty-distribution-with-logback/src/main/resources/bin/README.jetty-cygwin.txt.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Before running jetty-cygwin.sh on cygwin, define the JAVA_HOME and JETTY_HOME first.
-
-$ export JAVA_HOME=/path/to/jvm
-$ export JETTY_HOME=/path/to/jetty
-
-Examples:
-$ export JAVA_HOME=/usr/bin/jvm
-So assuming you installed cygwin on C:\cygwin, the jvm needs to be in C:\cygwin\usr\bin\jvm
-
-$ export JETTY_HOME=/usr/share/jetty6
-So assuming you installed cygwin on C:\cygwin, jetty needs to be in C:\cygwin\usr\share\jetty6
\ No newline at end of file
diff --git a/jetty-distribution-with-logback/src/main/resources/bin/jetty-cygwin.sh b/jetty-distribution-with-logback/src/main/resources/bin/jetty-cygwin.sh
deleted file mode 100755
index 550390e..0000000
--- a/jetty-distribution-with-logback/src/main/resources/bin/jetty-cygwin.sh
+++ /dev/null
@@ -1,677 +0,0 @@
-#!/bin/bash
-#
-# Startup script for jetty under *nix systems (it works under NT/cygwin too).
-
-# To get the service to restart correctly on reboot, uncomment below (3 lines):
-# ========================
-# chkconfig: 3 99 99
-# description: Jetty 7 webserver
-# processname: jetty
-# ========================
-
-# Configuration files
-#
-# /etc/default/jetty
-# If it exists, this is read at the start of script. It may perform any
-# sequence of shell commands, like setting relevant environment variables.
-#
-# $HOME/.jettyrc
-# If it exists, this is read at the start of script. It may perform any
-# sequence of shell commands, like setting relevant environment variables.
-#
-# /etc/jetty.conf
-# If found, and no configurations were given on the command line,
-# the file will be used as this script's configuration.
-# Each line in the file may contain:
-# - A comment denoted by the pound (#) sign as first non-blank character.
-# - The path to a regular file, which will be passed to jetty as a
-# config.xml file.
-# - The path to a directory. Each *.xml file in the directory will be
-# passed to jetty as a config.xml file.
-#
-# The files will be checked for existence before being passed to jetty.
-#
-# $JETTY_HOME/etc/jetty.xml
-# If found, used as this script's configuration file, but only if
-# /etc/jetty.conf was not present. See above.
-#
-# Configuration variables
-#
-# JAVA_HOME
-# Home of Java installation.
-#
-# JAVA
-# Command to invoke Java. If not set, $JAVA_HOME/bin/java will be
-# used.
-#
-# JAVA_OPTIONS
-# Extra options to pass to the JVM
-#
-# JETTY_HOME
-# Where Jetty is installed. If not set, the script will try go
-# guess it by first looking at the invocation path for the script,
-# and then by looking in standard locations as $HOME/opt/jetty
-# and /opt/jetty. The java system property "jetty.home" will be
-# set to this value for use by configure.xml files, f.e.:
-#
-# <Arg><SystemProperty name="jetty.home" default="."/>/webapps/jetty.war</Arg>
-#
-# JETTY_PORT
-# Override the default port for Jetty servers. If not set then the
-# default value in the xml configuration file will be used. The java
-# system property "jetty.port" will be set to this value for use in
-# configure.xml files. For example, the following idiom is widely
-# used in the demo config files to respect this property in Listener
-# configuration elements:
-#
-# <Set name="Port"><SystemProperty name="jetty.port" default="8080"/></Set>
-#
-# Note: that the config file could ignore this property simply by saying:
-#
-# <Set name="Port">8080</Set>
-#
-# JETTY_RUN
-# Where the jetty.pid file should be stored. It defaults to the
-# first available of /var/run, /usr/var/run, and /tmp if not set.
-#
-# JETTY_PID
-# The Jetty PID file, defaults to $JETTY_RUN/jetty.pid
-#
-# JETTY_ARGS
-# The default arguments to pass to jetty.
-#
-# JETTY_USER
-# if set, then used as a username to run the server as
-#
-
-usage()
-{
- echo "Usage: $0 {start|stop|run|restart|check|supervise} [ CONFIGS ... ] "
- exit 1
-}
-
-[ $# -gt 0 ] || usage
-
-
-##################################################
-# Some utility functions
-##################################################
-findDirectory()
-{
- OP=$1
- shift
- for L in $* ; do
- [ $OP $L ] || continue
- echo $L
- break
- done
-}
-
-running()
-{
- [ -f $1 ] || return 1
- PID=$(cat $1)
- ps -p $PID >/dev/null 2>/dev/null || return 1
- return 0
-}
-
-
-
-
-
-
-
-##################################################
-# Get the action & configs
-##################################################
-
-ACTION=$1
-shift
-ARGS="$*"
-CONFIGS=""
-NO_START=0
-
-##################################################
-# See if there's a default configuration file
-##################################################
-if [ -f /etc/default/jetty7 ] ; then
- . /etc/default/jetty7
-elif [ -f /etc/default/jetty ] ; then
- . /etc/default/jetty
-fi
-
-
-##################################################
-# See if there's a user-specific configuration file
-##################################################
-if [ -f $HOME/.jettyrc ] ; then
- . $HOME/.jettyrc
-fi
-
-##################################################
-# Set tmp if not already set.
-##################################################
-
-if [ -z "$TMP" ]
-then
- TMP=/tmp
-fi
-
-##################################################
-# Jetty's hallmark
-##################################################
-JETTY_INSTALL_TRACE_FILE="etc/jetty.xml"
-TMPJ=$TMP/j$$
-
-
-##################################################
-# Try to determine JETTY_HOME if not set
-##################################################
-if [ -z "$JETTY_HOME" ]
-then
- JETTY_HOME_1=`dirname "$0"`
- JETTY_HOME_1=`dirname "$JETTY_HOME_1"`
- if [ -f "${JETTY_HOME_1}/${JETTY_INSTALL_TRACE_FILE}" ] ;
- then
- JETTY_HOME=${JETTY_HOME_1}
- fi
-fi
-
-
-##################################################
-# if no JETTY_HOME, search likely locations.
-##################################################
-if [ "$JETTY_HOME" = "" ] ; then
- STANDARD_LOCATIONS=" \
- /usr/share \
- /usr/share/java \
- $HOME \
- $HOME/src \
- ${HOME}/opt/ \
- /opt \
- /java \
- /usr/local \
- /usr/local/share \
- /usr/local/share/java \
- /home \
- "
- JETTY_DIR_NAMES=" \
- jetty-7 \
- jetty7 \
- jetty-7.* \
- jetty \
- Jetty-7 \
- Jetty7 \
- Jetty-7.* \
- Jetty \
- "
-
- JETTY_HOME=
- for L in $STANDARD_LOCATIONS
- do
- for N in $JETTY_DIR_NAMES
- do
- if [ -d $L/$N ] && [ -f "$L/${N}/${JETTY_INSTALL_TRACE_FILE}" ] ;
- then
- JETTY_HOME="$L/$N"
- fi
- done
- [ ! -z "$JETTY_HOME" ] && break
- done
-fi
-
-
-##################################################
-# No JETTY_HOME yet? We're out of luck!
-##################################################
-if [ -z "$JETTY_HOME" ] ; then
- echo "** ERROR: JETTY_HOME not set, you need to set it or install in a standard location"
- exit 1
-fi
-
-cd $JETTY_HOME
-JETTY_HOME=`pwd`
-
-
-#####################################################
-# Check that jetty is where we think it is
-#####################################################
-if [ ! -r $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE ]
-then
- echo "** ERROR: Oops! Jetty doesn't appear to be installed in $JETTY_HOME"
- echo "** ERROR: $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE is not readable!"
- exit 1
-fi
-
-
-###########################################################
-# Get the list of config.xml files from the command line.
-###########################################################
-if [ ! -z "$ARGS" ]
-then
- for A in $ARGS
- do
- if [ -f $A ]
- then
- CONF="$A"
- elif [ -f $JETTY_HOME/etc/$A ]
- then
- CONF="$JETTY_HOME/etc/$A"
- elif [ -f ${A}.xml ]
- then
- CONF="${A}.xml"
- elif [ -f $JETTY_HOME/etc/${A}.xml ]
- then
- CONF="$JETTY_HOME/etc/${A}.xml"
- else
- echo "** ERROR: Cannot find configuration '$A' specified in the command line."
- exit 1
- fi
- if [ ! -r $CONF ]
- then
- echo "** ERROR: Cannot read configuration '$A' specified in the command line."
- exit 1
- fi
- CONFIGS="$CONFIGS $CONF"
- done
-fi
-
-
-##################################################
-# Try to find this script's configuration file,
-# but only if no configurations were given on the
-# command line.
-##################################################
-if [ -z "$JETTY_CONF" ]
-then
- if [ -f /etc/jetty.conf ]
- then
- JETTY_CONF=/etc/jetty.conf
- elif [ -f "${JETTY_HOME}/etc/jetty.conf" ]
- then
- JETTY_CONF="${JETTY_HOME}/etc/jetty.conf"
- fi
-fi
-
-##################################################
-# Read the configuration file if one exists
-##################################################
-CONFIG_LINES=
-if [ -z "$CONFIGS" ] && [ -f "$JETTY_CONF" ] && [ -r "$JETTY_CONF" ]
-then
- CONFIG_LINES=`cat $JETTY_CONF | grep -v "^[:space:]*#" | tr "\n" " "`
-fi
-
-##################################################
-# Get the list of config.xml files from jetty.conf
-##################################################
-if [ ! -z "${CONFIG_LINES}" ]
-then
- for CONF in ${CONFIG_LINES}
- do
- if [ ! -r "$CONF" ]
- then
- echo "** WARNING: Cannot read '$CONF' specified in '$JETTY_CONF'"
- elif [ -f "$CONF" ]
- then
- # assume it's a configure.xml file
- CONFIGS="$CONFIGS $CONF"
- elif [ -d "$CONF" ]
- then
- # assume it's a directory with configure.xml files
- # for example: /etc/jetty.d/
- # sort the files before adding them to the list of CONFIGS
- XML_FILES=`ls ${CONF}/*.xml | sort | tr "\n" " "`
- for FILE in ${XML_FILES}
- do
- if [ -r "$FILE" ] && [ -f "$FILE" ]
- then
- CONFIGS="$CONFIGS $FILE"
- else
- echo "** WARNING: Cannot read '$FILE' specified in '$JETTY_CONF'"
- fi
- done
- else
- echo "** WARNING: Don''t know what to do with '$CONF' specified in '$JETTY_CONF'"
- fi
- done
-fi
-
-#####################################################
-# Run the standard server if there's nothing else to run
-#####################################################
-if [ -z "$CONFIGS" ]
-then
- CONFIGS="${JETTY_HOME}/etc/jetty-logging.xml ${JETTY_HOME}/etc/jetty.xml"
-fi
-
-
-#####################################################
-# Find a location for the pid file
-#####################################################
-if [ -z "$JETTY_RUN" ]
-then
- JETTY_RUN=`findDirectory -w /var/run /usr/var/run /tmp`
-fi
-
-#####################################################
-# Find a PID for the pid file
-#####################################################
-if [ -z "$JETTY_PID" ]
-then
- JETTY_PID="$JETTY_RUN/jetty.pid"
-fi
-
-
-##################################################
-# Check for JAVA_HOME
-##################################################
-if [ -z "$JAVA_HOME" ]
-then
- # If a java runtime is not defined, search the following
- # directories for a JVM and sort by version. Use the highest
- # version number.
-
- # Java search path
- JAVA_LOCATIONS="\
- /usr/java \
- /usr/bin \
- /usr/local/bin \
- /usr/local/java \
- /usr/local/jdk \
- /usr/local/jre \
- /usr/lib/jvm \
- /opt/java \
- /opt/jdk \
- /opt/jre \
- "
- JAVA_NAMES="java jdk jre"
- for N in $JAVA_NAMES ; do
- for L in $JAVA_LOCATIONS ; do
- [ -d $L ] || continue
- find $L -name "$N" ! -type d | grep -v threads | while read J ; do
- [ -x $J ] || continue
- VERSION=`eval $J -version 2>&1`
- [ $? = 0 ] || continue
- VERSION=`expr "$VERSION" : '.*"\(1.[0-9\.]*\)["_]'`
- [ "$VERSION" = "" ] && continue
- expr $VERSION \< 1.2 >/dev/null && continue
- echo $VERSION:$J
- done
- done
- done | sort | tail -1 > $TMPJ
- JAVA=`cat $TMPJ | cut -d: -f2`
- JVERSION=`cat $TMPJ | cut -d: -f1`
-
- JAVA_HOME=`dirname $JAVA`
- while [ ! -z "$JAVA_HOME" -a "$JAVA_HOME" != "/" -a ! -f "$JAVA_HOME/lib/tools.jar" ] ; do
- JAVA_HOME=`dirname $JAVA_HOME`
- done
- [ "$JAVA_HOME" = "" ] && JAVA_HOME=
-
- echo "Found JAVA=$JAVA in JAVA_HOME=$JAVA_HOME"
-fi
-
-
-##################################################
-# Determine which JVM of version >1.2
-# Try to use JAVA_HOME
-##################################################
-if [ "$JAVA" = "" -a "$JAVA_HOME" != "" ]
-then
- if [ ! -z "$JAVACMD" ]
- then
- JAVA="$JAVACMD"
- else
- [ -x $JAVA_HOME/bin/jre -a ! -d $JAVA_HOME/bin/jre ] && JAVA=$JAVA_HOME/bin/jre
- [ -x $JAVA_HOME/bin/java -a ! -d $JAVA_HOME/bin/java ] && JAVA=$JAVA_HOME/bin/java
- fi
-fi
-
-if [ "$JAVA" = "" ]
-then
- echo "Cannot find a JRE or JDK. Please set JAVA_HOME to a >=1.2 JRE" 2>&2
- exit 1
-fi
-
-JAVA_VERSION=`expr "$($JAVA -version 2>&1 | head -1)" : '.*1\.\([0-9]\)'`
-
-#####################################################
-# See if JETTY_PORT is defined
-#####################################################
-if [ "$JETTY_PORT" != "" ]
-then
- JAVA_OPTIONS="$JAVA_OPTIONS -Djetty.port=$JETTY_PORT"
-fi
-
-#####################################################
-# See if JETTY_LOGS is defined
-#####################################################
-if [ "$JETTY_LOGS" != "" ]
-then
- JAVA_OPTIONS="$JAVA_OPTIONS -Djetty.logs=$JETTY_LOGS"
-fi
-
-#####################################################
-# Are we running on Windows? Could be, with Cygwin/NT.
-#####################################################
-case "`uname`" in
-CYGWIN*) PATH_SEPARATOR=";";;
-*) PATH_SEPARATOR=":";;
-esac
-
-
-#####################################################
-# Add jetty properties to Java VM options.
-#####################################################
-JAVA_OPTIONS="$JAVA_OPTIONS -Djetty.home=$JETTY_HOME -Djava.io.tmpdir=$TMP"
-
-[ -f $JETTY_HOME/etc/start.config ] && JAVA_OPTIONS="-DSTART=$JETTY_HOME/etc/start.config $JAVA_OPTIONS"
-
-#####################################################
-# This is how the Jetty server will be started
-#####################################################
-
-JETTY_START=$JETTY_HOME/start.jar
-[ ! -f $JETTY_START ] && JETTY_START=$JETTY_HOME/lib/start.jar
-
-case "`uname`" in
-CYGWIN*)
-JETTY_START="`cygpath -w $JETTY_START`"
-echo $JETTY_START
-
-CONFIGS="`cygpath -w $CONFIGS`"
-echo $CONFIGS
-;;
-esac
-
-
-RUN_ARGS="$JAVA_OPTIONS -jar $JETTY_START $JETTY_ARGS $CONFIGS"
-RUN_CMD="$JAVA $RUN_ARGS"
-
-#####################################################
-# Comment these out after you're happy with what
-# the script is doing.
-#####################################################
-#echo "JETTY_HOME = $JETTY_HOME"
-#echo "JETTY_CONF = $JETTY_CONF"
-#echo "JETTY_RUN = $JETTY_RUN"
-#echo "JETTY_PID = $JETTY_PID"
-#echo "JETTY_ARGS = $JETTY_ARGS"
-#echo "CONFIGS = $CONFIGS"
-#echo "JAVA_OPTIONS = $JAVA_OPTIONS"
-#echo "JAVA = $JAVA"
-
-
-##################################################
-# Do the action
-##################################################
-case "$ACTION" in
- start)
- echo -n "Starting Jetty: "
-
- if [ "$NO_START" = "1" ]; then
- echo "Not starting jetty - NO_START=1 in /etc/default/jetty7";
- exit 0;
- fi
-
-
- if [ "$START_STOP_DAEMON" = "1" ] && type start-stop-daemon > /dev/null 2>&1
- then
- [ x$JETTY_USER = x ] && JETTY_USER=$(whoami)
- [ $UID = 0 ] && CH_USER="-c $JETTY_USER"
- if start-stop-daemon -S -p$JETTY_PID $CH_USER -d $JETTY_HOME -b -m -a $JAVA -- $RUN_ARGS
- then
- sleep 1
- if running $JETTY_PID
- then
- echo OK
- else
- echo FAILED
- fi
- fi
-
- else
-
- if [ -f $JETTY_PID ]
- then
- if running $JETTY_PID
- then
- echo "Already Running!!"
- exit 1
- else
- # dead pid file - remove
- rm -f $JETTY_PID
- fi
- fi
-
- if [ x$JETTY_USER != x ]
- then
- touch $JETTY_PID
- chown $JETTY_USER $JETTY_PID
- su - $JETTY_USER -c "
- $RUN_CMD &
- PID=\$!
- disown \$PID
- echo \$PID > $JETTY_PID"
- else
- $RUN_CMD &
- PID=$!
- disown $PID
- echo $PID > $JETTY_PID
- fi
-
- echo "STARTED Jetty `date`"
- fi
-
- ;;
-
- stop)
- echo -n "Stopping Jetty: "
- if [ "$START_STOP_DAEMON" = "1" ] && type start-stop-daemon > /dev/null 2>&1; then
- start-stop-daemon -K -p $JETTY_PID -d $JETTY_HOME -a $JAVA -s HUP
- sleep 1
- if running $JETTY_PID
- then
- sleep 3
- if running $JETTY_PID
- then
- sleep 30
- if running $JETTY_PID
- then
- start-stop-daemon -K -p $JETTY_PID -d $JETTY_HOME -a $JAVA -s KILL
- fi
- fi
- fi
-
- rm -f $JETTY_PID
- echo OK
- else
- PID=`cat $JETTY_PID 2>/dev/null`
- TIMEOUT=30
- while running $JETTY_PID && [ $TIMEOUT -gt 0 ]
- do
- kill $PID 2>/dev/null
- sleep 1
- let TIMEOUT=$TIMEOUT-1
- done
-
- [ $TIMEOUT -gt 0 ] || kill -9 $PID 2>/dev/null
-
- rm -f $JETTY_PID
- echo OK
- fi
- ;;
-
- restart)
- JETTY_SH=$0
- if [ ! -f $JETTY_SH ]; then
- if [ ! -f $JETTY_HOME/bin/jetty.sh ]; then
- echo "$JETTY_HOME/bin/jetty.sh does not exist."
- exit 1
- fi
- JETTY_SH=$JETTY_HOME/bin/jetty.sh
- fi
- $JETTY_SH stop $*
- sleep 5
- $JETTY_SH start $*
- ;;
-
- supervise)
- #
- # Under control of daemontools supervise monitor which
- # handles restarts and shutdowns via the svc program.
- #
- exec $RUN_CMD
- ;;
-
- run|demo)
- echo "Running Jetty: "
-
- if [ -f $JETTY_PID ]
- then
- if running $JETTY_PID
- then
- echo "Already Running!!"
- exit 1
- else
- # dead pid file - remove
- rm -f $JETTY_PID
- fi
- fi
-
- exec $RUN_CMD
- ;;
-
- check)
- echo "Checking arguments to Jetty: "
- echo "JETTY_HOME = $JETTY_HOME"
- echo "JETTY_CONF = $JETTY_CONF"
- echo "JETTY_RUN = $JETTY_RUN"
- echo "JETTY_PID = $JETTY_PID"
- echo "JETTY_PORT = $JETTY_PORT"
- echo "JETTY_LOGS = $JETTY_LOGS"
- echo "CONFIGS = $CONFIGS"
- echo "JAVA_OPTIONS = $JAVA_OPTIONS"
- echo "JAVA = $JAVA"
- echo "CLASSPATH = $CLASSPATH"
- echo "RUN_CMD = $RUN_CMD"
- echo
-
- if [ -f $JETTY_RUN/jetty.pid ]
- then
- echo "Jetty running pid="`cat $JETTY_RUN/jetty.pid`
- exit 0
- fi
- exit 1
- ;;
-
-*)
- usage
- ;;
-esac
-
-exit 0
-
-
-
diff --git a/jetty-distribution-with-logback/src/main/resources/bin/jetty-xinetd.sh b/jetty-distribution-with-logback/src/main/resources/bin/jetty-xinetd.sh
deleted file mode 100755
index f74b932..0000000
--- a/jetty-distribution-with-logback/src/main/resources/bin/jetty-xinetd.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-
-# look for JETTY_HOME
-if [ -z "$JETTY_HOME" ]
-then
- JETTY_HOME_1=`dirname "$0"`
- JETTY_HOME_1=`dirname "$JETTY_HOME_1"`
- JETTY_HOME=${JETTY_HOME_1}
-fi
-
-cd $JETTY_HOME
-exec /usr/bin/java -Djetty.port=8088 -jar start.jar etc/jetty.xml etc/jetty-xinetd.xml
-
diff --git a/jetty-distribution-with-logback/src/main/resources/bin/jetty.sh b/jetty-distribution-with-logback/src/main/resources/bin/jetty.sh
deleted file mode 100755
index 5c3fda5..0000000
--- a/jetty-distribution-with-logback/src/main/resources/bin/jetty.sh
+++ /dev/null
@@ -1,666 +0,0 @@
-#!/bin/bash
-#
-# Startup script for jetty under *nix systems (it works under NT/cygwin too).
-
-# To get the service to restart correctly on reboot, uncomment below (3 lines):
-# ========================
-# chkconfig: 3 99 99
-# description: Jetty 7 webserver
-# processname: jetty
-# ========================
-
-# Configuration files
-#
-# /etc/default/jetty
-# If it exists, this is read at the start of script. It may perform any
-# sequence of shell commands, like setting relevant environment variables.
-#
-# $HOME/.jettyrc
-# If it exists, this is read at the start of script. It may perform any
-# sequence of shell commands, like setting relevant environment variables.
-#
-# /etc/jetty.conf
-# If found, and no configurations were given on the command line,
-# the file will be used as this script's configuration.
-# Each line in the file may contain:
-# - A comment denoted by the pound (#) sign as first non-blank character.
-# - The path to a regular file, which will be passed to jetty as a
-# config.xml file.
-# - The path to a directory. Each *.xml file in the directory will be
-# passed to jetty as a config.xml file.
-#
-# The files will be checked for existence before being passed to jetty.
-#
-# $JETTY_HOME/etc/jetty.xml
-# If found, used as this script's configuration file, but only if
-# /etc/jetty.conf was not present. See above.
-#
-# Configuration variables
-#
-# JAVA_HOME
-# Home of Java installation.
-#
-# JAVA
-# Command to invoke Java. If not set, $JAVA_HOME/bin/java will be
-# used.
-#
-# JAVA_OPTIONS
-# Extra options to pass to the JVM
-#
-# JETTY_HOME
-# Where Jetty is installed. If not set, the script will try go
-# guess it by first looking at the invocation path for the script,
-# and then by looking in standard locations as $HOME/opt/jetty
-# and /opt/jetty. The java system property "jetty.home" will be
-# set to this value for use by configure.xml files, f.e.:
-#
-# <Arg><SystemProperty name="jetty.home" default="."/>/webapps/jetty.war</Arg>
-#
-# JETTY_PORT
-# Override the default port for Jetty servers. If not set then the
-# default value in the xml configuration file will be used. The java
-# system property "jetty.port" will be set to this value for use in
-# configure.xml files. For example, the following idiom is widely
-# used in the demo config files to respect this property in Listener
-# configuration elements:
-#
-# <Set name="Port"><SystemProperty name="jetty.port" default="8080"/></Set>
-#
-# Note: that the config file could ignore this property simply by saying:
-#
-# <Set name="Port">8080</Set>
-#
-# JETTY_RUN
-# Where the jetty.pid file should be stored. It defaults to the
-# first available of /var/run, /usr/var/run, and /tmp if not set.
-#
-# JETTY_PID
-# The Jetty PID file, defaults to $JETTY_RUN/jetty.pid
-#
-# JETTY_ARGS
-# The default arguments to pass to jetty.
-#
-# JETTY_USER
-# if set, then used as a username to run the server as
-#
-# Set to 0 if you do not want to use start-stop-daemon (especially on SUSE boxes)
-START_STOP_DAEMON=1
-
-usage()
-{
- echo "Usage: $0 {start|stop|run|restart|check|supervise} [ CONFIGS ... ] "
- exit 1
-}
-
-[ $# -gt 0 ] || usage
-
-
-##################################################
-# Some utility functions
-##################################################
-findDirectory()
-{
- OP=$1
- shift
- for L in $* ; do
- [ $OP $L ] || continue
- echo $L
- break
- done
-}
-
-running()
-{
- [ -f $1 ] || return 1
- PID=$(cat $1)
- ps -p $PID >/dev/null 2>/dev/null || return 1
- return 0
-}
-
-
-
-
-
-
-
-##################################################
-# Get the action & configs
-##################################################
-
-ACTION=$1
-shift
-ARGS="$*"
-CONFIGS=""
-NO_START=0
-
-##################################################
-# See if there's a default configuration file
-##################################################
-if [ -f /etc/default/jetty7 ] ; then
- . /etc/default/jetty7
-elif [ -f /etc/default/jetty ] ; then
- . /etc/default/jetty
-fi
-
-
-##################################################
-# See if there's a user-specific configuration file
-##################################################
-if [ -f $HOME/.jettyrc ] ; then
- . $HOME/.jettyrc
-fi
-
-##################################################
-# Set tmp if not already set.
-##################################################
-
-if [ -z "$TMP" ]
-then
- TMP=/tmp
-fi
-
-##################################################
-# Jetty's hallmark
-##################################################
-JETTY_INSTALL_TRACE_FILE="etc/jetty.xml"
-TMPJ=$TMP/j$$
-
-
-##################################################
-# Try to determine JETTY_HOME if not set
-##################################################
-if [ -z "$JETTY_HOME" ]
-then
- JETTY_HOME_1=`dirname "$0"`
- JETTY_HOME_1=`dirname "$JETTY_HOME_1"`
- if [ -f "${JETTY_HOME_1}/${JETTY_INSTALL_TRACE_FILE}" ] ;
- then
- JETTY_HOME=${JETTY_HOME_1}
- fi
-fi
-
-
-##################################################
-# if no JETTY_HOME, search likely locations.
-##################################################
-if [ "$JETTY_HOME" = "" ] ; then
- STANDARD_LOCATIONS=" \
- /usr/share \
- /usr/share/java \
- $HOME \
- $HOME/src \
- ${HOME}/opt/ \
- /opt \
- /java \
- /usr/local \
- /usr/local/share \
- /usr/local/share/java \
- /home \
- "
- JETTY_DIR_NAMES=" \
- jetty-7 \
- jetty7 \
- jetty-7.* \
- jetty \
- Jetty-7 \
- Jetty7 \
- Jetty-7.* \
- Jetty \
- "
-
- JETTY_HOME=
- for L in $STANDARD_LOCATIONS
- do
- for N in $JETTY_DIR_NAMES
- do
- if [ -d $L/$N ] && [ -f "$L/${N}/${JETTY_INSTALL_TRACE_FILE}" ] ;
- then
- JETTY_HOME="$L/$N"
- fi
- done
- [ ! -z "$JETTY_HOME" ] && break
- done
-fi
-
-
-##################################################
-# No JETTY_HOME yet? We're out of luck!
-##################################################
-if [ -z "$JETTY_HOME" ] ; then
- echo "** ERROR: JETTY_HOME not set, you need to set it or install in a standard location"
- exit 1
-fi
-cd $JETTY_HOME
-JETTY_HOME=`pwd`
-
-#####################################################
-# Check that jetty is where we think it is
-#####################################################
-if [ ! -r $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE ]
-then
- echo "** ERROR: Oops! Jetty doesn't appear to be installed in $JETTY_HOME"
- echo "** ERROR: $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE is not readable!"
- exit 1
-fi
-
-
-###########################################################
-# Get the list of config.xml files from the command line.
-###########################################################
-if [ ! -z "$ARGS" ]
-then
- for A in $ARGS
- do
- if [ -f $A ]
- then
- CONF="$A"
- elif [ -f $JETTY_HOME/etc/$A ]
- then
- CONF="$JETTY_HOME/etc/$A"
- elif [ -f ${A}.xml ]
- then
- CONF="${A}.xml"
- elif [ -f $JETTY_HOME/etc/${A}.xml ]
- then
- CONF="$JETTY_HOME/etc/${A}.xml"
- else
- echo "** ERROR: Cannot find configuration '$A' specified in the command line."
- exit 1
- fi
- if [ ! -r $CONF ]
- then
- echo "** ERROR: Cannot read configuration '$A' specified in the command line."
- exit 1
- fi
- CONFIGS="$CONFIGS $CONF"
- done
-fi
-
-
-##################################################
-# Try to find this script's configuration file,
-# but only if no configurations were given on the
-# command line.
-##################################################
-if [ -z "$JETTY_CONF" ]
-then
- if [ -f /etc/jetty.conf ]
- then
- JETTY_CONF=/etc/jetty.conf
- elif [ -f "${JETTY_HOME}/etc/jetty.conf" ]
- then
- JETTY_CONF="${JETTY_HOME}/etc/jetty.conf"
- fi
-fi
-
-##################################################
-# Read the configuration file if one exists
-##################################################
-CONFIG_LINES=
-if [ -z "$CONFIGS" ] && [ -f "$JETTY_CONF" ] && [ -r "$JETTY_CONF" ]
-then
- CONFIG_LINES=`cat $JETTY_CONF | grep -v "^[:space:]*#" | tr "\n" " "`
-fi
-
-##################################################
-# Get the list of config.xml files from jetty.conf
-##################################################
-if [ ! -z "${CONFIG_LINES}" ]
-then
- for CONF in ${CONFIG_LINES}
- do
- if [ ! -r "$CONF" ]
- then
- echo "** WARNING: Cannot read '$CONF' specified in '$JETTY_CONF'"
- elif [ -f "$CONF" ]
- then
- # assume it's a configure.xml file
- CONFIGS="$CONFIGS $CONF"
- elif [ -d "$CONF" ]
- then
- # assume it's a directory with configure.xml files
- # for example: /etc/jetty.d/
- # sort the files before adding them to the list of CONFIGS
- XML_FILES=`ls ${CONF}/*.xml | sort | tr "\n" " "`
- for FILE in ${XML_FILES}
- do
- if [ -r "$FILE" ] && [ -f "$FILE" ]
- then
- CONFIGS="$CONFIGS $FILE"
- else
- echo "** WARNING: Cannot read '$FILE' specified in '$JETTY_CONF'"
- fi
- done
- else
- echo "** WARNING: Don''t know what to do with '$CONF' specified in '$JETTY_CONF'"
- fi
- done
-fi
-
-#####################################################
-# Run the standard server if there's nothing else to run
-#####################################################
-if [ -z "$CONFIGS" ]
-then
- CONFIGS="${JETTY_HOME}/etc/jetty-logging.xml ${JETTY_HOME}/etc/jetty.xml"
-fi
-
-
-#####################################################
-# Find a location for the pid file
-#####################################################
-if [ -z "$JETTY_RUN" ]
-then
- JETTY_RUN=`findDirectory -w /var/run /usr/var/run /tmp`
-fi
-
-#####################################################
-# Find a PID for the pid file
-#####################################################
-if [ -z "$JETTY_PID" ]
-then
- JETTY_PID="$JETTY_RUN/jetty.pid"
-fi
-
-
-##################################################
-# Check for JAVA_HOME
-##################################################
-if [ -z "$JAVA_HOME" ]
-then
- # If a java runtime is not defined, search the following
- # directories for a JVM and sort by version. Use the highest
- # version number.
-
- # Java search path
- JAVA_LOCATIONS="\
- /usr/java \
- /usr/bin \
- /usr/local/bin \
- /usr/local/java \
- /usr/local/jdk \
- /usr/local/jre \
- /usr/lib/jvm \
- /opt/java \
- /opt/jdk \
- /opt/jre \
- "
- JAVA_NAMES="java jdk jre"
- for N in $JAVA_NAMES ; do
- for L in $JAVA_LOCATIONS ; do
- [ -d $L ] || continue
- find $L -name "$N" ! -type d | grep -v threads | while read J ; do
- [ -x $J ] || continue
- VERSION=`eval $J -version 2>&1`
- [ $? = 0 ] || continue
- VERSION=`expr "$VERSION" : '.*"\(1.[0-9\.]*\)["_]'`
- [ "$VERSION" = "" ] && continue
- expr $VERSION \< 1.2 >/dev/null && continue
- echo $VERSION:$J
- done
- done
- done | sort | tail -1 > $TMPJ
- JAVA=`cat $TMPJ | cut -d: -f2`
- JVERSION=`cat $TMPJ | cut -d: -f1`
-
- JAVA_HOME=`dirname $JAVA`
- while [ ! -z "$JAVA_HOME" -a "$JAVA_HOME" != "/" -a ! -f "$JAVA_HOME/lib/tools.jar" ] ; do
- JAVA_HOME=`dirname $JAVA_HOME`
- done
- [ "$JAVA_HOME" = "" ] && JAVA_HOME=
-
- echo "Found JAVA=$JAVA in JAVA_HOME=$JAVA_HOME"
-fi
-
-
-##################################################
-# Determine which JVM of version >1.2
-# Try to use JAVA_HOME
-##################################################
-if [ "$JAVA" = "" -a "$JAVA_HOME" != "" ]
-then
- if [ ! -z "$JAVACMD" ]
- then
- JAVA="$JAVACMD"
- else
- [ -x $JAVA_HOME/bin/jre -a ! -d $JAVA_HOME/bin/jre ] && JAVA=$JAVA_HOME/bin/jre
- [ -x $JAVA_HOME/bin/java -a ! -d $JAVA_HOME/bin/java ] && JAVA=$JAVA_HOME/bin/java
- fi
-fi
-
-if [ "$JAVA" = "" ]
-then
- echo "Cannot find a JRE or JDK. Please set JAVA_HOME to a >=1.2 JRE" 2>&2
- exit 1
-fi
-
-JAVA_VERSION=`expr "$($JAVA -version 2>&1 | head -1)" : '.*1\.\([0-9]\)'`
-
-#####################################################
-# See if JETTY_PORT is defined
-#####################################################
-if [ "$JETTY_PORT" != "" ]
-then
- JAVA_OPTIONS="$JAVA_OPTIONS -Djetty.port=$JETTY_PORT"
-fi
-
-#####################################################
-# See if JETTY_LOGS is defined
-#####################################################
-if [ "$JETTY_LOGS" != "" ]
-then
- JAVA_OPTIONS="$JAVA_OPTIONS -Djetty.logs=$JETTY_LOGS"
-fi
-
-#####################################################
-# Are we running on Windows? Could be, with Cygwin/NT.
-#####################################################
-case "`uname`" in
-CYGWIN*) PATH_SEPARATOR=";";;
-*) PATH_SEPARATOR=":";;
-esac
-
-
-#####################################################
-# Add jetty properties to Java VM options.
-#####################################################
-JAVA_OPTIONS="$JAVA_OPTIONS -Djetty.home=$JETTY_HOME -Djava.io.tmpdir=$TMP"
-
-[ -f $JETTY_HOME/etc/start.config ] && JAVA_OPTIONS="-DSTART=$JETTY_HOME/etc/start.config $JAVA_OPTIONS"
-
-#####################################################
-# This is how the Jetty server will be started
-#####################################################
-
-JETTY_START=$JETTY_HOME/start.jar
-[ ! -f $JETTY_START ] && JETTY_START=$JETTY_HOME/lib/start.jar
-
-RUN_ARGS="$JAVA_OPTIONS -jar $JETTY_START $JETTY_ARGS $CONFIGS"
-RUN_CMD="$JAVA $RUN_ARGS"
-
-#####################################################
-# Comment these out after you're happy with what
-# the script is doing.
-#####################################################
-#echo "JETTY_HOME = $JETTY_HOME"
-#echo "JETTY_CONF = $JETTY_CONF"
-#echo "JETTY_RUN = $JETTY_RUN"
-#echo "JETTY_PID = $JETTY_PID"
-#echo "JETTY_ARGS = $JETTY_ARGS"
-#echo "CONFIGS = $CONFIGS"
-#echo "JAVA_OPTIONS = $JAVA_OPTIONS"
-#echo "JAVA = $JAVA"
-
-
-##################################################
-# Do the action
-##################################################
-case "$ACTION" in
- start)
- echo -n "Starting Jetty: "
-
- if [ "$NO_START" = "1" ]; then
- echo "Not starting jetty - NO_START=1 in /etc/default/jetty7";
- exit 0;
- fi
-
-
- if [ "$START_STOP_DAEMON" = "1" ] && type start-stop-daemon > /dev/null 2>&1
- then
- [ x$JETTY_USER = x ] && JETTY_USER=$(whoami)
- [ $UID = 0 ] && CH_USER="-c $JETTY_USER"
- if start-stop-daemon -S -p$JETTY_PID $CH_USER -d $JETTY_HOME -b -m -a $JAVA -- $RUN_ARGS
- then
- sleep 1
- if running $JETTY_PID
- then
- echo OK
- else
- echo FAILED
- fi
- fi
-
- else
-
- if [ -f $JETTY_PID ]
- then
- if running $JETTY_PID
- then
- echo "Already Running!!"
- exit 1
- else
- # dead pid file - remove
- rm -f $JETTY_PID
- fi
- fi
-
- if [ x$JETTY_USER != x ]
- then
- touch $JETTY_PID
- chown $JETTY_USER $JETTY_PID
- su - $JETTY_USER -c "
- $RUN_CMD &
- PID=\$!
- disown \$PID
- echo \$PID > $JETTY_PID"
- else
- $RUN_CMD &
- PID=$!
- disown $PID
- echo $PID > $JETTY_PID
- fi
-
- echo "STARTED Jetty `date`"
- fi
-
- ;;
-
- stop)
- echo -n "Stopping Jetty: "
- if [ "$START_STOP_DAEMON" = "1" ] && type start-stop-daemon > /dev/null 2>&1; then
- start-stop-daemon -K -p $JETTY_PID -d $JETTY_HOME -a $JAVA -s HUP
- sleep 1
- if running $JETTY_PID
- then
- sleep 3
- if running $JETTY_PID
- then
- sleep 30
- if running $JETTY_PID
- then
- start-stop-daemon -K -p $JETTY_PID -d $JETTY_HOME -a $JAVA -s KILL
- fi
- fi
- fi
-
- rm -f $JETTY_PID
- echo OK
- else
- PID=`cat $JETTY_PID 2>/dev/null`
- TIMEOUT=30
- while running $JETTY_PID && [ $TIMEOUT -gt 0 ]
- do
- kill $PID 2>/dev/null
- sleep 1
- let TIMEOUT=$TIMEOUT-1
- done
-
- [ $TIMEOUT -gt 0 ] || kill -9 $PID 2>/dev/null
-
- rm -f $JETTY_PID
- echo OK
- fi
- ;;
-
- restart)
- JETTY_SH=$0
- if [ ! -f $JETTY_SH ]; then
- if [ ! -f $JETTY_HOME/bin/jetty.sh ]; then
- echo "$JETTY_HOME/bin/jetty.sh does not exist."
- exit 1
- fi
- JETTY_SH=$JETTY_HOME/bin/jetty.sh
- fi
- $JETTY_SH stop $*
- sleep 5
- $JETTY_SH start $*
- ;;
-
- supervise)
- #
- # Under control of daemontools supervise monitor which
- # handles restarts and shutdowns via the svc program.
- #
- exec $RUN_CMD
- ;;
-
- run|demo)
- echo "Running Jetty: "
-
- if [ -f $JETTY_PID ]
- then
- if running $JETTY_PID
- then
- echo "Already Running!!"
- exit 1
- else
- # dead pid file - remove
- rm -f $JETTY_PID
- fi
- fi
-
- exec $RUN_CMD
- ;;
-
- check)
- echo "Checking arguments to Jetty: "
- echo "JETTY_HOME = $JETTY_HOME"
- echo "JETTY_CONF = $JETTY_CONF"
- echo "JETTY_RUN = $JETTY_RUN"
- echo "JETTY_PID = $JETTY_PID"
- echo "JETTY_PORT = $JETTY_PORT"
- echo "JETTY_LOGS = $JETTY_LOGS"
- echo "CONFIGS = $CONFIGS"
- echo "JAVA_OPTIONS = $JAVA_OPTIONS"
- echo "JAVA = $JAVA"
- echo "CLASSPATH = $CLASSPATH"
- echo "RUN_CMD = $RUN_CMD"
- echo
-
- if [ -f $JETTY_RUN/jetty.pid ]
- then
- echo "Jetty running pid="`cat $JETTY_RUN/jetty.pid`
- exit 0
- fi
- exit 1
- ;;
-
-*)
- usage
- ;;
-esac
-
-exit 0
-
-
-
diff --git a/jetty-distribution-with-logback/src/main/resources/contexts-available/README.TXT b/jetty-distribution-with-logback/src/main/resources/contexts-available/README.TXT
deleted file mode 100644
index 7fa2ac5..0000000
--- a/jetty-distribution-with-logback/src/main/resources/contexts-available/README.TXT
+++ /dev/null
@@ -1,3 +0,0 @@
-
-This directory contains example contexts that may be deployed by
-moving/copying/linking them to the ../contexts directory.
diff --git a/jetty-distribution-with-logback/src/main/resources/contexts/README.TXT b/jetty-distribution-with-logback/src/main/resources/contexts/README.TXT
deleted file mode 100644
index 36f67d7..0000000
--- a/jetty-distribution-with-logback/src/main/resources/contexts/README.TXT
+++ /dev/null
@@ -1,15 +0,0 @@
-
-This directory is scanned by the ContextDeployer instance
-configured by the standard $JETTY_HOME/etc/jetty.xml configuration.
-
-It should contain XmlConfiguration files that describe individual
-contexts to be deployed to the server. This directory is scanned
-for additions, removals and updates for hot deployment.
-
-Frequenty the context configuration files here will reference
-war files or directories from $JETTY_HOME/webapps. Care must be
-taken to avoid a WebAppDeployer deploying duplicates of such
-webapplications.
-
-The directory ../contexts-available contains more example contexts
-that may be deployed by being copied here.
diff --git a/jetty-distribution-with-logback/src/main/resources/contexts/javadoc.xml b/jetty-distribution-with-logback/src/main/resources/contexts/javadoc.xml
deleted file mode 100644
index 342e6b9..0000000
--- a/jetty-distribution-with-logback/src/main/resources/contexts/javadoc.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure.dtd">
-
-<!--
-Configure a custom context for the javadoc.
-
-This context contains only a ServletHandler with a default servlet
-to serve static html files and images.
--->
-
-<Configure class="org.eclipse.jetty.server.handler.ContextHandler">
- <Call class="org.eclipse.jetty.util.log.Log" name="debug"><Arg>Configure javadoc.xml</Arg></Call>
- <Set name="contextPath">/javadoc</Set>
- <Set name="resourceBase"><SystemProperty name="jetty.home" default="."/>/javadoc/</Set>
- <Set name="handler">
- <New class="org.eclipse.jetty.server.handler.ResourceHandler">
- <Set name="welcomeFiles">
- <Array type="String">
- <Item>index.html</Item>
- <Item>contents.html</Item> <!-- the index if javadoc not generated -->
- </Array>
- </Set>
- <Set name="cacheControl">max-age=3600,public</Set>
- </New>
- </Set>
-
-</Configure>
-
diff --git a/jetty-distribution-with-logback/src/main/resources/javadoc/README.txt b/jetty-distribution-with-logback/src/main/resources/javadoc/README.txt
deleted file mode 100644
index f6b026e..0000000
--- a/jetty-distribution-with-logback/src/main/resources/javadoc/README.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Javadocs are available at:
-
-http://download.eclipse.org/jetty/stable-7/apidocs/
-
-
-Jxr is available at:
-
-http://download.eclipse.org/jetty/stable-7/xref/
-
-
-For specific versions replace 'stable-7' with the version, for example the javadocs for jetty-7.0.0.RC5 would be at
-
-http://download.eclipse.org/jetty/7.0.0.RC5/apidocs/
-
diff --git a/jetty-distribution-with-logback/src/main/resources/resources/log4j.properties b/jetty-distribution-with-logback/src/main/resources/resources/log4j.properties
deleted file mode 100644
index 8899c00..0000000
--- a/jetty-distribution-with-logback/src/main/resources/resources/log4j.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# This is not needed by Jetty - but it helps with many web apps.
-
-log4j.rootLogger=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
diff --git a/jetty-distribution-with-logback/src/main/resources/start.ini b/jetty-distribution-with-logback/src/main/resources/start.ini
deleted file mode 100644
index 4c9a5a5..0000000
--- a/jetty-distribution-with-logback/src/main/resources/start.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-#===========================================================
-# Jetty start.jar arguments
-#-----------------------------------------------------------
-# Each line of this file is prepended to the command line
-# arguments # of a call to:
-# java -jar start.jar [arg...]
-#
-# If the arguements in this file include JVM arguments
-# (eg -Xmx512m) or JVM System properties (eg com.sun.???),
-# then these will not take affect unless the --exec
-# parameter is included or if the output from --dry-run
-# is executed like:
-# eval $(java -jar start.jar --dry-run)
-#
-#===========================================================
-
-OPTIONS=Server,jmx,resources,websocket
-
-#===========================================================
-# The following is an example of the ini args to run the
-# server with a heap size, JMX remote enabled, JMX mbeans
-# and ssl
-#-----------------------------------------------------------
-# --exec
-# -Xmx512m
-# -Dcom.sun.management.jmxremote
-# OPTIONS=Server,jmx,resources
-# etc/jetty-jmx.xml
-# etc/jetty.xml
-# etc/jetty-ssl.xml
-#===========================================================
