Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2015-04-13 15:58:58 -0400
committerSimone Bordet2015-04-13 15:58:58 -0400
commit16c0a312ca06957d177b5c2a05abcf6b9d40f868 (patch)
tree6a8f7feb5c53cf9f5d35aa4e293c254235a98b27
parent10307fbc27beb07878615bb0b4898c2aaabea62e (diff)
downloadorg.eclipse.jetty.toolchain-16c0a312ca06957d177b5c2a05abcf6b9d40f868.tar.gz
org.eclipse.jetty.toolchain-16c0a312ca06957d177b5c2a05abcf6b9d40f868.tar.xz
org.eclipse.jetty.toolchain-16c0a312ca06957d177b5c2a05abcf6b9d40f868.zip
Removed generation of the -config.jar artifact.
Now the XML is directly present in the Jetty 9 distribution.
-rw-r--r--jetty-setuid/jetty-setuid-java/pom.xml21
-rw-r--r--jetty-setuid/jetty-setuid-java/src/main/assembly/config.xml18
-rw-r--r--jetty-setuid/jetty-setuid-java/src/main/config/etc/jetty-setuid.xml30
3 files changed, 0 insertions, 69 deletions
diff --git a/jetty-setuid/jetty-setuid-java/pom.xml b/jetty-setuid/jetty-setuid-java/pom.xml
index 88baa70..465cc3b 100644
--- a/jetty-setuid/jetty-setuid-java/pom.xml
+++ b/jetty-setuid/jetty-setuid-java/pom.xml
@@ -8,27 +8,6 @@
<artifactId>jetty-setuid-java</artifactId>
<name>Jetty :: SetUID Java</name>
<packaging>jar</packaging>
- <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>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-setuid/jetty-setuid-java/src/main/assembly/config.xml b/jetty-setuid/jetty-setuid-java/src/main/assembly/config.xml
deleted file mode 100644
index 5cba550..0000000
--- a/jetty-setuid/jetty-setuid-java/src/main/assembly/config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
- <id>config</id>
- <includeBaseDirectory>false</includeBaseDirectory>
- <formats>
- <format>jar</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>src/main/config/etc</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
-
diff --git a/jetty-setuid/jetty-setuid-java/src/main/config/etc/jetty-setuid.xml b/jetty-setuid/jetty-setuid-java/src/main/config/etc/jetty-setuid.xml
deleted file mode 100644
index 75a4ebd..0000000
--- a/jetty-setuid/jetty-setuid-java/src/main/config/etc/jetty-setuid.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-
-<!-- ================================================================ -->
-<!-- Configure the Jetty SetUIDListener -->
-<!-- ================================================================ -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <Call name="addLifeCycleListener">
- <Arg>
- <New class="org.eclipse.jetty.setuid.SetUIDListener">
- <Set name="startServerAsPrivileged"><Property name="jetty.setuid.startServerAsPrivileged,jetty.startServerAsPrivileged" default="false"/></Set>
- <Set name="umaskOctal"><Property name="jetty.setuid.umask,jetty.umask" default="002"/></Set>
- <Set name="username"><Property name="jetty.setuid.userName,jetty.username" default="jetty"/></Set>
- <Set name="groupname"><Property name="jetty.setuid.groupName,jetty.groupname" default="jetty"/></Set>
- <!-- uncomment to change the limits on number of open file descriptors for root -->
- <!--
- <Call name="setRLimitNoFiles">
- <Arg>
- <New class="org.eclipse.jetty.setuid.RLimit">
- <Set name="soft">20000</Set>
- <Set name="hard">40000</Set>
- </New>
- </Arg>
- </Call>
- -->
- </New>
- </Arg>
- </Call>
-</Configure>

Back to the top