Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating osgi plugin and manifest information, also fixing svn property on two dirs 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@75 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Jesse McConnell 2009-04-01 18:06:52 +00:00
parent 9cc04501ec
commit 4048a3f2ed
21 changed files with 60 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-ajp/pom.xml
View File

@ -12,21 +12,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.ajp</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
<Export-Package>org.eclipse.jetty.ajp;version=${project.version}</Export-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-annotations/pom.xml
View File

@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
<Import-Package>!org.eclipse.jetty.annotations.*,*</Import-Package>
<!-- <Export-Package>org.eclipse.jetty.annotations.*</Export-Package> -->
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-client/pom.xml
View File

@ -7,25 +7,19 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-client</artifactId>
<name>Jetty :: Asynchronous HTTP Client</name>
<url>{$jetty.url}</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
<Export-Package>!org.eclipse.jetty.client.webdav,org.eclipse.jetty.client.*</Export-Package>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-continuation/pom.xml
View File

@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.continuation</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
<Import-Package></Import-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-deploy/pom.xml
View File

@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.deploy</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Export-Package>org.eclipse.jetty.deploy;version=${project.version}</Export-Package>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

2
jetty-embedded-examples/pom.xml
View File

@ -5,7 +5,7 @@
<version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-embedded</artifactId>
<artifactId>jetty-embedded-examples</artifactId>
<name>Jetty :: Embedded Examples</name>
<description>Jetty Embedded Examples</description>
<build>

9
jetty-http/pom.xml
View File

@ -25,20 +25,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.http</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

9
jetty-io/pom.xml
View File

@ -25,20 +25,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.io</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-jaspi/pom.xml
View File

@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.security</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Export-Package>org.eclipse.jetty.security;version=${project.version}</Export-Package>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-jmx/pom.xml
View File

@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.jmx</Bundle-SymbolicName>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Import-Package>!org.eclipse.component.management.*,!org.eclipse.jetty.deployer.management.*,!org.eclipse.jetty.nio.management.*,!org.eclipse.log.management.*,!org.eclipse.jetty.jmx.*,!org.eclipse.thread.management.*,!org.eclipse.jetty.jmx.handler.*,!org.eclipse.jetty.jmx.*,!org.eclipse.jetty.jmx.servlet.*,!org.eclipse.jetty.jmx.webapp.*,*</Import-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-jndi/pom.xml
View File

@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Import-Package>!org.eclipse.jetty.jndi.*,*</Import-Package>
<Bundle-SymbolicName>org.eclipse.jetty.jndi</Bundle-SymbolicName>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

8
jetty-plus/pom.xml
View File

@ -13,19 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Import-Package>!org.eclipse.jetty.plus.*,*</Import-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-rewrite/pom.xml
View File

@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.rewrite</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Export-Package>org.eclipse.jetty.rewrite.handler;version=${project.version}</Export-Package>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-security/pom.xml
View File

@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.security</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Export-Package>org.eclipse.jetty.security;version=${project.version}</Export-Package>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

12
jetty-server/pom.xml
View File

@ -8,26 +8,20 @@
<artifactId>jetty-server</artifactId>
<name>Jetty :: Server Core</name>
<description>The core jetty server artifact.</description>
<url>${jetty.url}</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<id>generate-manifest</id>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.server</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
<!-- <Import-Package>!org.eclipse.jetty.*,!org.eclipse.xml.*,!org.eclipse.resource.*,!org.eclipse.io.*,!org.eclipse.servlet.jetty.*,javax.servlet.resources;resolution:=optional,javax.servlet.jsp;resolution:=optional,org.apache.jasper.servlet;resolution:=optional,org.eclipse.jetty.handler.management;resolution:=optional,*</Import-Package> -->
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-servlet/pom.xml
View File

@ -14,21 +14,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.servlet</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Export-Package>org.eclipse.jetty.servlet;version=${project.version}</Export-Package>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-servlets/pom.xml
View File

@ -14,21 +14,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.servlets</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Export-Package>org.eclipse.jetty.servlets;version=${project.version}</Export-Package>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

6
jetty-util/pom.xml
View File

@ -13,7 +13,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
@ -22,11 +22,7 @@
</goals>
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Export-Package>org.eclipse.jetty.util.*</Export-Package>
<Private-Package></Private-Package>
<Import-Package>org.slf4j;resolution:=optional,*</Import-Package>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>

9
jetty-webapp/pom.xml
View File

@ -30,20 +30,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Export-Package>org.eclipse.jetty.webapp;version=${project.version}</Export-Package>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

10
jetty-xml/pom.xml
View File

@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.xml</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Export-Package>org.eclipse.jetty.xml;version=${project.version}</Export-Package>
<Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

95
pom.xml
View File

@ -10,23 +10,26 @@
<artifactId>jetty-project</artifactId>
<version>7.0.0.M0-SNAPSHOT</version>
<name>Jetty :: Project</name>
<url>${jetty.url}</url>
<packaging>pom</packaging>
<properties>
<jetty.url>http://www.eclipse.org/jetty</jetty.url>
<felix.bundle.version>2.0.0</felix.bundle.version>
<activation-version>1.1</activation-version>
<ant-version>1.6.5</ant-version>
<jta-spec-version>1.1.1</jta-spec-version>
<junit-version>3.8.2</junit-version>
<mail-version>1.4</mail-version>
<slf4j-version>[1.4,1.6)</slf4j-version>
<slf4j-version>1.5.6</slf4j-version>
<eclipse-compiler-version>3.1.1</eclipse-compiler-version>
<glassfish-version-tag>9.1.02.B04.p0</glassfish-version-tag>
<cometd-version>1.0.beta4</cometd-version>
</properties>
<scm>
<connection>scm:svn:https://svn.codehaus.org/jetty/jetty/trunk</connection>
<developerConnection>scm:svn:https://svn.codehaus.org/jetty/jetty/trunk</developerConnection>
<url>scm:svn:https://svn.codehaus.org/jetty/jetty/trunk</url>
<connection>scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</connection>
<developerConnection>scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</developerConnection>
<url>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</url>
</scm>
<build>
<defaultGoal>install</defaultGoal>
@ -42,45 +45,23 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagBase>https://svn.codehaus.org/jetty/jetty/tags</tagBase>
<tagBase>svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags</tagBase>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<mode>development</mode>
<url>${pom.url}</url>
<implementation-version>${pom.version}</implementation-version>
<package>org.eclipse</package>
<Eclipse-Status>Incubation</Eclipse-Status>
</manifestEntries>
</archive>
</configuration>
</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:jetty-build-resources:1.0.1</resourceBundle>
</resourceBundles>
</configuration>
</execution>
</executions>
</plugin>
-->
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@ -89,8 +70,16 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.2</version>
<version>2.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Bundle-DocURL>${jetty.url}</Bundle-DocURL>
<Bundle-Vendor>Eclipse.org - Jetty</Bundle-Vendor>
<Bundle-Copyright>Copyright (c) 2008-2009 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -132,47 +121,6 @@
<module>jetty-test-webapp</module>
<module>jetty-distribution</module>
</modules>
<repositories>
<repository>
<id>codehaus.org</id>
<name>Jetty Snapshot Repository</name>
<layout>default</layout>
<url>http://snapshots.repository.codehaus.org</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>apache.plugin.snapshot</id>
<name>Apache Snapshot Repository</name>
<layout>default</layout>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>apache.plugin.snapshot</id>
<name>Apache Plugin Snapshot Repository</name>
<layout>default</layout>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
@ -237,3 +185,4 @@
</plugins>
</reporting>
</project>