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

fixed import into eclipse IDE

This commit is contained in:
Greg Wilkins 2015-05-13 23:13:16 +10:00
parent 356600716d
commit 435bed0c37
15 changed files with 57 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache-jsp/pom.xml
View File

@ -18,12 +18,6 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<executions>
<execution>
<id>generate-manifest</id>
<goals>
<goal>manifest</goal>
</goals>
<configuration> <configuration>
<instructions> <instructions>
<Bundle-Description>Jetty-specific ServletContainerInitializer for Jasper</Bundle-Description> <Bundle-Description>Jetty-specific ServletContainerInitializer for Jasper</Bundle-Description>
@ -35,8 +29,6 @@
<_nouses>true</_nouses> <_nouses>true</_nouses>
</instructions> </instructions>
</configuration> </configuration>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

2
examples/embedded/pom.xml
View File

@ -12,7 +12,7 @@
<description>Jetty Embedded Examples</description> <description>Jetty Embedded Examples</description>
<url>http://www.eclipse.org/jetty</url> <url>http://www.eclipse.org/jetty</url>
<properties> <properties>
<bundle-symbolic-name>${project.groupId}.examples.embedded</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.embedded</bundle-symbolic-name>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>

2
examples/embedded/src/main/java/HelloWorld.java → examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloWorld.java
View File

@ -16,6 +16,8 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.embedded;
import java.io.IOException; import java.io.IOException;
import javax.servlet.ServletException; import javax.servlet.ServletException;

8
jetty-annotations/pom.xml
View File

@ -18,20 +18,12 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<executions>
<execution>
<id>generate-manifest</id>
<goals>
<goal>manifest</goal>
</goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.objectweb.asm.*;version=5,*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.objectweb.asm.*;version=5,*</Import-Package>
<Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"</Require-Capability> <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"</Require-Capability>
</instructions> </instructions>
</configuration> </configuration>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>

9
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
View File

@ -73,15 +73,6 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<instructions> <instructions>
<Bundle-Name>Jetty-OSGi-Jasper Integration</Bundle-Name> <Bundle-Name>Jetty-OSGi-Jasper Integration</Bundle-Name>

9
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
View File

@ -53,15 +53,6 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<instructions> <instructions>
<Bundle-Name>RFC66 War URL</Bundle-Name> <Bundle-Name>RFC66 War URL</Bundle-Name>

9
jetty-osgi/jetty-osgi-boot/pom.xml
View File

@ -89,15 +89,6 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<instructions> <instructions>
<Bundle-SymbolicName>org.eclipse.jetty.osgi.boot;singleton:=true</Bundle-SymbolicName> <Bundle-SymbolicName>org.eclipse.jetty.osgi.boot;singleton:=true</Bundle-SymbolicName>

9
jetty-osgi/jetty-osgi-httpservice/pom.xml
View File

@ -83,15 +83,6 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<instructions> <instructions>
<Bundle-SymbolicName>org.eclipse.jetty.osgi.httpservice</Bundle-SymbolicName> <Bundle-SymbolicName>org.eclipse.jetty.osgi.httpservice</Bundle-SymbolicName>

9
jetty-osgi/test-jetty-osgi-context/pom.xml
View File

@ -80,15 +80,6 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<instructions> <instructions>
<Bundle-SymbolicName>org.eclipse.jetty.osgi.testcontext;singleton:=true</Bundle-SymbolicName> <Bundle-SymbolicName>org.eclipse.jetty.osgi.testcontext;singleton:=true</Bundle-SymbolicName>

9
jetty-osgi/test-jetty-osgi-webapp/pom.xml
View File

@ -73,15 +73,6 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<instructions> <instructions>
<Bundle-SymbolicName>org.eclipse.jetty.osgi.testapp;singleton:=true</Bundle-SymbolicName> <Bundle-SymbolicName>org.eclipse.jetty.osgi.testapp;singleton:=true</Bundle-SymbolicName>

22
jetty-websocket/websocket-server/pom.xml
View File

@ -20,21 +20,13 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<executions> <configuration>
<execution> <instructions>
<id>generate-manifest</id> <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
<goals> <Provide-Capability>osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.servlet.WebSocketServletFactory</Provide-Capability>
<goal>manifest</goal> <_nouses>true</_nouses>
</goals> </instructions>
<configuration> </configuration>
<instructions>
<Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
<Provide-Capability>osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.servlet.WebSocketServletFactory</Provide-Capability>
<_nouses>true</_nouses>
</instructions>
</configuration>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

18
pom.xml
View File

@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-parent</artifactId> <artifactId>jetty-parent</artifactId>
<version>24</version> <version>25-SNAPSHOT</version>
</parent> </parent>
<artifactId>jetty-project</artifactId> <artifactId>jetty-project</artifactId>
<version>9.3.0-SNAPSHOT</version> <version>9.3.0-SNAPSHOT</version>
@ -34,8 +34,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.7</source> <source>1.8</source>
<target>1.7</target> <target>1.8</target>
<testSource>1.8</testSource> <testSource>1.8</testSource>
<testTarget>1.8</testTarget> <testTarget>1.8</testTarget>
<verbose>false</verbose> <verbose>false</verbose>
@ -245,6 +245,7 @@
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<phase>process-classes</phase>
<goals> <goals>
<goal>manifest</goal> <goal>manifest</goal>
</goals> </goals>
@ -702,6 +703,17 @@
<modules> <modules>
<module>aggregates/jetty-all</module> <module>aggregates/jetty-all</module>
</modules> </modules>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
<profile> <profile>
<id>ci</id> <id>ci</id>

37
tests/test-webapps/test-jetty-webapp/pom.xml
View File

@ -81,31 +81,20 @@
<supportedProjectTypes> <supportedProjectTypes>
<supportedProjectType>war</supportedProjectType> <supportedProjectType>war</supportedProjectType>
</supportedProjectTypes> </supportedProjectTypes>
<instructions>
<Import-Package>javax.servlet.jsp.*;version="[2.2.0,3.0)",javax.servlet.*;version="[2.6,3.2)",org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
<Export-Package>!com.acme*</Export-Package>
<!-- the test webapp is configured via a jetty xml file
in order to add the security handler. -->
<Web-ContextPath>/</Web-ContextPath>
<!-- in fact the '.' must not be there
but Felix-BND has a bug:
http://www.mail-archive.com/users@felix.apache.org/msg04730.html
https://issues.apache.org/jira/browse/FELIX-1571
-->
<Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
</instructions>
</configuration> </configuration>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.jsp.*;version="[2.2.0,3.0)",javax.servlet.*;version="[2.6,3.2)",org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
<Export-Package>!com.acme*</Export-Package>
<!-- the test webapp is configured via a jetty xml file
in order to add the security handler. -->
<Web-ContextPath>/</Web-ContextPath>
<!-- in fact the '.' must not be there
but Felix-BND has a bug:
http://www.mail-archive.com/users@felix.apache.org/msg04730.html
https://issues.apache.org/jira/browse/FELIX-1571
-->
<Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
</instructions>
</configuration>
</execution>
</executions>
</plugin> </plugin>
<!-- also make this webapp an osgi bundle --> <!-- also make this webapp an osgi bundle -->
<plugin> <plugin>

9
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
View File

@ -40,15 +40,6 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<instructions> <instructions>
<Bundle-SymbolicName>org.eclipse.jetty.tests.test-servlet-container-initializer;singleton:=true</Bundle-SymbolicName> <Bundle-SymbolicName>org.eclipse.jetty.tests.test-servlet-container-initializer;singleton:=true</Bundle-SymbolicName>

48
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
View File

@ -71,36 +71,26 @@
<supportedProjectTypes> <supportedProjectTypes>
<supportedProjectType>war</supportedProjectType> <supportedProjectType>war</supportedProjectType>
</supportedProjectTypes> </supportedProjectTypes>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.tests.test-spec-webapp</Bundle-SymbolicName>
<Bundle-Description>Test Webapp for Servlet 3.1 Features</Bundle-Description>
<Import-Package>
javax.servlet.jsp.*;version="[2.2.0, 3.0)",
javax.transaction.*;version="[1.1, 2.0)",
javax.servlet.*;version="3.0",
javax.sql,
org.eclipse.jetty.webapp;version="9.2",org.eclipse.jetty.plus.jndi;version="9.2",
org.eclipse.jetty.security;version="9.2",
com.acme;version="9.2",
*
</Import-Package>
<Export-Package>com.acme.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
<Web-ContextPath>/</Web-ContextPath>
<Bundle-ClassPath>.,WEB-INF/classes,WEB-INF/lib</Bundle-ClassPath>
<Jetty-ContextFilePath>/META-INF/plugin-context.xml</Jetty-ContextFilePath>
<_nouses>true</_nouses>
</instructions>
</configuration> </configuration>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.tests.test-spec-webapp</Bundle-SymbolicName>
<Bundle-Description>Test Webapp for Servlet 3.1 Features</Bundle-Description>
<Import-Package>
javax.servlet.jsp.*;version="[2.2.0, 3.0)",
javax.transaction.*;version="[1.1, 2.0)",
javax.servlet.*;version="3.0",
javax.sql,
org.eclipse.jetty.webapp;version="9.2",org.eclipse.jetty.plus.jndi;version="9.2",
org.eclipse.jetty.security;version="9.2",
com.acme;version="9.2",
*
</Import-Package>
<Export-Package>com.acme.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
<Web-ContextPath>/</Web-ContextPath>
<Bundle-ClassPath>.,WEB-INF/classes,WEB-INF/lib</Bundle-ClassPath>
<Jetty-ContextFilePath>./META-INF/plugin-context.xml</Jetty-ContextFilePath>
<_nouses>true</_nouses>
</instructions>
</configuration>
</execution>
</executions>
</plugin> </plugin>