Revert "Bug 527813 - remove unneeded jetty includes from org.eclipse.wst.server_adapters.feature feature Bug 527813 - add missing jetty requires to org.eclipse.wst.server.preview and update to 9.4.7 fix .gitignore for plugins/org.eclipse.jst.server.generic.jonas so generated jar is not accidentally committed to git" This reverts commit 3102f5f1096468d12581f1cb603138299461f2c7. Change-Id: I1cd3d2327f6f44a8b46789b82b26928b81b2922f
diff --git a/features/org.eclipse.wst.server_adapters.feature/feature.properties b/features/org.eclipse.wst.server_adapters.feature/feature.properties index 62982ee..cdc39bb 100644 --- a/features/org.eclipse.wst.server_adapters.feature/feature.properties +++ b/features/org.eclipse.wst.server_adapters.feature/feature.properties
@@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2007,2017 IBM Corporation and others. +# Copyright (c) 2007 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,7 +7,6 @@ # # Contributors: # IBM Corporation - initial API and implementation -# Nick Boldt (Red Hat) - remove unneeded jetty includes from feature ############################################################################### # feature.properties # contains externalized strings for feature.xml @@ -27,7 +26,7 @@ # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2007,2017 IBM Corporation and others.\n\ +Copyright (c) 2007 IBM Corporation and others.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License v1.0\n\ which accompanies this distribution, and is available at\n\ @@ -35,7 +34,6 @@ \n\ Contributors:\n\ IBM Corporation - initial API and implementation\n - Nick Boldt (Red Hat) - remove unneeded jetty includes from feature\n ################ end of copyright property #################################### # "licenseURL" property - URL of the "Feature License"
diff --git a/features/org.eclipse.wst.server_adapters.feature/feature.xml b/features/org.eclipse.wst.server_adapters.feature/feature.xml index fe3609d..84b416a 100644 --- a/features/org.eclipse.wst.server_adapters.feature/feature.xml +++ b/features/org.eclipse.wst.server_adapters.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.wst.server_adapters.feature" label="%featureName" - version="3.2.601.qualifier" + version="3.2.600.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier"> @@ -19,19 +19,6 @@ %license </license> - <!-- - https://bugs.eclipse.org/bugs/show_bug.cgi?id=527813 - These two jetty plugins are already required by - org.eclipse.wst.server.preview/META-INF/MANIFEST.MF, - so no need to include or require them here - <requires> - <import plugin="org.eclipse.jetty.webapp"/> - <import plugin="org.eclipse.jetty.http"/> - <import plugin="org.eclipse.jetty.io"/> - <import plugin="org.eclipse.jetty.xml"/> - </requires> - --> - <plugin id="org.eclipse.wst.server.preview.adapter" download-size="0" @@ -60,4 +47,18 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.jetty.webapp" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.xml" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature>
diff --git a/features/org.eclipse.wst.server_adapters.feature/pom.xml b/features/org.eclipse.wst.server_adapters.feature/pom.xml index be4a021..384005a 100644 --- a/features/org.eclipse.wst.server_adapters.feature/pom.xml +++ b/features/org.eclipse.wst.server_adapters.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.wst.server_adapters.feature</artifactId> - <version>3.2.601-SNAPSHOT</version> + <version>3.2.600-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/.gitignore b/plugins/org.eclipse.jst.server.generic.jonas/.gitignore deleted file mode 100644 index ddbba60..0000000 --- a/plugins/org.eclipse.jst.server.generic.jonas/.gitignore +++ /dev/null
@@ -1 +0,0 @@ -genericjonas.jar
diff --git a/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF index 40e5a54..2c21f66 100644 --- a/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
@@ -2,20 +2,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.server.preview; singleton:=true -Bundle-Version: 1.1.501.qualifier +Bundle-Version: 1.1.500.qualifier Bundle-Activator: org.eclipse.wst.server.preview.internal.PreviewServerPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.wst.server.preview.internal;x-internal:=true -Require-Bundle: org.apache.commons.logging;bundle-version="[1.0.4,2.0.0)", - org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", - org.eclipse.jetty.http;bundle-version="[9.4.7,10.0.0)", - org.eclipse.jetty.io;bundle-version="[9.4.7,10.0.0)", - org.eclipse.jetty.server;bundle-version="[9.4.7,10.0.0)", - org.eclipse.jetty.servlet;bundle-version="[9.4.7,10.0.0)", - org.eclipse.jetty.util;bundle-version="[9.4.7,10.0.0)", - org.eclipse.jetty.webapp;bundle-version="[9.4.7,10.0.0)", - org.eclipse.jetty.xml;bundle-version="[9.4.7,10.0.0)" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", + org.eclipse.jetty.http;bundle-version="[8.0.4,10.0.0)", + org.eclipse.jetty.server;bundle-version="[8.0.4,10.0.0)", + org.eclipse.jetty.util;bundle-version="[8.0.4,10.0.0)", + org.apache.commons.logging;bundle-version="[1.0.4,2.0.0)", + org.eclipse.jetty.webapp;bundle-version="[8.0.4,10.0.0)", + org.eclipse.jetty.servlet;bundle-version="[8.0.4,10.0.0)", + org.eclipse.jetty.xml;bundle-version="[8.0.4,10.0.0)" Import-Package: javax.servlet;version="[3.1.0,4.0.0)", javax.servlet.http;version="[3.1.0,4.0.0) Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.wst.server.preview/build.properties b/plugins/org.eclipse.wst.server.preview/build.properties new file mode 100644 index 0000000..9579346 --- /dev/null +++ b/plugins/org.eclipse.wst.server.preview/build.properties
@@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2007 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +bin.includes = plugin.xml,\ + plugin.properties,\ + .,\ + META-INF/,\ + about.html +bin.excludes = bin/**,\ + @dot/**,\ + temp.folder/** +source.. = src/
diff --git a/plugins/org.eclipse.wst.server.preview/plugin.properties b/plugins/org.eclipse.wst.server.preview/plugin.properties new file mode 100644 index 0000000..46a080b --- /dev/null +++ b/plugins/org.eclipse.wst.server.preview/plugin.properties
@@ -0,0 +1,12 @@ +############################################################################### +# Copyright (c) 2007 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +pluginName=Preview Server Support +providerName=Eclipse.org
diff --git a/plugins/org.eclipse.wst.server.preview/pom.xml b/plugins/org.eclipse.wst.server.preview/pom.xml index 736a038..ff8347e 100644 --- a/plugins/org.eclipse.wst.server.preview/pom.xml +++ b/plugins/org.eclipse.wst.server.preview/pom.xml
@@ -1,28 +1,27 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2012, 2017 Eclipse Foundation and others. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Distribution License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/org/documents/edl-v10.php - - Contributors: - Thanh Ha (Eclipse Foundation) - initial implementation - Nick Boldt (Red Hat) - add missing jetty requirements ---> - -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.webtools.servertools</groupId> - <artifactId>org.eclipse.webtools.servertools</artifactId> - <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> - </parent> - - <groupId>org.eclipse.webtools.servertools</groupId> - <artifactId>org.eclipse.wst.server.preview</artifactId> - <version>1.1.501-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2012, 2013 Eclipse Foundation and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Distribution License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/org/documents/edl-v10.php + + Contributors: + Thanh Ha (Eclipse Foundation) - initial implementation +--> + +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.webtools.servertools</groupId> + <artifactId>org.eclipse.webtools.servertools</artifactId> + <version>3.6.0-SNAPSHOT</version> + <relativePath>../../</relativePath> + </parent> + + <groupId>org.eclipse.webtools.servertools</groupId> + <artifactId>org.eclipse.wst.server.preview</artifactId> + <version>1.1.500-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>