From b719f4b716d5a208a490d265564f774b275e9731 Mon Sep 17 00:00:00 2001 From: cbridgha Date: Mon, 24 Feb 2020 18:08:51 -0500 Subject: [PATCH 1/2] Setup transform task --- dev/cnf/oss_ibm.maven | 1 + dev/wlp-jakartaee-transform/.classpath | 6 +++ dev/wlp-jakartaee-transform/.gitignore | 2 + dev/wlp-jakartaee-transform/.project | 23 +++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 12 ++++++ dev/wlp-jakartaee-transform/bnd.bnd | 38 +++++++++++++++++++ 6 files changed, 82 insertions(+) create mode 100755 dev/wlp-jakartaee-transform/.classpath create mode 100755 dev/wlp-jakartaee-transform/.gitignore create mode 100755 dev/wlp-jakartaee-transform/.project create mode 100755 dev/wlp-jakartaee-transform/.settings/org.eclipse.jdt.core.prefs create mode 100755 dev/wlp-jakartaee-transform/bnd.bnd diff --git a/dev/cnf/oss_ibm.maven b/dev/cnf/oss_ibm.maven index 9a9e8587476..b345196c0a5 100644 --- a/dev/cnf/oss_ibm.maven +++ b/dev/cnf/oss_ibm.maven @@ -2,6 +2,7 @@ com.ibm.ws.commons-collections:commons-collections:3.2.1 com.ibm.ws:geronimo-validation:1.1 com.ibm.ws.internal.prereq.java:java.rtSunKrb5:1.8.0 com.ibm.ws.internal.prereq.java:java.ibmjgssprovider:1.8.0 +com.ibm.ws:jakartaee-transformer:0.0.1 com.ibm.ws.javax.j2ee:connector:1.6 com.ibm.ws.javax.j2ee:el:2.2 com.ibm.ws.javax.j2ee:jaxrpc:1.0 diff --git a/dev/wlp-jakartaee-transform/.classpath b/dev/wlp-jakartaee-transform/.classpath new file mode 100755 index 00000000000..65630e0f498 --- /dev/null +++ b/dev/wlp-jakartaee-transform/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/dev/wlp-jakartaee-transform/.gitignore b/dev/wlp-jakartaee-transform/.gitignore new file mode 100755 index 00000000000..57b341172a1 --- /dev/null +++ b/dev/wlp-jakartaee-transform/.gitignore @@ -0,0 +1,2 @@ +/bin/ +/generated/ diff --git a/dev/wlp-jakartaee-transform/.project b/dev/wlp-jakartaee-transform/.project new file mode 100755 index 00000000000..31f6fd431a5 --- /dev/null +++ b/dev/wlp-jakartaee-transform/.project @@ -0,0 +1,23 @@ + + + wlp-jakartaee-transform + + + + + + org.eclipse.jdt.core.javabuilder + + + + + bndtools.core.bndbuilder + + + + + + org.eclipse.jdt.core.javanature + bndtools.core.bndnature + + diff --git a/dev/wlp-jakartaee-transform/.settings/org.eclipse.jdt.core.prefs b/dev/wlp-jakartaee-transform/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..c27e0de374c --- /dev/null +++ b/dev/wlp-jakartaee-transform/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +#Wed Sep 21 14:04:41 BST 2011 +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/dev/wlp-jakartaee-transform/bnd.bnd b/dev/wlp-jakartaee-transform/bnd.bnd new file mode 100755 index 00000000000..f3a416da700 --- /dev/null +++ b/dev/wlp-jakartaee-transform/bnd.bnd @@ -0,0 +1,38 @@ +#******************************************************************************* +# Copyright (c) 2020 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 +#******************************************************************************* + +-include= ~../cnf/resources/bnd/bundle.props +bVersion=1.0 + +Main-Class: com.ibm.ws.jakarta.transformer.JakartaTransformer + +Bundle-Name: Liberty Jakartaee Transformer +Bundle-SymbolicName: wlp-jakartaeeTransformer +Bundle-Description: Unshipped bundle that houses jakartaaee transformer for use during build + +Private-Package: \ + com.ibm.ws.jakarta.transformer.* + +-plugin.build.bnd.plugins: +-pluginpath: + +globalize: false + +instrument.disabled: true + +publish.wlp.jar.disabled: true + +tool.project: true + +generate.replacement: false + +-buildpath: \ + com.ibm.ws:jakartaee-transformer;strategy=exact;version=0.0.1 From a3e890af8d0ac637d8c993361376b890acc3e1bc Mon Sep 17 00:00:00 2001 From: cbridgha Date: Thu, 27 Feb 2020 11:59:55 -0500 Subject: [PATCH 2/2] Enable transform in build --- dev/cnf/build.bnd | 2 + .../check_this_in_if_it_changes/pom.xml | 5 + dev/cnf/oss_dependencies.maven | 1 + dev/cnf/oss_ibm.maven | 5 +- ...here.appserver.jakarta.servlet-5.0.feature | 7 + ...bm.websphere.appserver.servlet-5.0.feature | 74 +++ ...websphere.appserver.servlet-5.0.properties | 20 + ...sphere.appserver.servlet-5.0_cs.properties | 20 + ...sphere.appserver.servlet-5.0_de.properties | 20 + ...sphere.appserver.servlet-5.0_es.properties | 20 + ...sphere.appserver.servlet-5.0_fr.properties | 20 + ...sphere.appserver.servlet-5.0_hu.properties | 20 + ...sphere.appserver.servlet-5.0_it.properties | 20 + ...sphere.appserver.servlet-5.0_ja.properties | 20 + ...sphere.appserver.servlet-5.0_ko.properties | 20 + ...sphere.appserver.servlet-5.0_pl.properties | 21 + ...ere.appserver.servlet-5.0_pt_BR.properties | 20 + ...sphere.appserver.servlet-5.0_ro.properties | 20 + ...sphere.appserver.servlet-5.0_ru.properties | 20 + ...sphere.appserver.servlet-5.0_zh.properties | 20 + ...ere.appserver.servlet-5.0_zh_TW.properties | 20 + .../.classpath | 6 + .../.gitignore | 2 + .../.project | 23 + .../.settings/bndtools.core.prefs | 2 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 288 +++++++++++ .../.settings/org.eclipse.jdt.ui.prefs | 116 +++++ .../bnd.bnd | 35 ++ .../jakarta/servlet/resources/XMLSchema.dtd | 402 +++++++++++++++ .../jakarta/servlet/resources/datatypes.dtd | 219 ++++++++ .../jakarta/servlet/resources/j2ee_1_4.xsd | 392 +++++++++++++++ .../resources/j2ee_web_services_1_1.xsd | 115 +++++ .../j2ee_web_services_client_1_1.xsd | 87 ++++ .../jakarta/servlet/resources/web-app_2_2.dtd | 155 ++++++ .../jakarta/servlet/resources/web-app_2_3.dtd | 261 ++++++++++ .../jakarta/servlet/resources/web-app_2_4.xsd | 325 ++++++++++++ .../jakarta/servlet/resources/web-app_2_5.xsd | 470 ++++++++++++++++++ .../src/jakarta/servlet/resources/xml.xsd | 117 +++++ .../bnd.bnd | 2 + dev/com.ibm.ws.session/bnd.bnd | 2 + dev/com.ibm.ws.webcontainer.cors/bnd.bnd | 2 + .../bnd.bnd | 2 + .../bnd.bnd | 2 + .../bnd.bnd | 2 + dev/com.ibm.ws.webcontainer/bnd.bnd | 2 + .../bnd.bnd | 2 + dev/wlp-gradle/bndSettings.gradle | 1 + dev/wlp-gradle/subprojects/assemble.gradle | 1 + dev/wlp-gradle/subprojects/tasks.gradle | 42 ++ dev/wlp-jakartaee-transform/bnd.bnd | 16 +- .../rules/jakarta-bundles.properties | 1 + .../rules/jakarta-renames.properties | 6 + .../rules/jakarta-selections.properties | 3 + .../rules/jakarta-versions.properties | 5 + 55 files changed, 3497 insertions(+), 7 deletions(-) create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/private/com.ibm.websphere.appserver.jakarta.servlet-5.0.feature create mode 100755 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/com.ibm.websphere.appserver.servlet-5.0.feature create mode 100755 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_cs.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_de.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_es.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_fr.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_hu.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_it.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ja.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ko.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_pl.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_pt_BR.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ro.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ru.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_zh.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_zh_TW.properties create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/.classpath create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/.gitignore create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/.project create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/bndtools.core.prefs create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.core.resources.prefs create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.jdt.core.prefs create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.jdt.ui.prefs create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/bnd.bnd create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/XMLSchema.dtd create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/datatypes.dtd create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_1_4.xsd create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_web_services_1_1.xsd create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_web_services_client_1_1.xsd create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_2.dtd create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_3.dtd create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_4.xsd create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_5.xsd create mode 100644 dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/xml.xsd create mode 100755 dev/wlp-jakartaee-transform/rules/jakarta-bundles.properties create mode 100755 dev/wlp-jakartaee-transform/rules/jakarta-renames.properties create mode 100755 dev/wlp-jakartaee-transform/rules/jakarta-selections.properties create mode 100755 dev/wlp-jakartaee-transform/rules/jakarta-versions.properties diff --git a/dev/cnf/build.bnd b/dev/cnf/build.bnd index e073efeb10c..f6130e7bb48 100644 --- a/dev/cnf/build.bnd +++ b/dev/cnf/build.bnd @@ -50,6 +50,8 @@ instrument.ffdc: true instrument.taskInjection: false -buildpath.instrument: ${if;${instrument.disabled};;com.ibm.ws.ras.instrument\\;version=latest} +jakartaeeMe: false + # Don't upload sources or javadoc unless bundle overrides -maven-release: ${if;${driver;gradle};remote;local}, sources;path=NONE, javadoc;path=NONE -groupid: ${if;${test.project};test;dev} diff --git a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml index bf249f00749..911cf443805 100644 --- a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml +++ b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml @@ -561,6 +561,11 @@ smallrye-reactive-streams-operators 1.0.10 + + jakarta.servlet + jakarta.servlet-api + 5.0.0-M1 + javax.activation activation diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index b588fa94c67..b74fa450edb 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -108,6 +108,7 @@ io.reactivex.rxjava2:rxjava:2.2.13 io.smallrye.reactive:smallrye-reactive-converter-api:1.0.10 io.smallrye.reactive:smallrye-reactive-messaging-provider:1.0.8 io.smallrye.reactive:smallrye-reactive-streams-operators:1.0.10 +jakarta.servlet:jakarta.servlet-api:5.0.0-M1 javax.activation:activation:1.1 javax.annotation:javax.annotation-api:1.2 javax.annotation:javax.annotation-api:1.3.1 diff --git a/dev/cnf/oss_ibm.maven b/dev/cnf/oss_ibm.maven index b345196c0a5..8e9f1644007 100644 --- a/dev/cnf/oss_ibm.maven +++ b/dev/cnf/oss_ibm.maven @@ -2,7 +2,10 @@ com.ibm.ws.commons-collections:commons-collections:3.2.1 com.ibm.ws:geronimo-validation:1.1 com.ibm.ws.internal.prereq.java:java.rtSunKrb5:1.8.0 com.ibm.ws.internal.prereq.java:java.ibmjgssprovider:1.8.0 -com.ibm.ws:jakartaee-transformer:0.0.1 +com.ibm.ws:jakartaee-transformer:0.0.2 +biz.aQute.bnd:biz.aQute.bndlib:4.3.1 +commons-cli:commons-cli:1.4 +org.slf4j:slf4j-simple:1.7.29 com.ibm.ws.javax.j2ee:connector:1.6 com.ibm.ws.javax.j2ee:el:2.2 com.ibm.ws.javax.j2ee:jaxrpc:1.0 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/com.ibm.websphere.appserver.jakarta.servlet-5.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/com.ibm.websphere.appserver.jakarta.servlet-5.0.feature new file mode 100644 index 00000000000..d2681163205 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/com.ibm.websphere.appserver.jakarta.servlet-5.0.feature @@ -0,0 +1,7 @@ +-include= ~${workspace}/cnf/resources/bnd/feature.props +symbolicName=com.ibm.websphere.appserver.jakarta.servlet-5.0 +singleton=true +-bundles=com.ibm.websphere.jakarta.servlet.5.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.servlet:jakarta.servlet-api:5.0.0" +kind=noship +edition=core +WLP-Activation-Type: parallel diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/com.ibm.websphere.appserver.servlet-5.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/com.ibm.websphere.appserver.servlet-5.0.feature new file mode 100755 index 00000000000..62f34506ced --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/com.ibm.websphere.appserver.servlet-5.0.feature @@ -0,0 +1,74 @@ +-include= ~${workspace}/cnf/resources/bnd/feature.props +symbolicName=com.ibm.websphere.appserver.servlet-5.0 +visibility=public +singleton=true +IBM-App-ForceRestart: install, uninstall +IBM-ShortName: servlet-5.0 +IBM-API-Package: jakarta.servlet.annotation; type="spec", \ + jakarta.servlet.descriptor; type="spec", \ + jakarta.servlet.resources; type="spec", \ + jakarta.servlet.http; type="spec", \ + jakarta.servlet; type="spec", \ + com.ibm.websphere.servlet.session; type="ibm-api", \ + com.ibm.wsspi.servlet.session; type="ibm-api", \ + com.ibm.websphere.servlet.error; type="ibm-api", \ + com.ibm.websphere.servlet.container; type="ibm-api", \ + com.ibm.websphere.servlet.context; type="ibm-api", \ + com.ibm.websphere.servlet.event; type="ibm-api", \ + com.ibm.websphere.webcontainer; type="ibm-api", \ + com.ibm.wsspi.webcontainer; type="internal", \ + com.ibm.wsspi.webcontainer.annotation; type="internal" +IBM-SPI-Package: com.ibm.wsspi.webcontainer, \ + com.ibm.wsspi.webcontainer.collaborator, \ + com.ibm.wsspi.webcontainer.extension, \ + com.ibm.wsspi.webcontainer.filter, \ + com.ibm.wsspi.webcontainer.metadata, \ + com.ibm.wsspi.webcontainer.osgi.extension, \ + com.ibm.wsspi.webcontainer.servlet, \ + com.ibm.wsspi.webcontainer.webapp, \ + com.ibm.websphere.servlet.filter, \ + com.ibm.websphere.servlet.response, \ + com.ibm.ws.webcontainer.extension, \ + com.ibm.websphere.servlet.request, \ + com.ibm.ws.webcontainer.spiadapter.collaborator, \ + com.ibm.websphere.webcontainer.async +Subsystem-Category: JavaEE8Application +-features=com.ibm.websphere.appserver.injection-1.0, \ + com.ibm.websphere.appserver.artifact-1.0, \ + com.ibm.websphere.appserver.containerServices-1.0, \ + com.ibm.websphere.appserver.javaeedd-1.0, \ + com.ibm.websphere.appserver.classloading-1.0, \ + com.ibm.websphere.appserver.appmanager-1.0, \ + com.ibm.websphere.appserver.javaeePlatform-8.0, \ + com.ibm.websphere.appserver.anno-1.0, \ + com.ibm.websphere.appserver.javax.annotation-1.3, \ + com.ibm.websphere.appserver.httptransport-1.0, \ + com.ibm.websphere.appserver.jakarta.servlet-5.0, \ + com.ibm.websphere.appserver.requestProbes-1.0, \ + com.ibm.websphere.appserver.javaeeCompatible-8.0, \ + com.ibm.websphere.appserver.servlet-servletSpi1.0, \ + com.ibm.websphere.appserver.javaeeddSchema-1.0 +-bundles=com.ibm.ws.app.manager.war, \ + com.ibm.ws.managedobject, \ + com.ibm.ws.org.apache.commons.io, \ + com.ibm.websphere.security, \ + com.ibm.ws.org.apache.commons.fileupload.jakarta, \ + com.ibm.ws.webcontainer.servlet.4.0.jakarta, \ + com.ibm.ws.webcontainer.servlet.4.0.factories.jakarta, \ + com.ibm.ws.webcontainer.servlet.3.1.jakarta, \ + com.ibm.ws.session.jakarta, \ + com.ibm.ws.webcontainer.jakarta, \ + com.ibm.ws.webcontainer.cors.jakarta, \ + com.ibm.ws.http.plugin.merge, \ + com.ibm.ws.webserver.plugin.runtime.jakarta, \ + com.ibm.ws.webserver.plugin.runtime.interfaces +-jars=com.ibm.ws.webserver.plugin.utility, \ + com.ibm.websphere.appserver.api.servlet; location:=dev/api/ibm/ +-files=bin/tools/ws-webserverPluginutil.jar, \ + bin/pluginUtility; ibm.executable:=true; ibm.file.encoding:=ebcdic, \ + bin/pluginUtility.bat, \ + dev/api/ibm/javadoc/com.ibm.websphere.appserver.api.servlet_1.1-javadoc.zip +Subsystem-Name: Java Servlets 5.0 +kind=noship +edition=core +WLP-Activation-Type: parallel diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0.properties new file mode 100755 index 00000000000..903a69c2a79 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=This feature enables support for HTTP Servlets written to the Java Servlet 4.0 specification. \ + You can package servlets in Java EE specified WAR or EAR files. If servlet security is required, you \ + should also configure an appSecurity feature. Without a security feature, any security \ + constraints for the application are ignored. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_cs.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_cs.properties new file mode 100644 index 00000000000..17e930a617c --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_cs.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Tato funkce umo\u017e\u0148uje podporu pro servlety HTTP zapsan\u00e9 do specifikace produktu Java Servlet 4.0. \ +Servlety m\u016f\u017eete zabalit do prost\u0159ed\u00ed Java EE ur\u010den\u00e9ho soubory WAR nebo EAR. \ +Je-li zabezpe\u010den\u00ed servletu nezbytn\u00e9, m\u011bli byste rovn\u011b\u017e zkonfigurovat funkci appSecurity. \ +Bez funkce zabezpe\u010den\u00ed jsou jak\u00e1koli omezen\u00ed zabezpe\u010den\u00ed pro aplikaci ignorov\u00e1na. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_de.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_de.properties new file mode 100644 index 00000000000..891930883e0 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_de.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Dieses Feature erm\u00f6glicht die Unterst\u00fctzung f\u00fcr HTTP-Servlets, die f\u00fcr die Java Servlet 4.0-Spezifikation geschrieben wurden. \ +Sie k\u00f6nnen Servlets in WAR- oder EAR-Dateien packen, f\u00fcr die Java EE angegeben ist. \ +Wenn die Servletsicherheit erforderlich ist, m\u00fcssen Sie auch ein an appSecurity-Feature konfigurieren. \ +Ohne Sicherheitsfeature werden alle Sicherheitsvorgaben f\u00fcr die Anwendung ignoriert. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_es.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_es.properties new file mode 100644 index 00000000000..c2f0d726ed8 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_es.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Esta caracter\u00edstica habilita el soporte para servlets HTTP escritos para la especificaci\u00f3n Java Servlet 4.0. \ +Puede empaquetar servlets en archivos WAR o EAR con especificaci\u00f3n de Java EE. \ +Si la seguridad del servlet es necesaria, tambi\u00e9n deber\u00e1 configurar una caracter\u00edstica appSecurity. \ +Sin una caracter\u00edstica de seguridad, se ignoran las restricciones de seguridad para la aplicaci\u00f3n. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_fr.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_fr.properties new file mode 100644 index 00000000000..7277061a4e7 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_fr.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Cette fonction permet la prise en charge de servlets HTTP r\u00e9dig\u00e9s d'apr\u00e8s la sp\u00e9cification Java Servlet 4.0. \ +Vous pouvez packager les servlets dans des fichiers WAR ou EAR Java EE. \ +Si la s\u00e9curit\u00e9 de servlet est requise, vous devez aussi configurer une fonction appSecurity. \ +Sans fonction de s\u00e9curit\u00e9, les contraintes de s\u00e9curit\u00e9 pour l'application sont ignor\u00e9es. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_hu.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_hu.properties new file mode 100644 index 00000000000..e39745a5d14 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_hu.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Ez a szolg\u00e1ltat\u00e1s teszi lehet\u0151v\u00e9 a Java Servlet 4.0 specifik\u00e1ci\u00f3ra \u00edrt HTTP szervletek t\u00e1mogat\u00e1s\u00e1t. \ +Szervleteket csomagolhat Java EE \u00e1ltal meghat\u00e1rozott WAR vagy EAR f\u00e1jlokba. \ +Ha szervlet biztons\u00e1g sz\u00fcks\u00e9ges, akkor konfigur\u00e1lhat egy appSecurity szolg\u00e1ltat\u00e1st is. \ +Biztons\u00e1gi szolg\u00e1ltat\u00e1s n\u00e9lk\u00fcl az alkalmaz\u00e1s biztons\u00e1gi megszor\u00edt\u00e1sai figyelmen k\u00edv\u00fcl maradnak. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_it.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_it.properties new file mode 100644 index 00000000000..f0d8c0cb33a --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_it.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Questa funzione abilita il supporto per i servlet HTTP scritto nella specifica Java Servlet 4.0. \ +\u00c8 possibile impacchettare i servlet in file WAR o EAR specificati da Java EE. \ +Se \u00e8 necessaria la protezione dei servlet occorre configurare anche la funzione appSecurity. \ +Senza una funzione di sicurezza qualsiasi vincolo di sicurezza per l'applicazione verr\u00e0 ignorato. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ja.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ja.properties new file mode 100644 index 00000000000..6fe60a8d866 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ja.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=\u3053\u306e\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u306f\u3001Java \u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 4.0 \u4ed5\u69d8\u306b\u8a18\u8ff0\u3055\u308c\u305f HTTP \u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u6709\u52b9\u306b\u3057\u307e\u3059\u3002\ +\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306f\u3001Java EE \u3067\u898f\u5b9a\u3055\u308c\u3066\u3044\u308b WAR \u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f EAR \u30d5\u30a1\u30a4\u30eb\u306b\u30d1\u30c3\u30b1\u30fc\u30b8\u5316\u3067\u304d\u307e\u3059\u3002 \ +\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u304c\u5fc5\u8981\u306a\u5834\u5408\u3001appSecurity \u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u3082\u69cb\u6210\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \ +\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u30fb\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u304c\u542b\u307e\u308c\u3066\u3044\u306a\u3044\u3068\u3001\u305d\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u3059\u3079\u3066\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5236\u7d04\u304c\u7121\u8996\u3055\u308c\u307e\u3059\u3002 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ko.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ko.properties new file mode 100644 index 00000000000..de33b03c918 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ko.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=\uc774 \uae30\ub2a5\uc744 \ud1b5\ud574 Java Servlet 4.0 \uc2a4\ud399\uc73c\ub85c \uc791\uc131\ub41c HTTP Servlet\uc744 \uc9c0\uc6d0\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \ +Java EE \uc9c0\uc815 WAR \ub610\ub294 EAR \ud30c\uc77c\uc5d0 \uc11c\ube14\ub9bf\uc744 \ud328\ud0a4\uc9c0\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \ +\uc11c\ube14\ub9bf \ubcf4\uc548\uc774 \ud544\uc694\ud55c \uacbd\uc6b0 appSecurity \uae30\ub2a5\ub3c4 \uad6c\uc131\ud574\uc57c \ud569\ub2c8\ub2e4.\ +\ubcf4\uc548 \uae30\ub2a5\uc774 \uc5c6\uc73c\uba74 \uc560\ud50c\ub9ac\ucf00\uc774\uc158\uc5d0 \ub300\ud55c \ubcf4\uc548 \uc81c\ud55c\uc870\uac74\uc774 \ubb34\uc2dc\ub429\ub2c8\ub2e4. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_pl.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_pl.properties new file mode 100644 index 00000000000..7d751031181 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_pl.properties @@ -0,0 +1,21 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Ten sk\u0142adnik umo\u017cliwia obs\u0142ug\u0119 serwlet\u00f3w HTTP \ +zgodnych ze specyfikacj\u0105 Java Servlet 4.0. \ +Serwlety mo\u017cna pakowa\u0107 do plik\u00f3w WAR lub EAR okre\u015blonych w \u015brodowisku Java EE. \ +Je\u015bli wymagane s\u0105 zabezpieczenia serwlet\u00f3w, nale\u017cy r\u00f3wnie\u017c skonfigurowa\u0107 sk\u0142adnik zabezpiecze\u0144 aplikacji. \ +Je\u015bli brak sk\u0142adnika zabezpiecze\u0144, wszystkie ograniczenia zabezpiecze\u0144 dotycz\u0105ce aplikacji s\u0105 ignorowane. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_pt_BR.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_pt_BR.properties new file mode 100644 index 00000000000..6afcd85f559 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_pt_BR.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Este recurso permite o suporte para Servlets HTTP gravados na especifica\u00e7\u00e3o de Java Servlet 4.0. \ +\u00c9 poss\u00edvel empacotar servlets em arquivos WAR ou EAR especificados pelo Java EE. \ +Se seguran\u00e7a de servlet for necess\u00e1ria, ser\u00e1 necess\u00e1rio configurar um recurso appSecurity. \ +Sem um recurso de seguran\u00e7a, qualquer restri\u00e7\u00e3o de seguran\u00e7a do aplicativo ser\u00e1 ignorada. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ro.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ro.properties new file mode 100644 index 00000000000..48c3fc8eb6a --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ro.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Aceast\u0103 caracteristic\u0103 permite suportul pentru servleturile HTTP scrise \u00een specifica\u0163ia Java Servlet 4.0. \ +Pute\u0163i \u00eempacheta servleturile \u00een fi\u015fiere WAR sau EAR conform specifica\u0163iei Java EE. \ +Dac\u0103 este necesar\u0103 securitatea servletului, ar trebui de asemenea s\u0103 configura\u0163i o caracteristic\u0103 appSecurity. \ +F\u0103r\u0103 o caracteristic\u0103 de securitate, constr\u00e2ngerile de securitate pentru aplica\u0163ie sunt ignorate. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ru.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ru.properties new file mode 100644 index 00000000000..7f5f0af4138 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_ru.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=\u042d\u0442\u043e\u0442 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u0435\u0442 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0443 \u0441\u0435\u0440\u0432\u043b\u0435\u0442\u043e\u0432 HTTP, \u043d\u0430\u043f\u0438\u0441\u0430\u043d\u043d\u044b\u0445 \u0432 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0438 \u0441\u043e \u0441\u043f\u0435\u0446\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0435\u0439 Java Servlet 4.0. \ +\u0421\u0435\u0440\u0432\u043b\u0435\u0442\u044b \u043c\u043e\u0436\u043d\u043e \u0443\u043f\u0430\u043a\u043e\u0432\u044b\u0432\u0430\u0442\u044c \u0432 \u0444\u0430\u0439\u043b\u044b WAR \u0438\u043b\u0438 EAR, \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0435 \u0432 Java EE. \ +\u0415\u0441\u043b\u0438 \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0437\u0430\u0449\u0438\u0442\u0430 \u0441\u0435\u0440\u0432\u043b\u0435\u0442\u0430, \u0442\u043e \u0441\u043b\u0435\u0434\u0443\u0435\u0442 \u0442\u0430\u043a\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 appSecurity. \ +\u0411\u0435\u0437 \u044d\u0442\u043e\u0433\u043e \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0432\u0441\u0435 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f \u0437\u0430\u0449\u0438\u0442\u044b \u0434\u043b\u044f \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0431\u0443\u0434\u0443\u0442 \u043f\u0440\u043e\u0438\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u044b. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_zh.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_zh.properties new file mode 100644 index 00000000000..77d2a19d917 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_zh.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=\u6b64\u529f\u80fd\u90e8\u4ef6\u542f\u7528\u5bf9\u5df2\u5199\u5165 Java Servlet 4.0 \u89c4\u8303\u7684 HTTP servlet \u7684\u652f\u6301\u3002\ +\u53ef\u5c06\u8fd9\u4e9b servlet \u6253\u5305\u5230 Java EE \u6307\u5b9a\u7684 WAR \u6216 EAR \u6587\u4ef6\u4e2d\u3002\ +\u5982\u679c\u9700\u8981 servlet \u5b89\u5168\u6027\uff0c\u90a3\u4e48\u8fd8\u5e94\u914d\u7f6e appSecurity \u529f\u80fd\u90e8\u4ef6\u3002\ +\u5982\u679c\u6ca1\u6709\u5b89\u5168\u6027\u529f\u80fd\u90e8\u4ef6\uff0c\u90a3\u4e48\u8be5\u5e94\u7528\u7a0b\u5e8f\u7684\u6240\u6709\u5b89\u5168\u6027\u7ea6\u675f\u5c06\u88ab\u5ffd\u7565\u3002 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_zh_TW.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_zh_TW.properties new file mode 100644 index 00000000000..e590d50bc7d --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/servlet-5.0/resources/l10n/com.ibm.websphere.appserver.servlet-5.0_zh_TW.properties @@ -0,0 +1,20 @@ +############################################################################### +# Copyright (c) 2014 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 +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=\u9019\u9805\u7279\u6027\u652f\u63f4\u5c07 HTTP Servlet \u5beb\u5165\u81f3 Java Servlet 4.0 \u898f\u683c\u3002\ +\u60a8\u53ef\u4ee5\u5c07 Servlet \u5305\u88dd\u5728 Java EE \u6307\u5b9a\u7684 WAR \u6216 EAR \u6a94\u4e2d\u3002\ +\u5982\u679c\u9700\u8981 Servlet \u5b89\u5168\uff0c\u4e5f\u61c9\u8a72\u914d\u7f6e appSecurity \u7279\u6027\u3002\ +\u5982\u679c\u6c92\u6709\u5b89\u5168\u7279\u6027\uff0c\u6703\u5ffd\u7565\u61c9\u7528\u7a0b\u5f0f\u7684\u4efb\u4f55\u5b89\u5168\u9650\u5236\u3002 diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/.classpath b/dev/com.ibm.websphere.jakarta.servlet.5.0/.classpath new file mode 100644 index 00000000000..bd52baaf243 --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/.gitignore b/dev/com.ibm.websphere.jakarta.servlet.5.0/.gitignore new file mode 100644 index 00000000000..57b341172a1 --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/.gitignore @@ -0,0 +1,2 @@ +/bin/ +/generated/ diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/.project b/dev/com.ibm.websphere.jakarta.servlet.5.0/.project new file mode 100644 index 00000000000..abb062dcc3e --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/.project @@ -0,0 +1,23 @@ + + + com.ibm.websphere.javaee.servlet.5.0 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + bndtools.core.bndbuilder + + + + + + org.eclipse.jdt.core.javanature + bndtools.core.bndnature + + diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/bndtools.core.prefs b/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/bndtools.core.prefs new file mode 100644 index 00000000000..789fa99991a --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/bndtools.core.prefs @@ -0,0 +1,2 @@ +compileErrorAction=build +eclipse.preferences.version=1 diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.core.resources.prefs b/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..169aea7eabe --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Wed Aug 17 16:19:12 BST 2011 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.jdt.core.prefs b/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..8b5f03a1476 --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,288 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.codeComplete.argumentPrefixes= +org.eclipse.jdt.core.codeComplete.argumentSuffixes= +org.eclipse.jdt.core.codeComplete.fieldPrefixes= +org.eclipse.jdt.core.codeComplete.fieldSuffixes= +org.eclipse.jdt.core.codeComplete.localPrefixes= +org.eclipse.jdt.core.codeComplete.localSuffixes= +org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=2 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=2 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=18 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=2 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=18 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=4 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=false +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=180 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=4 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=4 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=8 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=180 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.jdt.ui.prefs b/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000000..699cd79321a --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,116 @@ +#Ant properties +#Automatically generated by the ant prepare.settings.files task +cleanup.remove_trailing_whitespaces=true +cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.add_missing_nls_tags=false +org.eclipse.jdt.ui.staticondemandthreshold=99 +cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_blocks=false +sp_cleanup.make_private_fields_final=true +org.eclipse.jdt.ui.ignorelowercasenames=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.remove_private_constructors=true +sp_cleanup.never_use_parentheses_in_expressions=true +cleanup.remove_unnecessary_casts=true +sp_cleanup.organize_imports=true +sp_cleanup.never_use_blocks=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.remove_unused_private_fields=true +org.eclipse.jdt.ui.text.custom_code_templates= +cleanup.always_use_parentheses_in_expressions=false +cleanup.use_parentheses_in_expressions=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.always_use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.correct_indentation=true +cleanup.make_private_fields_final=false +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.correct_indentation=false +cleanup.qualify_static_member_accesses_with_declaring_class=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +org.eclipse.jdt.ui.ondemandthreshold=99 +sp_cleanup.sort_members_all=false +sp_cleanup.use_this_for_non_static_field_access=false +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +org.eclipse.jdt.ui.exception.name=e +sp_cleanup.format_source_code=true +org.eclipse.jdt.ui.javadoc=true +cleanup.format_source_code=false +cleanup.remove_unused_imports=true +cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.remove_unused_private_methods=true +cleanup.add_missing_annotations=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_private_methods=true +cleanup.always_use_this_for_non_static_method_access=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.sort_members=false +sp_cleanup.use_parentheses_in_expressions=false +cleanup.add_missing_override_annotations=true +org.eclipse.jdt.ui.gettersetter.use.is=false +cleanup.convert_to_enhanced_for_loop=false +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +org.eclipse.jdt.ui.overrideannotation=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.add_missing_annotations=true +cleanup.make_variable_declarations_final=false +cleanup.remove_unused_private_types=true +cleanup.use_blocks=true +cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.remove_unused_imports=true +cleanup.add_missing_deprecated_annotations=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.make_variable_declarations_final=true +sp_cleanup.convert_to_enhanced_for_loop=false +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.sort_members=false +sp_cleanup.remove_unused_private_members=false +org.eclipse.jdt.ui.importorder=java;javax;org;com; +cleanup.remove_unused_private_members=false +sp_cleanup.format_source_code_changes_only=false +cleanup.never_use_blocks=false +cleanup.organize_imports=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_generated_serial_version_id=false +cleanup.make_parameters_final=true +org.eclipse.jdt.ui.keywordthis=false +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.always_use_blocks=true +cleanup.add_serial_version_id=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.always_use_blocks=true +cleanup.remove_unused_local_variables=false +cleanup.sort_members_all=false +sp_cleanup.remove_trailing_whitespaces=true +cleanup.format_source_code_changes_only=false +cleanup.add_generated_serial_version_id=true +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.remove_private_constructors=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_local_variable_final=false +cleanup.make_local_variable_final=false +sp_cleanup.add_serial_version_id=false +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.add_default_serial_version_id=false +cleanup.add_missing_methods=false +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.add_missing_methods=false diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/bnd.bnd b/dev/com.ibm.websphere.jakarta.servlet.5.0/bnd.bnd new file mode 100644 index 00000000000..bddeaa8e7df --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/bnd.bnd @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2020 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 + *******************************************************************************/ + +-include= ~../cnf/resources/bnd/bundle.props +bVersion=1.0 + +javac.source: 1.8 +javac.target: 1.8 + +Bundle-SymbolicName: com.ibm.websphere.jakarta.servlet.5.0; singleton:=true + +Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.8))" + + +Export-Package: \ + jakarta.servlet;uses:="jakarta.servlet.annotation,jakarta.servlet.descriptor";version="5.0.0",\ + jakarta.servlet.annotation;uses:="jakarta.servlet";version="5.0.0",\ + jakarta.servlet.descriptor;version="5.0.0",\ + jakarta.servlet.http;uses:="jakarta.servlet";version="5.0.0",\ + jakarta.servlet.resources;thread-context=true;version="5.0.0" + +instrument.disabled: true + +publish.wlp.jar.suffix: dev/api/spec + +-buildpath: \ + jakarta.servlet:jakarta.servlet-api;version=5.0.0 \ No newline at end of file diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/XMLSchema.dtd b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/XMLSchema.dtd new file mode 100644 index 00000000000..7cd3eb02300 --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/XMLSchema.dtd @@ -0,0 +1,402 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%xs-datatypes; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/datatypes.dtd b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/datatypes.dtd new file mode 100644 index 00000000000..4366a94f8ed --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/datatypes.dtd @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_1_4.xsd b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_1_4.xsd new file mode 100644 index 00000000000..6852f0f865f --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_1_4.xsd @@ -0,0 +1,392 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_web_services_1_1.xsd b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_web_services_1_1.xsd new file mode 100644 index 00000000000..f88d4bc62da --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_web_services_1_1.xsd @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_web_services_client_1_1.xsd b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_web_services_client_1_1.xsd new file mode 100644 index 00000000000..17a9c5fc036 --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/j2ee_web_services_client_1_1.xsd @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_2.dtd b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_2.dtd new file mode 100644 index 00000000000..6e811184ab2 --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_2.dtd @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_3.dtd b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_3.dtd new file mode 100644 index 00000000000..4a4df7e44b1 --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_3.dtd @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_4.xsd b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_4.xsd new file mode 100644 index 00000000000..ff9a731c998 --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_4.xsd @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_5.xsd b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_5.xsd new file mode 100644 index 00000000000..616bdcf9df7 --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/web-app_2_5.xsd @@ -0,0 +1,470 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/xml.xsd b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/xml.xsd new file mode 100644 index 00000000000..ac4b0ec8e6c --- /dev/null +++ b/dev/com.ibm.websphere.jakarta.servlet.5.0/src/jakarta/servlet/resources/xml.xsd @@ -0,0 +1,117 @@ + + + + + + + See http://www.w3.org/XML/1998/namespace.html and + http://www.w3.org/TR/REC-xml for information about this namespace. + + This schema document describes the XML namespace, in a form + suitable for import by other schema documents. + + Note that local names in this namespace are intended to be defined + only by the World Wide Web Consortium or its subgroups. The + following names are currently defined in this namespace and should + not be used with conflicting semantics by any Working Group, + specification, or document instance: + + base (as an attribute name): denotes an attribute whose value + provides a URI to be used as the base for interpreting any + relative URIs in the scope of the element on which it + appears; its value is inherited. This name is reserved + by virtue of its definition in the XML Base specification. + + lang (as an attribute name): denotes an attribute whose value + is a language code for the natural language of the content of + any element; its value is inherited. This name is reserved + by virtue of its definition in the XML specification. + + space (as an attribute name): denotes an attribute whose + value is a keyword indicating what whitespace processing + discipline is intended for the content of the element; its + value is inherited. This name is reserved by virtue of its + definition in the XML specification. + + Father (in any context at all): denotes Jon Bosak, the chair of + the original XML Working Group. This name is reserved by + the following decision of the W3C XML Plenary and + XML Coordination groups: + + In appreciation for his vision, leadership and dedication + the W3C XML Plenary on this 10th day of February, 2000 + reserves for Jon Bosak in perpetuity the XML name + xml:Father + + + + + This schema defines attributes and an attribute group + suitable for use by + schemas wishing to allow xml:base, xml:lang or xml:space attributes + on elements they define. + + To enable this, such a schema must import this schema + for the XML namespace, e.g. as follows: + <schema . . .> + . . . + <import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="http://www.w3.org/2001/03/xml.xsd"/> + + Subsequently, qualified reference to any of the attributes + or the group defined below will have the desired effect, e.g. + + <type . . .> + . . . + <attributeGroup ref="xml:specialAttrs"/> + + will define a type which will schema-validate an instance + element with any of those attributes + + + + In keeping with the XML Schema WG's standard versioning + policy, this schema document will persist at + http://www.w3.org/2001/03/xml.xsd. + At the date of issue it can also be found at + http://www.w3.org/2001/xml.xsd. + The schema document at that URI may however change in the future, + in order to remain compatible with the latest version of XML Schema + itself. In other words, if the XML Schema namespace changes, the version + of this document at + http://www.w3.org/2001/xml.xsd will change + accordingly; the version at + http://www.w3.org/2001/03/xml.xsd will not change. + + + + + + In due course, we should install the relevant ISO 2- and 3-letter + codes as the enumerated possible values . . . + + + + + + + + + + + + + + + See http://www.w3.org/TR/xmlbase/ for + information about this attribute. + + + + + + + + + + diff --git a/dev/com.ibm.ws.org.apache.commons.fileupload/bnd.bnd b/dev/com.ibm.ws.org.apache.commons.fileupload/bnd.bnd index 8c15aa15247..c5936be2451 100644 --- a/dev/com.ibm.ws.org.apache.commons.fileupload/bnd.bnd +++ b/dev/com.ibm.ws.org.apache.commons.fileupload/bnd.bnd @@ -14,6 +14,8 @@ instrument.disabled: true +jakartaeeMe: true + -buildpath: \ commons-fileupload:commons-fileupload;strategy=exact;version=1.3.3,\ com.ibm.websphere.javaee.servlet.3.0;version=latest diff --git a/dev/com.ibm.ws.session/bnd.bnd b/dev/com.ibm.ws.session/bnd.bnd index dcc54f51e46..faca4e911cc 100644 --- a/dev/com.ibm.ws.session/bnd.bnd +++ b/dev/com.ibm.ws.session/bnd.bnd @@ -58,6 +58,8 @@ Include-Resource: \ -dsannotations: \ com.ibm.ws.session.SessionManagerMBeanImpl +jakartaeeMe: true + instrument.disabled: true -buildpath: \ diff --git a/dev/com.ibm.ws.webcontainer.cors/bnd.bnd b/dev/com.ibm.ws.webcontainer.cors/bnd.bnd index d90a2609f3d..95db4ed82cd 100644 --- a/dev/com.ibm.ws.webcontainer.cors/bnd.bnd +++ b/dev/com.ibm.ws.webcontainer.cors/bnd.bnd @@ -39,6 +39,8 @@ Include-Resource: \ instrument.classesExcludes: com/ibm/ws/webcontainer/cors/internal/resources/*.class +jakartaeeMe: true + -buildpath: \ com.ibm.websphere.javaee.servlet.3.0;version=latest,\ com.ibm.ws.logging.core,\ diff --git a/dev/com.ibm.ws.webcontainer.servlet.3.1/bnd.bnd b/dev/com.ibm.ws.webcontainer.servlet.3.1/bnd.bnd index a86582c42a4..bb1b1e5424e 100644 --- a/dev/com.ibm.ws.webcontainer.servlet.3.1/bnd.bnd +++ b/dev/com.ibm.ws.webcontainer.servlet.3.1/bnd.bnd @@ -91,6 +91,8 @@ DynamicImport-Package: com.ibm.websphere.monitor.meters;version="1.0.0", \ instrument.disabled: true +jakartaeeMe: true + -buildpath: \ com.ibm.ws.webcontainer;version=latest,\ com.ibm.websphere.javaee.servlet.3.1;version=latest,\ diff --git a/dev/com.ibm.ws.webcontainer.servlet.4.0.factories/bnd.bnd b/dev/com.ibm.ws.webcontainer.servlet.4.0.factories/bnd.bnd index 3ad29bdf945..b6129a4ecf7 100644 --- a/dev/com.ibm.ws.webcontainer.servlet.4.0.factories/bnd.bnd +++ b/dev/com.ibm.ws.webcontainer.servlet.4.0.factories/bnd.bnd @@ -57,6 +57,8 @@ Import-Package: \ * +jakartaeeMe: true + -buildpath: \ com.ibm.ws.webcontainer.servlet.3.1;version=latest,\ com.ibm.ws.webcontainer;version=latest,\ diff --git a/dev/com.ibm.ws.webcontainer.servlet.4.0/bnd.bnd b/dev/com.ibm.ws.webcontainer.servlet.4.0/bnd.bnd index 517d08291e7..a1613583145 100644 --- a/dev/com.ibm.ws.webcontainer.servlet.4.0/bnd.bnd +++ b/dev/com.ibm.ws.webcontainer.servlet.4.0/bnd.bnd @@ -42,6 +42,8 @@ Import-Package: \ instrument.disabled: true + jakartaeeMe: true + -buildpath: \ com.ibm.ws.webcontainer.servlet.3.1;version=latest,\ com.ibm.websphere.javaee.servlet.4.0;version=latest,\ diff --git a/dev/com.ibm.ws.webcontainer/bnd.bnd b/dev/com.ibm.ws.webcontainer/bnd.bnd index 1ebe796820e..2c716476661 100644 --- a/dev/com.ibm.ws.webcontainer/bnd.bnd +++ b/dev/com.ibm.ws.webcontainer/bnd.bnd @@ -160,6 +160,8 @@ IBM-Default-Config: OSGI-INF/wlp/defaultInstances.xml instrument.disabled: true +jakartaeeMe: true + -buildpath: \ com.ibm.ws.kernel.service,\ com.ibm.ws.threading,\ diff --git a/dev/com.ibm.ws.webserver.plugin.runtime/bnd.bnd b/dev/com.ibm.ws.webserver.plugin.runtime/bnd.bnd index 5a92d2ba2aa..aac3c815875 100644 --- a/dev/com.ibm.ws.webserver.plugin.runtime/bnd.bnd +++ b/dev/com.ibm.ws.webserver.plugin.runtime/bnd.bnd @@ -29,6 +29,8 @@ Private-Package: com.ibm.ws.plugin.runtime.resources instrument.classesExcludes: com/ibm/ws/plugin/runtime/resources/*.class +jakartaeeMe: true + -buildpath: \ com.ibm.websphere.appserver.spi.logging;version=latest,\ com.ibm.wsspi.org.osgi.service.component.annotations;version=latest,\ diff --git a/dev/wlp-gradle/bndSettings.gradle b/dev/wlp-gradle/bndSettings.gradle index ad2973ab209..17e53158e45 100644 --- a/dev/wlp-gradle/bndSettings.gradle +++ b/dev/wlp-gradle/bndSettings.gradle @@ -168,6 +168,7 @@ if (addAll) { projectNames.add('build.image') projectNames.add('wlp-bndPlugins') projectNames.add('wlp-rasInstrumentation') +projectNames.add('wlp-jakartaee-transform') // Add each project and its dependencies to the graph projectNames.each { projectName -> diff --git a/dev/wlp-gradle/subprojects/assemble.gradle b/dev/wlp-gradle/subprojects/assemble.gradle index 4388adad715..2ee068753b7 100644 --- a/dev/wlp-gradle/subprojects/assemble.gradle +++ b/dev/wlp-gradle/subprojects/assemble.gradle @@ -18,6 +18,7 @@ */ task publishWLPJars(type: Copy) { dependsOn jar + dependsOn jakartaeeTransform def publishWlpJarDefault = parseBoolean(bnd('test.project', 'false')) ? 'true' : 'false' enabled bnd('publish.tool.jar', '').empty && !parseBoolean(bnd('publish.wlp.jar.disabled', publishWlpJarDefault)) from project.buildDir diff --git a/dev/wlp-gradle/subprojects/tasks.gradle b/dev/wlp-gradle/subprojects/tasks.gradle index 32fd9489f38..3f246a13efa 100644 --- a/dev/wlp-gradle/subprojects/tasks.gradle +++ b/dev/wlp-gradle/subprojects/tasks.gradle @@ -141,6 +141,48 @@ sourceSets { } } +configurations { + jakartaeeTransformJars +} + +dependencies { + jakartaeeTransformJars 'biz.aQute.bnd:biz.aQute.bndlib:4.3.1', + 'commons-cli:commons-cli:1.4', + 'org.slf4j:slf4j-simple:1.7.29', + 'org.slf4j:slf4j-api:1.7.26', + 'com.ibm.ws:jakartaee-transformer:0.0.2' + } + + + +task jakartaeeTransform { + mustRunAfter project.tasks.jar + if (parseBoolean(bnd('jakartaeeMe', 'true'))) { + doLast { + FileTree bundles = fileTree(project.buildDir).matching { + include '**/*.jar' } + bundles.each { bundleJar -> + javaexec { + classpath configurations.jakartaeeTransformJars + main = "com.ibm.ws.jakarta.transformer.JakartaTransformer" + args = [ project.buildDir.path + '/' + bundleJar.name, + (project.buildDir.path + '/' + bundleJar.name).replaceAll('.jar',".jakarta.jar"), + "-tr", + bndWorkspace.getProject('wlp-jakartaee-transform').getFile('rules/jakarta-renames.properties').path, + "-ts", + bndWorkspace.getProject('wlp-jakartaee-transform').getFile('rules/jakarta-selections.properties').path, + "-tv", + bndWorkspace.getProject('wlp-jakartaee-transform').getFile('rules/jakarta-versions.properties').path, + "-tb", + bndWorkspace.getProject('wlp-jakartaee-transform').getFile('rules/jakarta-bundles.properties').path] + } + } + } + } +} + +assemble.dependsOn(jakartaeeTransform) + compileJava { if (!parseBoolean(bnd('instrument.disabled', 'false'))) { inputs.files { rasInstrumentationInputFiles() } diff --git a/dev/wlp-jakartaee-transform/bnd.bnd b/dev/wlp-jakartaee-transform/bnd.bnd index f3a416da700..b4503007f34 100755 --- a/dev/wlp-jakartaee-transform/bnd.bnd +++ b/dev/wlp-jakartaee-transform/bnd.bnd @@ -12,17 +12,18 @@ -include= ~../cnf/resources/bnd/bundle.props bVersion=1.0 +-include= jar:${fileuri;${repo;com.ibm.ws:jakartaee-transformer;0.0.1}}!/META-INF/MANIFEST.MF + +-includeresource: \ + @${repo;com.ibm.ws:jakartaee-transformer;0.0.2}!/!META-INF/maven/* + Main-Class: com.ibm.ws.jakarta.transformer.JakartaTransformer Bundle-Name: Liberty Jakartaee Transformer Bundle-SymbolicName: wlp-jakartaeeTransformer Bundle-Description: Unshipped bundle that houses jakartaaee transformer for use during build -Private-Package: \ - com.ibm.ws.jakarta.transformer.* - --plugin.build.bnd.plugins: --pluginpath: +Export-Package: com.ibm.ws.jakarta.transformer.*;version="1.0" globalize: false @@ -35,4 +36,7 @@ tool.project: true generate.replacement: false -buildpath: \ - com.ibm.ws:jakartaee-transformer;strategy=exact;version=0.0.1 + com.ibm.ws:jakartaee-transformer;strategy=exact;version=0.0.2,\ + biz.aQute.bnd:biz.aQute.bndlib;version=4.3.1,\ + commons-cli:commons-cli;version=1.4,\ + org.slf4j:slf4j-simple;version=1.7.29 diff --git a/dev/wlp-jakartaee-transform/rules/jakarta-bundles.properties b/dev/wlp-jakartaee-transform/rules/jakarta-bundles.properties new file mode 100755 index 00000000000..5eb8ae18672 --- /dev/null +++ b/dev/wlp-jakartaee-transform/rules/jakarta-bundles.properties @@ -0,0 +1 @@ +*=*.jakarta,2.0,+" Jakarta",+"; Jarkata Enabled" \ No newline at end of file diff --git a/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties b/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties new file mode 100755 index 00000000000..d4048fa8f57 --- /dev/null +++ b/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties @@ -0,0 +1,6 @@ +javax.inject=jakarta.inject +javax.servlet=jakarta.servlet +javax.servlet.annotation=jakarta.servlet.annotation +javax.servlet.descriptor=jakarta.servlet.descriptor +javax.servlet.http=jakarta.servlet.http +javax.servlet.resources=jakarta.servlet.resources \ No newline at end of file diff --git a/dev/wlp-jakartaee-transform/rules/jakarta-selections.properties b/dev/wlp-jakartaee-transform/rules/jakarta-selections.properties new file mode 100755 index 00000000000..c46ae64b225 --- /dev/null +++ b/dev/wlp-jakartaee-transform/rules/jakarta-selections.properties @@ -0,0 +1,3 @@ +*.mf +*.MF +*.class \ No newline at end of file diff --git a/dev/wlp-jakartaee-transform/rules/jakarta-versions.properties b/dev/wlp-jakartaee-transform/rules/jakarta-versions.properties new file mode 100755 index 00000000000..95e4be023a3 --- /dev/null +++ b/dev/wlp-jakartaee-transform/rules/jakarta-versions.properties @@ -0,0 +1,5 @@ +jakarta.servlet=[2.4,5.0] +jakarta.servlet.annotation=[2.4,5.0] +jakarta.servlet.descriptor=[2.4,5.0] +jakarta.servlet.http=[2.4,5.0] +jakarta.servlet.resources=[2.4,5.0]