Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2013-08-22 12:53:58 -0400
committerJesse McConnell2013-08-22 12:53:58 -0400
commit725e405dace78d62a895141aa35f0c6aef34a5ae (patch)
treeff469d90b58fd556479d5ce9e2b7ddc6cce1f200
parent5600d411ed56717b16376ab86f2923ea62503852 (diff)
downloadorg.eclipse.jetty.project-725e405dace78d62a895141aa35f0c6aef34a5ae.tar.gz
org.eclipse.jetty.project-725e405dace78d62a895141aa35f0c6aef34a5ae.tar.xz
org.eclipse.jetty.project-725e405dace78d62a895141aa35f0c6aef34a5ae.zip
first pass for mod files for distribution
-rw-r--r--jetty-annotations/src/main/config/modules/annotations.mod14
-rw-r--r--jetty-client/pom.xml288
-rw-r--r--jetty-client/src/main/config/modules/client.mod6
-rw-r--r--jetty-deploy/src/main/config/modules/deploy.mod9
-rw-r--r--jetty-distribution/pom.xml5
-rw-r--r--jetty-jaas/src/main/config/modules/jaas.mod9
-rw-r--r--jetty-jmx/src/main/config/modules/jmx.mod9
-rw-r--r--jetty-jndi/pom.xml17
-rw-r--r--jetty-jndi/src/main/config/modules/jndi.mod12
-rw-r--r--jetty-monitor/src/main/config/modules/monitor.mod10
-rw-r--r--jetty-nosql/pom.xml17
-rw-r--r--jetty-nosql/src/main/config/modules/nosql.mod7
-rw-r--r--jetty-overlay-deployer/src/main/config/modules/overlay.mod10
-rw-r--r--jetty-plus/src/main/config/modules/plus.mod10
-rw-r--r--jetty-proxy/src/main/config/modules/proxy.mod10
-rw-r--r--jetty-rewrite/src/main/config/modules/rewrite.mod10
-rw-r--r--jetty-server/src/main/config/modules/base.mod6
-rw-r--r--jetty-server/src/main/config/modules/debug.mod7
-rw-r--r--jetty-server/src/main/config/modules/http.mod7
-rw-r--r--jetty-server/src/main/config/modules/https.mod8
-rw-r--r--jetty-server/src/main/config/modules/ipaccess.mod7
-rw-r--r--jetty-server/src/main/config/modules/lowresources.mod7
-rw-r--r--jetty-server/src/main/config/modules/requestlog.mod7
-rw-r--r--jetty-server/src/main/config/modules/server.mod14
-rw-r--r--jetty-server/src/main/config/modules/stats.mod7
-rw-r--r--jetty-server/src/main/config/modules/xinetd.mod7
-rw-r--r--jetty-server/src/main/config/modules/xml.mod8
-rw-r--r--jetty-webapp/pom.xml17
-rw-r--r--jetty-webapp/src/main/config/modules/webapp.mod7
29 files changed, 413 insertions, 139 deletions
diff --git a/jetty-annotations/src/main/config/modules/annotations.mod b/jetty-annotations/src/main/config/modules/annotations.mod
new file mode 100644
index 0000000000..3470bf75c7
--- /dev/null
+++ b/jetty-annotations/src/main/config/modules/annotations.mod
@@ -0,0 +1,14 @@
+#
+# Jetty Annotation Scanning Module
+#
+
+# Annotations needs plus, and jndi features
+DEPEND=plus
+
+# Annotations needs jetty annotation jars
+LIB=lib/jetty-annotations-${jetty.version}.jar
+# Need annotation processing jars too
+LIB=lib/annotations/*.jar
+
+# Enable annotation scanning webapp configurations
+etc/jetty-annotations.xml
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index a7cd736f1e..b2ccc2cf64 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -1,144 +1,154 @@
-<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>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-project</artifactId>
- <version>9.1.0-SNAPSHOT</version>
- </parent>
+<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>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-project</artifactId>
+ <version>9.1.0-SNAPSHOT</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jetty-client</artifactId>
- <name>Jetty :: Asynchronous HTTP Client</name>
- <url>http://www.eclipse.org/jetty</url>
- <properties>
- <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
- <jetty.test.policy.loc>target/test-policy</jetty.test.policy.loc>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <instructions>
- <Import-Package>javax.net.*,*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!--
- Required for OSGI
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <onlyAnalyze>org.eclipse.jetty.client.*</onlyAnalyze>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-test-policy</artifactId>
- <version>${jetty-test-policy-version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**/*.keystore,**/*.pem</includes>
- <outputDirectory>${jetty.test.policy.loc}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jetty-client</artifactId>
+ <name>Jetty :: Asynchronous HTTP Client</name>
+ <url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
+ <jetty.test.policy.loc>target/test-policy</jetty.test.policy.loc>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>config</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <instructions>
+ <Import-Package>javax.net.*,*</Import-Package>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Required for OSGI -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <onlyAnalyze>org.eclipse.jetty.client.*</onlyAnalyze>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-policy</artifactId>
+ <version>${jetty-test-policy-version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <includes>**/*.keystore,**/*.pem</includes>
+ <outputDirectory>${jetty.test.policy.loc}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.spdy</groupId>
- <artifactId>spdy-client</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.spdy</groupId>
+ <artifactId>spdy-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <!--
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-websocket</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>-->
- <dependency>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-test-helper</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>com.ning</groupId>
- <artifactId>async-http-client</artifactId>
- <version>1.7.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>com.ning</groupId>
+ <artifactId>async-http-client</artifactId>
+ <version>1.7.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/jetty-client/src/main/config/modules/client.mod b/jetty-client/src/main/config/modules/client.mod
new file mode 100644
index 0000000000..f434cdc087
--- /dev/null
+++ b/jetty-client/src/main/config/modules/client.mod
@@ -0,0 +1,6 @@
+#
+# Client Feature
+#
+
+# Client jars
+LIB=lib/jetty-client-${jetty.version}.jar
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..5705ac61d9
--- /dev/null
+++ b/jetty-deploy/src/main/config/modules/deploy.mod
@@ -0,0 +1,9 @@
+#
+# Deploy Feature
+#
+
+# Deploy jars
+LIB=lib/jetty-deploy-${jetty.version}.jar
+
+# Deploy configuration
+etc/jetty-deploy.xml
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index e55ebe9792..bf9aac223e 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -614,6 +614,11 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-overlay-deployer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaas</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/jetty-jaas/src/main/config/modules/jaas.mod b/jetty-jaas/src/main/config/modules/jaas.mod
new file mode 100644
index 0000000000..d0d6f0fa46
--- /dev/null
+++ b/jetty-jaas/src/main/config/modules/jaas.mod
@@ -0,0 +1,9 @@
+#
+# JAAS Feature
+#
+
+# JAAS jars
+LIB=lib/jetty-jaas-${jetty.version}.jar
+
+# JAAS configuration
+etc/jetty-jaas.xml
diff --git a/jetty-jmx/src/main/config/modules/jmx.mod b/jetty-jmx/src/main/config/modules/jmx.mod
new file mode 100644
index 0000000000..2a7922690e
--- /dev/null
+++ b/jetty-jmx/src/main/config/modules/jmx.mod
@@ -0,0 +1,9 @@
+#
+# JMX Feature
+#
+
+# JMX jars (as defined in start.config)
+LIB=lib/jetty-jmx-${jetty.version}.jar
+
+# JMX configuration
+etc/jetty-jmx.xml
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index dbd3fbcbdd..0f088b669e 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -15,6 +15,23 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>config</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
diff --git a/jetty-jndi/src/main/config/modules/jndi.mod b/jetty-jndi/src/main/config/modules/jndi.mod
new file mode 100644
index 0000000000..de3087bd26
--- /dev/null
+++ b/jetty-jndi/src/main/config/modules/jndi.mod
@@ -0,0 +1,12 @@
+#
+# JNDI Support
+#
+
+DEPEND=server
+DEPEND=plus
+
+LIB=lib/jetty-jndi-${jetty.version}.jar
+LIB=lib/jndi/*.jar
+
+# Annotations needs annotations configuration
+etc/jetty-server.xml
diff --git a/jetty-monitor/src/main/config/modules/monitor.mod b/jetty-monitor/src/main/config/modules/monitor.mod
new file mode 100644
index 0000000000..249ccef15d
--- /dev/null
+++ b/jetty-monitor/src/main/config/modules/monitor.mod
@@ -0,0 +1,10 @@
+#
+# Jetty Monitor module
+#
+
+DEPEND=server
+DEPEND=client
+
+LIB=lib/jetty-monitor-${jetty.version}.jar
+
+etc/jetty-monitor.xml \ No newline at end of file
diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml
index e06a15b9cb..ebfa3c9d39 100644
--- a/jetty-nosql/pom.xml
+++ b/jetty-nosql/pom.xml
@@ -15,6 +15,23 @@
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>config</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
diff --git a/jetty-nosql/src/main/config/modules/nosql.mod b/jetty-nosql/src/main/config/modules/nosql.mod
new file mode 100644
index 0000000000..3d8b099ed0
--- /dev/null
+++ b/jetty-nosql/src/main/config/modules/nosql.mod
@@ -0,0 +1,7 @@
+#
+# Jetty Nosql module
+#
+
+DEPEND=webapp
+
+LIB=lib/jetty-nosql-${jetty.version}.jar \ No newline at end of file
diff --git a/jetty-overlay-deployer/src/main/config/modules/overlay.mod b/jetty-overlay-deployer/src/main/config/modules/overlay.mod
new file mode 100644
index 0000000000..a006476a60
--- /dev/null
+++ b/jetty-overlay-deployer/src/main/config/modules/overlay.mod
@@ -0,0 +1,10 @@
+#
+# Jetty Overlay module
+#
+
+DEPEND=deploy
+
+LIB=lib/jetty-overlay-deployer-${jetty.version}.jar
+
+# Plus requires configuration
+etc/jetty-overlay.xml
diff --git a/jetty-plus/src/main/config/modules/plus.mod b/jetty-plus/src/main/config/modules/plus.mod
new file mode 100644
index 0000000000..31d8e76b95
--- /dev/null
+++ b/jetty-plus/src/main/config/modules/plus.mod
@@ -0,0 +1,10 @@
+#
+# Jetty Proxy module
+#
+
+DEPEND=server
+
+LIB=lib/jetty-plus-${jetty.version}.jar
+
+# Plus requires configuration
+etc/jetty-plus.xml
diff --git a/jetty-proxy/src/main/config/modules/proxy.mod b/jetty-proxy/src/main/config/modules/proxy.mod
new file mode 100644
index 0000000000..9e2bc46db8
--- /dev/null
+++ b/jetty-proxy/src/main/config/modules/proxy.mod
@@ -0,0 +1,10 @@
+#
+# Jetty Proxy module
+#
+
+DEPEND=server
+
+LIB=lib/jetty-proxy-${jetty.version}.jar
+
+# Proxy requires configuration
+etc/jetty-proxy.xml
diff --git a/jetty-rewrite/src/main/config/modules/rewrite.mod b/jetty-rewrite/src/main/config/modules/rewrite.mod
new file mode 100644
index 0000000000..d5ccf96041
--- /dev/null
+++ b/jetty-rewrite/src/main/config/modules/rewrite.mod
@@ -0,0 +1,10 @@
+#
+# Jetty Rewrite module
+#
+
+DEPEND=server
+
+LIB=lib/jetty-rewrite-${jetty.version}.jar
+
+# Annotations needs annotations configuration
+etc/jetty-rewrite.xml
diff --git a/jetty-server/src/main/config/modules/base.mod b/jetty-server/src/main/config/modules/base.mod
new file mode 100644
index 0000000000..f85269aa64
--- /dev/null
+++ b/jetty-server/src/main/config/modules/base.mod
@@ -0,0 +1,6 @@
+#
+# Base Module
+#
+
+LIB=lib/jetty-util-${jetty.version}.jar
+LIB=lib/jetty-io-${jetty.version}.jar
diff --git a/jetty-server/src/main/config/modules/debug.mod b/jetty-server/src/main/config/modules/debug.mod
new file mode 100644
index 0000000000..8cdf5b94ab
--- /dev/null
+++ b/jetty-server/src/main/config/modules/debug.mod
@@ -0,0 +1,7 @@
+#
+# Debug module
+#
+
+DEPEND=server
+
+etc/jetty-debug.xml
diff --git a/jetty-server/src/main/config/modules/http.mod b/jetty-server/src/main/config/modules/http.mod
new file mode 100644
index 0000000000..94eed962e9
--- /dev/null
+++ b/jetty-server/src/main/config/modules/http.mod
@@ -0,0 +1,7 @@
+#
+# Jetty HTTP Server
+#
+
+DEPEND=server
+
+etc/jetty-http.xml
diff --git a/jetty-server/src/main/config/modules/https.mod b/jetty-server/src/main/config/modules/https.mod
new file mode 100644
index 0000000000..5e930e934f
--- /dev/null
+++ b/jetty-server/src/main/config/modules/https.mod
@@ -0,0 +1,8 @@
+#
+# Jetty HTTP Server
+#
+
+DEPEND=server
+
+etc/jetty-ssl.xml
+etc/jetty-https.xml
diff --git a/jetty-server/src/main/config/modules/ipaccess.mod b/jetty-server/src/main/config/modules/ipaccess.mod
new file mode 100644
index 0000000000..f99f26ec3e
--- /dev/null
+++ b/jetty-server/src/main/config/modules/ipaccess.mod
@@ -0,0 +1,7 @@
+#
+# IPAccess module
+#
+
+DEPEND=server
+
+etc/jetty-ipaccess.xml
diff --git a/jetty-server/src/main/config/modules/lowresources.mod b/jetty-server/src/main/config/modules/lowresources.mod
new file mode 100644
index 0000000000..578d8165ed
--- /dev/null
+++ b/jetty-server/src/main/config/modules/lowresources.mod
@@ -0,0 +1,7 @@
+#
+# Low Resources module
+#
+
+DEPEND=server
+
+etc/jetty-lowresources.xml
diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
new file mode 100644
index 0000000000..060ca9f0a2
--- /dev/null
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -0,0 +1,7 @@
+#
+# Request Log module
+#
+
+DEPEND=server
+
+etc/jetty-requestlog.xml
diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod
new file mode 100644
index 0000000000..06bf6772f5
--- /dev/null
+++ b/jetty-server/src/main/config/modules/server.mod
@@ -0,0 +1,14 @@
+#
+# Base server
+#
+
+DEPEND=base
+
+LIB=lib/servlet-api-3.1.jar
+LIB=lib/jetty-schemas-3.1.jar
+LIB=lib/jetty-http-${jetty.version}.jar
+LIB=lib/jetty-continuation-${jetty.version}.jar
+LIB=lib/jetty-server-${jetty.version}.jar
+
+# Annotations needs annotations configuration
+etc/jetty.xml
diff --git a/jetty-server/src/main/config/modules/stats.mod b/jetty-server/src/main/config/modules/stats.mod
new file mode 100644
index 0000000000..cd56d5b4d7
--- /dev/null
+++ b/jetty-server/src/main/config/modules/stats.mod
@@ -0,0 +1,7 @@
+#
+# Stats module
+#
+
+DEPEND=server
+
+etc/jetty-stats.xml
diff --git a/jetty-server/src/main/config/modules/xinetd.mod b/jetty-server/src/main/config/modules/xinetd.mod
new file mode 100644
index 0000000000..c93064ad76
--- /dev/null
+++ b/jetty-server/src/main/config/modules/xinetd.mod
@@ -0,0 +1,7 @@
+#
+# Stats module
+#
+
+DEPEND=server
+
+etc/jetty-xinetd.xml
diff --git a/jetty-server/src/main/config/modules/xml.mod b/jetty-server/src/main/config/modules/xml.mod
new file mode 100644
index 0000000000..949e205711
--- /dev/null
+++ b/jetty-server/src/main/config/modules/xml.mod
@@ -0,0 +1,8 @@
+#
+# Jetty XML Configuration
+#
+
+DEPEND=base
+
+LIB=lib/jetty-xml-${jetty.version}.jar
+
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index b5d5aeffa7..167f139284 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -45,6 +45,23 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>config</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
diff --git a/jetty-webapp/src/main/config/modules/webapp.mod b/jetty-webapp/src/main/config/modules/webapp.mod
new file mode 100644
index 0000000000..187db774b6
--- /dev/null
+++ b/jetty-webapp/src/main/config/modules/webapp.mod
@@ -0,0 +1,7 @@
+#
+# Base server
+#
+
+DEPEND=deploy
+
+LIB=lib/jetty-webapp-${jetty.version}.jar

Back to the top