diff --git a/upload-lib/src/fat/java/com/ibm/ws/massive/esa/MassiveEsaTest.java b/upload-lib/src/fat/java/com/ibm/ws/massive/esa/MassiveEsaTest.java index 8f2d95e..1d82ce0 100644 --- a/upload-lib/src/fat/java/com/ibm/ws/massive/esa/MassiveEsaTest.java +++ b/upload-lib/src/fat/java/com/ibm/ws/massive/esa/MassiveEsaTest.java @@ -47,6 +47,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -1231,6 +1232,38 @@ public void testNoSupersedesOrSuperseded() throws RepositoryException { } + @Test + public void testTolerates() throws RepositoryException { + /** + * For reference this is a copy of the subsytem content for this asset Subsystem-Content: + * com.ibm.websphere.appserver.javax.servlet-3.0; ibm.tolerates:="3.1,4.0"; apiJar=false; + * type="osgi.subsystem.feature", com.ibm.websphere.appserver.classloading-1.0; + * type="osgi.subsystem.feature", com.ibm.websphere.appserver.ltpa-1.0; + * type="osgi.subsystem.feature", com.ibm.ws.security.authentication; version="[1.0.0,1.0.200)", + * com.ibm.ws.security.credentials.wscred; version="[1.0.0,1.0.200)", com.ibm.websphere.security; + * version="[1.1.0,1.1.200)", com.ibm.ws.security.jaas.common; version="[1.0.0,1.0.200)", + * com.ibm.ws.security.authentication.builtin; version="[1.0.0,1.0.200)", + * com.ibm.ws.security.mp.jwt.proxy; version="[1.0.0,1.0.200)" + */ + File toleratesEsa = new File(esaDir, "com.ibm.websphere.appserver.builtInAuthentication-1.0.esa"); + EsaResourceImpl resource = (EsaResourceImpl) uploadAsset(toleratesEsa); + Map> toleratesInfo = resource.getRequireFeatureWithTolerates(); + for (Entry> entry : toleratesInfo.entrySet()) { + switch (entry.getKey()) { + // The servlet feature prefers 3.0 but will tolerate 3.1 and 4.0 + case "com.ibm.websphere.appserver.javax.servlet-3.0": + assertEquals("There should be 2 tolerates entries for servlet dependancy", 2, entry.getValue().size()); + for (String s : entry.getValue()) { + assertTrue("Tolerates should be either 3.1 or 4.0", (s.equals("3.1") || s.equals("4.0"))); + } + break; + default: + // No other features have tolerates info in them + assertTrue("The tolerates entries for " + entry.getKey() + " should be empty but wasn't", entry.getValue().isEmpty()); + } + } + } + private void assertLinkEquals(String expectedLabel, String expectedLinkLabelPrefix, String expectedLinkLabelSuffix, @@ -1374,7 +1407,7 @@ public void testExtendedPackage() throws Throwable { /** * Based on a small set of features make searches to see whether the correct results match each * query - * + * * @throws Throwable */ public void testSimpleFinds() throws Throwable { diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/assetInfo.properties b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/assetInfo.properties new file mode 100644 index 0000000..9af88ee --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/assetInfo.properties @@ -0,0 +1,3 @@ +#Thu Mar 20 11:26:09 GMT 2014 +licenseType=UNSPECIFIED +longDescription=test diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/cs.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/cs.html new file mode 100644 index 0000000..259ffc0 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/cs.html @@ -0,0 +1,24 @@ + + + +Additional Terms + + +Dodatečné podmínky týkající se funkcí:
+
+Klepnutím na tlačítko "Souhlasím" vyjadřujete svůj souhlas +s tím, že se na programový kód, vzory, aktualizace, opravy a +související licencované materiály, jako jsou například klíče a +dokumentace ("Kód"), které zamýšlíte stáhnout, vztahují podmínky +licenční smlouvy, s níž jste vyjádřili souhlas při zakoupení +Programu, pro nějž jste Kód získali. Dále souhlasíte s tím, že Kód +budete instalovat nebo užívat výhradně jako součást Programu, pro +který máte platnou smlouvu nebo dokument o oprávnění (Proof of +Entitlement). Výrazy "Program" a "dokument o oprávnění (Proof of +Entitlement)" mají stejný význam jako v Mezinárodní licenční smlouvě IBM +pro Programy (IPLA). Smlouva IPLA je uvedena na adrese http: +//www.ibm.com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/de.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/de.html new file mode 100644 index 0000000..9417175 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/de.html @@ -0,0 +1,25 @@ + + + +Additional Terms + + +Zusätzliche Bedingungen für Features
+
+Durch Klicken auf "Anerkennen" erklären Sie sich damit +einverstanden, dass der Programmcode sowie die Beispiele, Updates, Fixes +und die zugehörigen lizenzierten Materialien wie z. B. +Schlüssel und Dokumentation ("Code"), die Sie jetzt herunterladen, +den Bedingungen der Lizenzvereinbarung unterliegen, die Sie +beim Erwerb des Programms akzeptiert haben, für das Sie den Code +herunterladen. Sie erklären sich ferner damit einverstanden, dass Sie den +Code ausschließlich als Teil eines Programms, für das Sie eine +gültige Vereinbarung oder einen gültigen Berechtigungsnachweis +besitzen, installieren oder nutzen werden. Die Begriffe "Programm" +und "Berechtigungsnachweis" haben dieselbe Bedeutung wie in den +Internationalen Nutzungsbedingungen für Programmpakete ("IPLA"). Der IPLA +kann unter http://www.ibm.com/software/sla/ eingesehen werden.
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/el.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/el.html new file mode 100644 index 0000000..d5d8d42 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/el.html @@ -0,0 +1,25 @@ + + + +Additional Terms + + +Όροι και Προϋποθέσεις για Πρόσθετες Λειτουργίες:
+
+Πατώντας το κουμπί "Συμφωνώ", συμφωνείτε ότι ο κώδικας του +προγράμματος, τα δείγματα, οι ενημερώσεις, οι επιδιορθώσεις και τα +σχετικά κατοχυρωμένα με άδεια χρήσης υλικά όπως π.χ. κλειδιά και η +τεκμηρίωση ("Κώδικας") που πρόκειται να μεταφορτώσετε (download) +υπόκεινται στους όρους της σύμβασης άδειας χρήσης που αποδεχθήκατε +όταν αποκτήσατε το Πρόγραμμα για το οποίο αποκτάτε τον Κώδικα. +Συμφωνείτε επίσης ότι θα εγκαθιστάτε και θα χρησιμοποιείτε τον Κώδικα +μόνο ως τμήμα ενός Προγράμματος για το οποίο διαθέτετε έγκυρη +σύμβαση ή Απόδειξη Δικαιώματος. Οι όροι "Πρόγραμμα" και "Απόδειξη +Δικαιώματος" έχουν την ίδια σημασία που έχουν στη Διεθνή Σύμβαση Άδειας +Χρήσης Προγράμματος της IBM (IBM International Program License +Agreement - "Σύμβαση IPLA"). Η Σύμβαση IPLA είναι διαθέσιμη για +αναφορά στην ιστοσελίδα http://www.ibm.com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/en.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/en.html new file mode 100644 index 0000000..697bcb8 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/en.html @@ -0,0 +1,23 @@ + + + +Additional Terms + + +Additional Features Terms & Conditions:
+
+By clicking on the "I agree" button , you agree that the +program code, samples, updates, fixes and related licensed +materials such as keys and documentation ("Code") that you are about +to download are subject to the terms of the license agreement +that you accepted when you acquired the Program for which you +are obtaining the Code. You further agree that you will install +or use the Code solely as part of a Program for which you have +a valid agreement or Proof of Entitlement. The terms +"Program" and "Proof of Entitlement" have the same meaning as in the +IBM International Program License Agreement ("IPLA"). The IPLA +is available for reference at http://www.ibm.com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/es.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/es.html new file mode 100644 index 0000000..81be0ec --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/es.html @@ -0,0 +1,25 @@ + + + +Additional Terms + + +
+Términos y condiciones de las funciones adicionales
+
+Al pulsar el botón "I agree", el Licenciatario acepta que +el código del programa, muestras, actualizaciones, +correcciones y materiales relacionados, sujetos a licencia, tales como +claves o documentación ("Código") que está a punto de descargar se +sometan a los términos del acuerdo de licencia que el Licenciatario +aceptara cuando adquirió el Programa para el que obtiene el Código. +El Licenciatario también acepta instalar o utilizar el Código +únicamente como parte de un Programa para el cual haya adquirido un +Documento de Titularidad válido. Los términos "Programa" y "Documento +de Titularidad" tienen el mismo significado que en el Acuerdo +Internacional de Programas bajo Licencia de IBM ("IPLA"). El IPLA se +puede consultar en http://www.ibm.com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/fr.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/fr.html new file mode 100644 index 0000000..5b47852 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/fr.html @@ -0,0 +1,28 @@ + + + +Additional Terms + + +Dispositions relatives aux fonctionnalités supplémentaires :
+
+En cliquant sur le bouton "J'accepte", Vous reconnaissez +que le code programme, les exemples, les mises à jour, les +correctifs et les éléments associés sous licence tels que les clés et +la documentation (le "Code") que Vous êtes sur le point de +télécharger sont soumis aux dispositions du Contrat de Licence que Vous +avez accepté lorsque Vous avez acquis le Logiciel pour lequel +Vous avez obtenu le Code. Vous vous engagez en outre à installer +ou à utiliser le Code uniquement dans le cadre de +l'utilisation du Logiciel pour lequel Vous possédez un Contrat de Licence +ou une Autorisation d'Utilisation du Logiciel acquis en toute +légalité. Les termes "Logiciel" et "Autorisation d'Utilisation du +Logiciel" possèdent les mêmes significations que celles figurant dans +les Conditions Internationales d'Utilisation de Logiciels IBM +("IPLA"). Les Conditions Internationales d'Utilisation de Logiciels +sont disponibles pour référence à l'adresse http://www.ibm. +com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/in.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/in.html new file mode 100644 index 0000000..513f865 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/in.html @@ -0,0 +1,24 @@ + + + +Additional Terms + + +Syarat & Ketentuan Fitur Tambahan:
+
+Dengan mengeklik tombol "Saya setuju", Anda menyetujui +bahwa kode, sampel, pembaruan, perbaikan dan materi yang +dilisensikan yang terdapat pada program seperti kode dan dokumentasi +("Kode") yang akan Anda unduh tunduk pada syarat-syarat perjanjian +lisensi yang Anda terima ketika Anda memperoleh Program yang +untuknya Anda mendapatkan Kode. Anda selanjutnya menyetujui bahwa +Anda akan menginstal atau menggunakan Kode semata-mata sebagai +bagian dari Program yang untuknya Anda memiliki perjanjian atau +Bukti Kepemilikan yang valid. Istilah "Program" dan "Bukti +Kepemilikan" memiliki arti yang sama dengan yang ada dalam Perjanjian +Lisensi Program Internasional IBM ("IPLA"). IPLA tersedia sebagai +referensi di http://www.ibm.com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/it.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/it.html new file mode 100644 index 0000000..c5254bc --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/it.html @@ -0,0 +1,24 @@ + + + +Additional Terms + + +Clausole & Condizioni per Funzioni Aggiuntive:
+
+Facendo clic sul pulsante "Accetto", il licenziatario +accetta che il codice programma, gli esempi, gli aggiornamenti, le +fix e i materiali correlati concessi in licenza, come chiavi e +documentazione ("Codice") che il licenziatario sta per scaricare, sono +soggetti alle clausole dell'accordo di licenza accettato +all'acquisizione del Programma per cui si sta ottenendo il Codice. Inoltre +il licenziatario accetta di installare o utilizzare il Codice +solo come parte di un Programma per cui possiede un accordo o +Prova di Titolarità validi. I termini "Programma" e "Prova di +Titolarità" hanno lo stesso significato che nell'IBM International +Program License Agreement ("IPLA"). L'IPLA è disponibile per +riferimento su http://www.ibm.com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/ja.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/ja.html new file mode 100644 index 0000000..2104d7e --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/ja.html @@ -0,0 +1,19 @@ + + + +Additional Terms + + +追加機能の使用条件:
+
+お客様は、「同意します」ボタンをクリックすることで、ダウンロードしようとしているプログラム・コード、サンプル、更新、 +フィックス、およびキーや文書などの関連するライセンス資料 (以下併せて「コード」といいます。) には、お客様が「コード」を取得 +しようとしている「プログラム」を購入した際に同意した使用条件が適用されることに同意するものとします。また、お客様は、有効な +契約またはライセンス証書を有する「プログラム」の一部としてのみ「コード」を導入または使用することに同意するものとします。 +「プログラム」および「ライセンス証書」という用語は、「IBM プログラムのご使用条件」 (以下「IPLA」といいます。) で +のそれらと同じ意味を持ちます。IPLA は、http://www.ibm.com/software/sla/ で参照できま +す。
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/ko.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/ko.html new file mode 100644 index 0000000..be2fcae --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/ko.html @@ -0,0 +1,18 @@ + + + +Additional Terms + + +추가 기능 이용 약관
+
+"동의합니다" 단추를 클릭함으로써, 귀하는 다운로드하고자 하는 프로그램 코드, 샘플, 업데이트, 수정사항 +및 라이센스가 있는 관련 자료(예: 키 및 문서)(이하 "코드")에 해당 코드가 제공되는 본 프로그램 취득 시 +귀하가 승인한 라이센스 계약의 조항이 적용된다는 것에 동의합니다. 귀하는 유효한 계약이나 라이센스 증서를 보유한 +프로그램의 일부로만 코드를 설치하거나 사용할 것에도 동의합니다. "프로그램" 및 "라이센스 증서"의 의미는 IBM +국제 프로그램 라이센스 계약(이하 "IPLA")에서 사용된 의미와 동일하게 사용됩니다. IPLA은 http: +//www.ibm.com/software/sla/에서 참조할 수 있습니다.
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/lt.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/lt.html new file mode 100644 index 0000000..0da76e1 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/lt.html @@ -0,0 +1,23 @@ + + + +Additional Terms + + +Papildomos priemonės sąlygos:
+
+Spustelėję mygtuką „Sutinku“, sutinkate, kad programos +kodui, pavyzdžiams, naujinimams, pataisoms ir susijusiai +licencijuotajai medžiagai, pvz., raktams ir dokumentams („Kodui“), kurį +ruošiatės atsisiųsti, taikomos licencinės sutarties sąlygos, su +kuriomis sutikote įsigiję Programą, kurios Kodą norite gauti. Taip +pat sutinkate, kad Kodą diegsite arba naudosite tik kaip +Programos, kurios galiojančią sutartį arba Teisių suteikimo dokumentą +turite, dalį. Terminai „Programa“ ir „Teisių suteikimo dokumentas“ +reiškia tą patį, ką ir IBM tarptautinės programos licencinė +sutartis (IPLA). IPLA galite peržiūrėti adresu http://www.ibm. +com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/pl.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/pl.html new file mode 100644 index 0000000..9e6ff62 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/pl.html @@ -0,0 +1,24 @@ + + + +Additional Terms + + +Warunki używania dodatkowych funkcji
+
+Kliknięcie przycisku "Zgadzam się" oznacza zgodę na to, że +kod programu, przykłady, aktualizacje, poprawki i powiązane +materiały licencjonowane, takie jak klucze i dokumentacja, (zwane +dalej "Kodem"), które Użytkownik za chwilę pobierze, podlegają +warunkom umowy licencyjnej zaakceptowanej w chwili pozyskania +Programu, do którego pobierany jest Kod. Ponadto Użytkownik +zobowiązuje się zainstalować i używać Kod wyłącznie jako część +Programu, dla którego dysponuje ważną umową lub dokumentem Proof of +Entitlement. Terminy "Program" i "Proof of Entitlement" mają znaczenie +nadane im w Międzynarodowej Umowie Licencyjnej IBM na Program +("Umowa IPLA"). Umowa IPLA jest dostępna do wglądu pod adresem http: +//www.ibm.com/software/sla/.
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/pt.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/pt.html new file mode 100644 index 0000000..389760d --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/pt.html @@ -0,0 +1,25 @@ + + + +Additional Terms + + +Condições dos Termos de Funcionalidades Adicionais:
+
+Ao clicar no botão "Concordo", o Cliente concorda que o +código, as amostras, atualizações/actualizações, correções e +materiais licenciados relacionados do programa, como chaves e +documentação ("Código") que o Cliente está prestes a transferir por +download, estão sujeitos aos termos do contrato de licença/acordo de +licenciamento que o Cliente aceitou ao adquirir o Programa para o qual o +Cliente está obtendo o Código. O Cliente concorda também que +instalará ou usará o Código somente como parte de um Programa para o +qual o Cliente possui um contrato/acordo válido ou uma Prova de +Titularidade. Os termos "Programa" e "Prova de Titularidade" possuem o +mesmo significado que o visto no Contrato Internacional de +Licença de Programas IBM ("IPLA"). O IPLA está disponível para +referência em http://www.ibm.com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/ru.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/ru.html new file mode 100644 index 0000000..7b9cbac --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/ru.html @@ -0,0 +1,25 @@ + + + +Additional Terms + + +Положения и Условия, относящиеся к дополнительным функциям
+
+Нажимая кнопку "Согласен", вы соглашаетесь с тем, что +программный код, образцы, обновления, исправления и сопутствующие +лицензионные материалы, такие как ключи и документация ("Код"), которые +вы собираетесь загрузить, являются предметом положений +лицензионного соглашения, принятого вами при приобретении Программы, для +которой вы получаете Код. Вы также согласны с тем, что будете +устанавливать или использовать Код только в составе Программы, для +которой у вас есть действительное соглашение или Свидетельство о +Правах. Термины "Программа" и "Свидетельство о Правах" имеют те же +значения, что и в Международном Лицензионном Соглашении IBM в +отношении Программ (IBM International Program License Agreement, +IPLA). Соглашение IPLA доступно для справки по адресу http://www. +ibm.com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/sl.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/sl.html new file mode 100644 index 0000000..ae00d10 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/sl.html @@ -0,0 +1,23 @@ + + + +Additional Terms + + +Določila in pogoji za dodatne funkcije:
+
+Če kliknete gumb "Sprejmem", soglašate, da so programska +koda, vzorci, posodobitve, popravki in druga povezana licencirana +gradiva, kot so ključi in dokumentacija (v nadaljevanju "koda"), ki +jih boste prenesli, predmet določil licenčne pogodbe, ki ste jo +sprejeli, ko ste pridobili program, za katerega prenašate kodo. +Nadalje soglašate, da boste kodo namestili in uporabljali samo kot +del programa, za katerega imate veljavno pogodbo ali dokazilo o +upravičenosti. Izraza "program" in "dokazilo o upravičenosti" imata enak +pomen kot v IBM-ovi mednarodni licenčni pogodbi za program +("IPLA"). IPLA je na voljo za referenco na naslovu http://www.ibm. +com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/tr.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/tr.html new file mode 100644 index 0000000..c863319 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/tr.html @@ -0,0 +1,24 @@ + + + +Additional Terms + + +
+Ek Özelliklere ilişkin Kayıt ve Koşullar:
+
+"Kabul ediyorum" düğmesini tıklatarak, karşıdan yüklemekte +olduğunuz program kodunun, örneklerin, güncellemelerin, düzeltmelerin +ve anahtarlar ve belgeler gibi ilişkili lisanslı malzemelerin +("Kod"), kendisine ilişkin Kodu edindiğiniz Programı aldığınızda +kabul ettiğiniz lisans sözleşmesindeki koşullara tabi olduğunu +kabul edersiniz. Ayrıca, Kodu, yalnızca, kendisine ilişkin +geçerli bir sözleşme ya da Yetki Belgesi edinmiş olduğunuz bir +Programın parçası olarak kurmayı ya da kullanmayı da kabul edersiniz. +"Program" ve "Yetki Belgesi" terimleri, IBM Uluslararası Program +Lisans Sözleşmesindeki ("UPLS") anlamlarıyla kullanılmıştır. UPLS +belgesine http://www.ibm.com/software/sla/ adresinden erişebilirsiniz.
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/zh.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/zh.html new file mode 100644 index 0000000..02aa02b --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/zh.html @@ -0,0 +1,16 @@ + + + +Additional Terms + + +其他功能部件的条款和条件：
+
+单击“我同意”按钮，即表示您同意：您打算下载的程序代码、样本、更新、修订以及密钥和文档之类的相关许可材料（统称“代码”） +遵循您在购买要为其获得代码的程序时所接受的许可协议条款。您还同意，您将“代码”仅作为自己具有有效协议或权利证明的程序的一部 +分进行安装或使用。术语“程序”和“权利证明”在 IBM 国际程序许可协议（“IPLA”）中的含义相同。要了解 IPLA，可 +参阅：http://www.ibm.com/software/sla/
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/zh_TW.html b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/zh_TW.html new file mode 100644 index 0000000..2ddeb91 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa.metadata.zip/lafiles/zh_TW.html @@ -0,0 +1,17 @@ + + + +Additional Terms + + +其他特性條款
+
+一按下「我同意」按鈕，即表示 貴客戶同意： 貴客戶擬將下載之程式碼、範例、更新、修正程式及相關授權著作（例如：金鑰及 +說明文件（「程式碼」）），應受 貴客戶於為取得「程式碼」之本程式時所接受之授權合約之條款拘束。 貴客戶進一步同意， +貴客戶應以 貴客戶所擁有有效合約或權利證明書之本程式之一部分而單獨安裝或使用本程式碼。「程式」及「權利證明書」等名詞與 +IBM 國際程式授權合約 ("IPLA") 中之該等名詞具相同意義。IPLA 提供於 http://www.ibm. +com/software/sla/，以茲參考。
+
+
+ + diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa/OSGI-INF/SUBSYSTEM.MF b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa/OSGI-INF/SUBSYSTEM.MF new file mode 100644 index 0000000..b544ad8 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa/OSGI-INF/SUBSYSTEM.MF @@ -0,0 +1,24 @@ +Created-By: 11.0.2 (Eclipse OpenJ9) +IBM-AppliesTo: io.openliberty;productVersion="20.0.0.4" +IBM-Feature-Version: 2 +IBM-InstallTo: core +IBM-License-Agreement: wlp/lafiles/LA +IBM-ProductID: io.openliberty +Subsystem-Content: com.ibm.websphere.appserver.javax.servlet-3.0; ibm.tolerates:="3.1,4.0"; apiJar=false; type="osgi.subsystem.feature", + com.ibm.websphere.appserver.classloading-1.0; type="osgi.subsystem.feature", + com.ibm.websphere.appserver.ltpa-1.0; type="osgi.subsystem.feature", + com.ibm.ws.security.authentication; version="[1.0.0,1.0.200)", + com.ibm.ws.security.credentials.wscred; version="[1.0.0,1.0.200)", + com.ibm.websphere.security; version="[1.1.0,1.1.200)", + com.ibm.ws.security.jaas.common; version="[1.0.0,1.0.200)", + com.ibm.ws.security.authentication.builtin; version="[1.0.0,1.0.200)", + com.ibm.ws.security.mp.jwt.proxy; version="[1.0.0,1.0.200)" +Subsystem-Description: %description +Subsystem-License: https://www.eclipse.org/legal/epl-v10.html +Subsystem-Localization: OSGI-INF/l10n/com.ibm.websphere.appserver.builtinAuthentication-1.0 +Subsystem-ManifestVersion: 1 +Subsystem-SymbolicName: com.ibm.websphere.appserver.builtinAuthentication-1.0; visibility:=private; singleton:=false +Subsystem-Type: osgi.subsystem.feature +Subsystem-Vendor: IBM Corp. +Subsystem-Version: 1.0.0 +Tool: Bnd-4.3.0.201909301554 diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa/OSGI-INF/checksums.cs b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa/OSGI-INF/checksums.cs new file mode 100644 index 0000000..e2b6181 --- /dev/null +++ b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa/OSGI-INF/checksums.cs @@ -0,0 +1,8 @@ +#Wed Apr 01 19:10:12 BST 2020 +com.ibm.ws.security.jaas.common_1.0.39.jar=e40d01d153431fa0a765086850fa4d01 +com.ibm.ws.security.credentials.wscred_1.0.39.jar=dc2ed662175df8d2fbc5a19dcbb0e4d2 +com.ibm.ws.security.authentication.builtin_1.0.39.jar=3145ffd876d9ffefbf17413339bb85db +OSGI-INF/SUBSYSTEM.MF=a586be295e823d3cbbc0d7eef0ae78b2 +com.ibm.ws.security.authentication_1.0.39.jar=13ed66d444e38049a729f0cf46aef581 +com.ibm.websphere.security_1.1.39.jar=712301a62f3e3a7487f1181a5e54b406 +com.ibm.ws.security.mp.jwt.proxy_1.0.39.jar=81757234b3b3dfaa5df7911b50dbe18e diff --git a/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa/wlp/lafiles/LA_en b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa/wlp/lafiles/LA_en new file mode 100644 index 0000000..47cc6a0 Binary files /dev/null and b/upload-lib/src/fat/testResources/com.ibm.websphere.appserver.builtInAuthentication-1.0.esa/wlp/lafiles/LA_en differ diff --git a/upload-lib/src/main/java/com/ibm/ws/massive/esa/MassiveEsa.java b/upload-lib/src/main/java/com/ibm/ws/massive/esa/MassiveEsa.java index c756dcb..d96b481 100644 --- a/upload-lib/src/main/java/com/ibm/ws/massive/esa/MassiveEsa.java +++ b/upload-lib/src/main/java/com/ibm/ws/massive/esa/MassiveEsa.java @@ -20,7 +20,9 @@ import java.io.IOException; import java.util.Collection; import java.util.HashSet; +import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.StringTokenizer; import java.util.zip.ZipException; @@ -61,8 +63,7 @@ public class MassiveEsa extends MassiveUploader implements RepositoryUploader> requiredFeaturesWithTolerates = feature.getRequiredFeatureWithTolerates(); + for (Map.Entry> entry : requiredFeaturesWithTolerates.entrySet()) { + resource.addRequireFeatureWithTolerates(entry.getKey(), entry.getValue()); } + // Old version which does not collect and store tolerates info + // Calculate which features this relies on +// for (String requiredFeature : feature.getRequiredFeatures()) { +// resource.addRequireFeature(requiredFeature); +// } + // feature.supersededBy is a comma-separated list of shortNames. Add // each of the elements to either supersededBy or supersededByOptional. String supersededBy = feature.getSupersededBy(); @@ -281,6 +287,8 @@ public EsaResourceWritable uploadFile(File esa, UploadStrategy strategy, String } catch (RepositoryException re) { throw re; } + + resource.dump(System.out); return resource; } diff --git a/upload-lib/src/main/java/com/ibm/ws/massive/esa/internal/EsaManifest.java b/upload-lib/src/main/java/com/ibm/ws/massive/esa/internal/EsaManifest.java index 0ccc383..e246650 100644 --- a/upload-lib/src/main/java/com/ibm/ws/massive/esa/internal/EsaManifest.java +++ b/upload-lib/src/main/java/com/ibm/ws/massive/esa/internal/EsaManifest.java @@ -25,12 +25,14 @@ import java.util.Collections; import java.util.Enumeration; import java.util.HashSet; +import java.util.Hashtable; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; import java.util.Set; +import java.util.StringTokenizer; import java.util.jar.Manifest; import java.util.zip.ZipEntry; import java.util.zip.ZipException; @@ -55,8 +57,7 @@ public class EsaManifest { * @throws ZipException * @throws IOException */ - public static EsaManifest constructInstance(File esa) - throws ZipException, IOException { + public static EsaManifest constructInstance(File esa) throws ZipException, IOException { // Find the manifest - case isn't guaranteed so do a search ZipFile zip = new ZipFile(esa); Enumeration zipEntries = zip.entries(); @@ -67,8 +68,7 @@ public static EsaManifest constructInstance(File esa) subsystemEntry = nextEntry; } } - return new EsaManifest( - zip.getInputStream(subsystemEntry), zip); + return new EsaManifest(zip.getInputStream(subsystemEntry), zip); } private final ZipFile esa; @@ -105,11 +105,11 @@ private Properties getLocaleTranslations(Locale locale) { } ZipEntry[] entries = new ZipEntry[] { - this.esa.getEntry(localizationLocation + "_" - + locale.toString() + ".properties"), - this.esa.getEntry(localizationLocation + "_" - + locale.getLanguage() + ".properties"), - this.esa.getEntry(localizationLocation + ".properties") }; + this.esa.getEntry(localizationLocation + "_" + + locale.toString() + ".properties"), + this.esa.getEntry(localizationLocation + "_" + + locale.getLanguage() + ".properties"), + this.esa.getEntry(localizationLocation + ".properties") }; for (ZipEntry entry : entries) { if (entry != null) { @@ -246,4 +246,43 @@ public List getRequiredFeatures() { return result; } + /** + * Parse the subsystem manifest to find the required features and any tolerates info they may have. + * + * @return + */ + public Map> getRequiredFeatureWithTolerates() { + Hashtable> result = new Hashtable>(); + + // Find the Subsystem-Content section which contains the required features + Map> featureContentMap = ManifestHeaderProcessor.parseImportString(getHeader("Subsystem-Content")); + + // Check every feature + for (Entry> contentEntry : featureContentMap.entrySet()) { + + String symbolicName = contentEntry.getKey(); + Map attributes = contentEntry.getValue(); + + // Check if we are looking at a feature + if ("osgi.subsystem.feature".equals(attributes.get("type"))) { + + // Now check if we have a tolerates + String tolerates = attributes.get("ibm.tolerates:"); + List toleratedVersions = new ArrayList(); + // We do have tolerates so parse out the comma separated string into a List of strings + if (tolerates != null) { + StringTokenizer tokenizer = new StringTokenizer(tolerates, ","); + while (tokenizer.hasMoreTokens()) { + toleratedVersions.add(tokenizer.nextToken()); + } + } + + // Store the required features along with it tolerates info (which could be an empty list if no tolerates was found) + result.put(symbolicName, toleratedVersions); + } + } + + return result; + } + }