Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2009-04-01 18:03:22 +0000
committerJesse McConnell2009-04-01 18:03:22 +0000
commit9cc04501ec4a5d8eda120bf3aff60ed68b6bf3dd (patch)
treea5da1ca319d3cfdd925f5548c3e0e13c37b0156a
parent47ee07466fe9ff82e31e7a8123191fdd780124a1 (diff)
downloadorg.eclipse.jetty.project-9cc04501ec4a5d8eda120bf3aff60ed68b6bf3dd.tar.gz
org.eclipse.jetty.project-9cc04501ec4a5d8eda120bf3aff60ed68b6bf3dd.tar.xz
org.eclipse.jetty.project-9cc04501ec4a5d8eda120bf3aff60ed68b6bf3dd.zip
updating the distribution to copy resources
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@74 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--jetty-distribution/pom.xml91
1 files changed, 37 insertions, 54 deletions
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index de28364600..c6e1f088a7 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -16,6 +16,21 @@
<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>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
<executions>
@@ -107,32 +122,9 @@
<includes>**</includes>
<outputDirectory>${assembly.directory}</outputDirectory>
</artifactItem>
- <!--artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-setuid-java</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-win32-service</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>
<execution>
<id>copy</id>
<phase>generate-resources</phase>
@@ -140,8 +132,7 @@
<goal>copy</goal>
</goals>
<configuration>
- <artifactItems>
-
+ <artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
@@ -231,8 +222,7 @@
<overWrite>true</overWrite>
<includes>**</includes>
<outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
-
+ </artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
@@ -241,8 +231,7 @@
<overWrite>true</overWrite>
<includes>**</includes>
<outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
-
+ </artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
@@ -278,8 +267,7 @@
<overWrite>true</overWrite>
<includes>**</includes>
<outputDirectory>${assembly.directory}/lib</outputDirectory>
- </artifactItem>
-
+ </artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
@@ -306,8 +294,7 @@
<overWrite>true</overWrite>
<includes>**</includes>
<outputDirectory>${assembly.directory}/lib/jsp-2.1</outputDirectory>
- </artifactItem>
-
+ </artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
@@ -317,6 +304,15 @@
<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>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -336,24 +332,6 @@
<outputDirectory>${assembly.directory}/webapps</outputDirectory>
<destFileName>test.war</destFileName>
</artifactItem>
- <!--artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-setuid-java</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-win32-service</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <includes>**</includes>
- <outputDirectory>${assembly.directory}</outputDirectory>
- </artifactItem-->
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-start</artifactId>
@@ -426,8 +404,7 @@
</configuration>
</execution>
</executions>
- </plugin>
-
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -496,8 +473,14 @@
</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>
</dependencies>
</project>
+

Back to the top