From 0159b68b362c7f4be78d1fa75aeaf2ec0b997f1d Mon Sep 17 00:00:00 2001 From: Eclipse Glassfish Bot Date: Sat, 12 Feb 2022 17:19:48 +0000 Subject: [PATCH 01/33] Prepare release 6.2.5 --- appserver/admin/admin-core/pom.xml | 2 +- appserver/admin/backup/pom.xml | 2 +- appserver/admin/cli-optional/pom.xml | 2 +- appserver/admin/cli/pom.xml | 2 +- appserver/admin/pom.xml | 2 +- appserver/admin/template/pom.xml | 2 +- appserver/admingui/cluster/pom.xml | 2 +- appserver/admingui/common/pom.xml | 2 +- appserver/admingui/community-theme/pom.xml | 2 +- appserver/admingui/concurrent/pom.xml | 2 +- appserver/admingui/corba/pom.xml | 2 +- appserver/admingui/core/pom.xml | 2 +- appserver/admingui/dataprovider/pom.xml | 2 +- appserver/admingui/dist-fragment/pom.xml | 2 +- appserver/admingui/ejb-lite/pom.xml | 2 +- appserver/admingui/ejb/pom.xml | 2 +- appserver/admingui/full/pom.xml | 2 +- appserver/admingui/gf-admingui-connector/pom.xml | 2 +- appserver/admingui/jackson-jaxb/pom.xml | 2 +- appserver/admingui/jca/pom.xml | 2 +- appserver/admingui/jdbc/pom.xml | 2 +- appserver/admingui/jms-plugin/pom.xml | 2 +- appserver/admingui/jts/pom.xml | 2 +- appserver/admingui/plugin-service/pom.xml | 2 +- appserver/admingui/pom.xml | 2 +- appserver/admingui/war/pom.xml | 2 +- appserver/admingui/web/pom.xml | 2 +- appserver/ant-tasks/pom.xml | 2 +- appserver/appclient/client/acc-config/pom.xml | 2 +- appserver/appclient/client/acc-standalone/pom.xml | 2 +- appserver/appclient/client/acc/pom.xml | 2 +- appserver/appclient/client/appclient-scripts/pom.xml | 2 +- appserver/appclient/client/pom.xml | 2 +- appserver/appclient/pom.xml | 2 +- appserver/appclient/server/connector/pom.xml | 2 +- appserver/appclient/server/core/pom.xml | 2 +- appserver/appclient/server/pom.xml | 2 +- appserver/batch/batch-database/pom.xml | 2 +- appserver/batch/glassfish-batch-commands/pom.xml | 2 +- appserver/batch/glassfish-batch-connector/pom.xml | 2 +- appserver/batch/pom.xml | 2 +- appserver/common/amx-javaee/pom.xml | 2 +- appserver/common/annotation-framework/pom.xml | 2 +- appserver/common/container-common/pom.xml | 2 +- appserver/common/glassfish-ee-api/pom.xml | 2 +- appserver/common/glassfish-naming/pom.xml | 2 +- appserver/common/pom.xml | 2 +- appserver/common/stats77/pom.xml | 2 +- appserver/concurrent/concurrent-connector/pom.xml | 2 +- appserver/concurrent/concurrent-impl/pom.xml | 2 +- appserver/concurrent/pom.xml | 2 +- appserver/connectors/admin/pom.xml | 2 +- appserver/connectors/connectors-connector/pom.xml | 2 +- appserver/connectors/connectors-inbound-runtime/pom.xml | 2 +- appserver/connectors/connectors-internal-api/pom.xml | 2 +- appserver/connectors/connectors-runtime/pom.xml | 2 +- appserver/connectors/descriptors/pom.xml | 2 +- appserver/connectors/pom.xml | 2 +- appserver/connectors/work-management/pom.xml | 2 +- appserver/core/api-exporter-fragment/pom.xml | 2 +- appserver/core/javaee-kernel/pom.xml | 2 +- appserver/core/pom.xml | 2 +- appserver/deployment/dol/pom.xml | 2 +- appserver/deployment/dtds/pom.xml | 2 +- appserver/deployment/javaee-core/pom.xml | 2 +- appserver/deployment/javaee-full/pom.xml | 2 +- appserver/deployment/pom.xml | 2 +- appserver/deployment/schemas/pom.xml | 2 +- appserver/distributions/glassfish-common/pom.xml | 2 +- appserver/distributions/glassfish/pom.xml | 2 +- appserver/distributions/pom.xml | 2 +- appserver/distributions/web/pom.xml | 2 +- appserver/ejb/ejb-all/pom.xml | 2 +- appserver/ejb/ejb-client/pom.xml | 2 +- appserver/ejb/ejb-connector/pom.xml | 2 +- appserver/ejb/ejb-container/pom.xml | 2 +- appserver/ejb/ejb-full-container/pom.xml | 2 +- appserver/ejb/ejb-internal-api/pom.xml | 2 +- appserver/ejb/ejb-timer-databases/pom.xml | 2 +- appserver/ejb/ejb-timer-service-app/pom.xml | 2 +- appserver/ejb/pom.xml | 2 +- appserver/extras/appserv-rt/dist-frag/pom.xml | 2 +- appserver/extras/appserv-rt/manifest-jar/pom.xml | 2 +- appserver/extras/appserv-rt/pom.xml | 2 +- appserver/extras/embedded/all/pom.xml | 2 +- appserver/extras/embedded/common/bootstrap/pom.xml | 2 +- .../extras/embedded/common/installroot-builder/pom.xml | 2 +- .../extras/embedded/common/instanceroot-builder/pom.xml | 2 +- appserver/extras/embedded/common/osgi-main/pom.xml | 2 +- .../extras/embedded/common/osgi-modules-uninstaller/pom.xml | 2 +- appserver/extras/embedded/common/pom.xml | 2 +- appserver/extras/embedded/nucleus/pom.xml | 2 +- appserver/extras/embedded/pom.xml | 2 +- .../embedded/shell/glassfish-embedded-shell-frag/pom.xml | 2 +- .../extras/embedded/shell/glassfish-embedded-shell/pom.xml | 2 +- .../shell/glassfish-embedded-static-shell-frag/pom.xml | 2 +- .../embedded/shell/glassfish-embedded-static-shell/pom.xml | 2 +- appserver/extras/embedded/shell/pom.xml | 2 +- appserver/extras/embedded/tests/pom.xml | 2 +- appserver/extras/embedded/web/pom.xml | 2 +- appserver/extras/javaee/dist-frag/pom.xml | 2 +- appserver/extras/javaee/manifest-jar/pom.xml | 2 +- appserver/extras/javaee/pom.xml | 2 +- appserver/extras/pom.xml | 2 +- appserver/featuresets/debug/pom.xml | 2 +- appserver/featuresets/glassfish/pom.xml | 2 +- appserver/featuresets/pom.xml | 2 +- appserver/featuresets/web/pom.xml | 2 +- appserver/flashlight/client/pom.xml | 2 +- appserver/flashlight/pom.xml | 2 +- appserver/grizzly/glassfish-grizzly-extra-all/pom.xml | 2 +- appserver/grizzly/grizzly-container/pom.xml | 2 +- appserver/grizzly/pom.xml | 2 +- appserver/ha/ha-file-store/pom.xml | 2 +- appserver/ha/ha-shoal-cache-bootstrap/pom.xml | 2 +- appserver/ha/ha-shoal-store/pom.xml | 2 +- appserver/ha/pom.xml | 2 +- appserver/jdbc/admin/pom.xml | 2 +- appserver/jdbc/jdbc-config/pom.xml | 2 +- appserver/jdbc/jdbc-ra/jdbc-core/pom.xml | 2 +- appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml | 2 +- appserver/jdbc/jdbc-ra/jdbc40/pom.xml | 2 +- appserver/jdbc/jdbc-ra/pom.xml | 2 +- appserver/jdbc/jdbc-runtime/pom.xml | 2 +- appserver/jdbc/pom.xml | 2 +- appserver/jdbc/templates/pom.xml | 2 +- appserver/jms/admin/pom.xml | 2 +- appserver/jms/gf-jms-connector/pom.xml | 2 +- appserver/jms/gf-jms-injection/pom.xml | 2 +- appserver/jms/jms-core/pom.xml | 2 +- appserver/jms/jmsra/pom.xml | 2 +- appserver/jms/pom.xml | 2 +- appserver/ldapbp/pom.xml | 2 +- appserver/libpam4j/pom.xml | 2 +- appserver/load-balancer/admin/pom.xml | 2 +- appserver/load-balancer/gf-load-balancer-connector/pom.xml | 2 +- appserver/load-balancer/pom.xml | 2 +- appserver/orb/orb-connector/pom.xml | 2 +- appserver/orb/orb-enabler/pom.xml | 2 +- appserver/orb/orb-iiop/pom.xml | 2 +- appserver/orb/pom.xml | 2 +- appserver/osgi-platforms/felix-webconsole-extension/pom.xml | 2 +- .../osgi-platforms/glassfish-osgi-console-plugin/pom.xml | 2 +- appserver/osgi-platforms/pom.xml | 2 +- appserver/persistence/cmp/cmp-all/pom.xml | 2 +- appserver/persistence/cmp/cmp-scripts/pom.xml | 2 +- appserver/persistence/cmp/ejb-mapping/pom.xml | 2 +- appserver/persistence/cmp/enhancer/pom.xml | 2 +- appserver/persistence/cmp/generator-database/pom.xml | 2 +- appserver/persistence/cmp/internal-api/pom.xml | 2 +- appserver/persistence/cmp/model/pom.xml | 2 +- appserver/persistence/cmp/pom.xml | 2 +- appserver/persistence/cmp/support-ejb/pom.xml | 2 +- appserver/persistence/cmp/support-sqlstore/pom.xml | 2 +- appserver/persistence/cmp/utility/pom.xml | 2 +- appserver/persistence/common/pom.xml | 2 +- appserver/persistence/eclipselink-wrapper/pom.xml | 2 +- appserver/persistence/entitybean-container/pom.xml | 2 +- appserver/persistence/gf-jpa-connector/pom.xml | 2 +- appserver/persistence/jpa-container/pom.xml | 2 +- appserver/persistence/oracle-jdbc-driver-packages/pom.xml | 2 +- appserver/persistence/pom.xml | 2 +- appserver/pom.xml | 2 +- appserver/resources/mail/mail-connector/pom.xml | 2 +- appserver/resources/mail/mail-runtime/pom.xml | 2 +- appserver/resources/mail/pom.xml | 2 +- appserver/resources/pom.xml | 2 +- appserver/resources/resources-connector/pom.xml | 2 +- appserver/resources/resources-runtime/pom.xml | 2 +- appserver/security/appclient.security/pom.xml | 2 +- appserver/security/core-ee/pom.xml | 2 +- appserver/security/ejb.security/pom.xml | 2 +- appserver/security/jaspic-provider-framework/pom.xml | 2 +- appserver/security/pom.xml | 2 +- appserver/security/security-all/pom.xml | 2 +- appserver/security/webintegration/pom.xml | 2 +- appserver/security/webservices.security/pom.xml | 2 +- appserver/tests/admingui/auto-test/pom.xml | 2 +- appserver/tests/admingui/pom.xml | 2 +- appserver/tests/amx/pom.xml | 2 +- appserver/tests/appserv-tests/cciblackbox-tx/pom.xml | 2 +- .../tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml | 2 +- .../tests/appserv-tests/connectors-ra-redeploy/pom.xml | 2 +- .../appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml | 2 +- .../tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml | 2 +- .../batch/batch-dev-tests/batch-commands-tests/pom.xml | 2 +- .../batch/batch-dev-tests/batch-tests-utils/pom.xml | 2 +- .../appserv-tests/devtests/batch/batch-dev-tests/pom.xml | 2 +- appserver/tests/appserv-tests/devtests/cdi/pom.xml | 2 +- appserver/tests/appserv-tests/devtests/ejb/pom.xml | 2 +- .../security/ejb-auth-async/scheduler-service/pom.xml | 2 +- .../devtests/security/jaccApi/prog-auth/common/pom.xml | 2 +- .../devtests/security/jaccApi/prog-auth/pom.xml | 2 +- .../jaccApi/prog-auth/programmatic-authentication/pom.xml | 2 +- .../soteria/app-bundled-ham-basic-login-config-form/pom.xml | 2 +- .../devtests/security/soteria/app-caller-principal/pom.xml | 2 +- .../soteria/app-custom-identity-store-handler/pom.xml | 2 +- .../devtests/security/soteria/app-custom-rememberme/pom.xml | 2 +- .../devtests/security/soteria/app-custom-session/pom.xml | 2 +- .../devtests/security/soteria/app-custom/pom.xml | 2 +- .../appserv-tests/devtests/security/soteria/app-db/pom.xml | 4 ++-- .../devtests/security/soteria/app-double-ham/pom.xml | 4 ++-- .../devtests/security/soteria/app-ham-ordering/pom.xml | 4 ++-- .../devtests/security/soteria/app-mem-basic/pom.xml | 4 ++-- .../devtests/security/soteria/app-mem-form/pom.xml | 4 ++-- .../security/soteria/app-multiple-store-backup/pom.xml | 4 ++-- .../devtests/security/soteria/app-multiple-store/pom.xml | 4 ++-- .../soteria/app-no-application-caller-principal/pom.xml | 4 ++-- .../devtests/security/soteria/app-no-role-mapping/pom.xml | 4 ++-- .../security/soteria/app-securitycontext-auth-ejb/pom.xml | 4 ++-- .../security/soteria/app-securitycontext-auth/pom.xml | 4 ++-- .../appserv-tests/devtests/security/soteria/common/pom.xml | 2 +- .../tests/appserv-tests/devtests/security/soteria/pom.xml | 2 +- appserver/tests/appserv-tests/pom.xml | 2 +- appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml | 4 ++-- appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml | 4 ++-- .../tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml | 2 +- appserver/tests/cdi/cases/multiBeansXml/pom.xml | 4 ++-- appserver/tests/cdi/cases/pom.xml | 4 ++-- appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml | 2 +- appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml | 4 ++-- appserver/tests/cdi/cases/preDestroyScoping/pom.xml | 4 ++-- appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml | 2 +- appserver/tests/cdi/cases/runner/pom.xml | 2 +- appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml | 4 ++-- appserver/tests/cdi/negative/pom.xml | 4 ++-- appserver/tests/cdi/negative/runner/pom.xml | 2 +- appserver/tests/cdi/pom.xml | 2 +- appserver/tests/community/pom.xml | 2 +- appserver/tests/embedded/basic/lifecycle/pom.xml | 2 +- appserver/tests/embedded/basic/pom.xml | 2 +- appserver/tests/embedded/cdi_basic/pom.xml | 4 ++-- appserver/tests/embedded/cdi_ejb_jpa/pom.xml | 2 +- appserver/tests/embedded/ejb/basic/pom.xml | 4 ++-- appserver/tests/embedded/ejb/ejb-api/pom.xml | 4 ++-- appserver/tests/embedded/ejb/ejb-main/pom.xml | 2 +- appserver/tests/embedded/ejb/pom.xml | 2 +- appserver/tests/embedded/ejb/remoteejb/pom.xml | 4 ++-- appserver/tests/embedded/glassfish_resources_xml/pom.xml | 2 +- appserver/tests/embedded/inplanted/pom.xml | 4 ++-- .../embedded/maven-plugin/applicationDispatcher/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/dirListing/pom.xml | 2 +- .../tests/embedded/maven-plugin/filterURIMapping/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/index/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/init/pom.xml | 2 +- .../tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/jsftest/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/jsptest/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/localejbs/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/mdb/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/multipleApps/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/queryString/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/scattered/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml | 2 +- .../tests/embedded/maven-plugin/sessionDestroyed/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/simple/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/standalonewar/pom.xml | 2 +- .../tests/embedded/maven-plugin/static-shell-init/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/webservice/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/websockets/pom.xml | 2 +- appserver/tests/embedded/mysql/pom.xml | 4 ++-- appserver/tests/embedded/pom.xml | 2 +- appserver/tests/embedded/scatteredarchive/pom.xml | 4 ++-- appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml | 2 +- appserver/tests/embedded/static/ejb/pom.xml | 2 +- appserver/tests/embedded/static/ejb/simple/pom.xml | 4 ++-- appserver/tests/embedded/static/pom.xml | 2 +- appserver/tests/embedded/static/web/pom.xml | 2 +- appserver/tests/embedded/utils/pom.xml | 4 ++-- appserver/tests/embedded/web/autodelete/pom.xml | 2 +- appserver/tests/embedded/web/pom.xml | 2 +- appserver/tests/embedded/web/servlet/pom.xml | 2 +- appserver/tests/embedded/web/web-all/pom.xml | 6 +++--- appserver/tests/embedded/web/web-api/pom.xml | 4 ++-- appserver/tests/embedded/web/web-war/pom.xml | 2 +- appserver/tests/embedded/web/web-war/test/pom.xml | 4 ++-- appserver/tests/embedded/web/web-war/war/pom.xml | 2 +- appserver/tests/embedded/web/web-war/web-fragment1/pom.xml | 2 +- appserver/tests/embedded/web/web-war/web-fragment2/pom.xml | 2 +- appserver/tests/embedded/web/web-war/web-fragment3/pom.xml | 2 +- appserver/tests/embedded/wrapper/pom.xml | 2 +- appserver/tests/hk2/cdi/basic/ejb1/pom.xml | 2 +- appserver/tests/hk2/cdi/basic/pom.xml | 2 +- appserver/tests/hk2/cdi/basic/runner/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/app/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/ejb1/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/ejb2/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/lib1/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/runner/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/war1/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/war2/pom.xml | 2 +- appserver/tests/hk2/cdi/jersey/pom.xml | 2 +- appserver/tests/hk2/cdi/jersey/runner/pom.xml | 2 +- appserver/tests/hk2/cdi/jersey/war/pom.xml | 2 +- appserver/tests/hk2/cdi/pom.xml | 2 +- appserver/tests/hk2/isolation/pom.xml | 4 ++-- appserver/tests/hk2/isolation/runner/pom.xml | 4 ++-- appserver/tests/hk2/isolation/web/iso1/pom.xml | 4 ++-- appserver/tests/hk2/isolation/web/iso2/pom.xml | 4 ++-- appserver/tests/hk2/isolation/web/pom.xml | 4 ++-- appserver/tests/hk2/pom.xml | 2 +- .../tests/paas/appscoped-db-with-resources-xml/pom.xml | 2 +- appserver/tests/paas/basic-bookstore-dns/pom.xml | 2 +- appserver/tests/paas/basic-db-initsql/pom.xml | 2 +- appserver/tests/paas/basic-db-teardown-sql/pom.xml | 2 +- appserver/tests/paas/basic-db-with-resources-xml/pom.xml | 2 +- appserver/tests/paas/basic-db/pom.xml | 2 +- appserver/tests/paas/basic-jpa/pom.xml | 2 +- appserver/tests/paas/basic-service-discovery/pom.xml | 2 +- appserver/tests/paas/basic-shared-service-test/pom.xml | 2 +- appserver/tests/paas/basic/pom.xml | 2 +- appserver/tests/paas/bookstore/pom.xml | 2 +- appserver/tests/paas/deployment-rollback/pom.xml | 2 +- appserver/tests/paas/enable-disable-test/pom.xml | 2 +- .../paas/ext-shared-service-enable-disable-test/pom.xml | 2 +- appserver/tests/paas/external-and-shared-service/pom.xml | 2 +- .../tests/paas/external-db-service/generatederbyvm/pom.xml | 2 +- appserver/tests/paas/external-db-service/pom.xml | 2 +- appserver/tests/paas/external-db-service/test/pom.xml | 2 +- appserver/tests/paas/helloworld/pom.xml | 2 +- appserver/tests/paas/javaee_shared_service/pom.xml | 2 +- appserver/tests/paas/lazy-shared-service-test/pom.xml | 2 +- appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml | 2 +- appserver/tests/paas/mq-shared-service-test/pom.xml | 2 +- .../paas/multiple-db-app-scoped-services/advanced/pom.xml | 2 +- .../paas/multiple-db-app-scoped-services/basic/pom.xml | 2 +- .../tests/paas/multiple-db-app-scoped-services/pom.xml | 2 +- .../tests/paas/multiple-db-shared-services/advanced/pom.xml | 2 +- .../tests/paas/multiple-db-shared-services/basic/pom.xml | 2 +- appserver/tests/paas/multiple-db-shared-services/pom.xml | 2 +- appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml | 4 ++-- appserver/tests/paas/multiple-spe-test/pom.xml | 2 +- appserver/tests/paas/multiple-spe-test/spetest/pom.xml | 2 +- appserver/tests/paas/pom.xml | 2 +- appserver/tests/paas/scale_service/pom.xml | 2 +- .../tests/paas/service_metadata/custom_db_name/pom.xml | 2 +- appserver/tests/paas/service_metadata/pom.xml | 2 +- .../provision_using_specified_template/pom.xml | 2 +- appserver/tests/pom.xml | 2 +- appserver/tests/quicklook/admin/pom.xml | 2 +- appserver/tests/quicklook/adminconsole/pom.xml | 4 ++-- appserver/tests/quicklook/amx/pom.xml | 2 +- appserver/tests/quicklook/ejb/cmp/pom.xml | 2 +- appserver/tests/quicklook/ejb/embedded/pom.xml | 2 +- appserver/tests/quicklook/ejb/remoteview/pom.xml | 2 +- appserver/tests/quicklook/ejb/sfulnoi/pom.xml | 2 +- appserver/tests/quicklook/ejb/singleton/pom.xml | 2 +- appserver/tests/quicklook/ejb/slsbnicmt/pom.xml | 2 +- appserver/tests/quicklook/jms/injection/pom.xml | 2 +- appserver/tests/quicklook/pom.xml | 2 +- appserver/tests/quicklook/rest/pom.xml | 2 +- appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml | 2 +- appserver/tests/quicklook/wsit/jsr109tester/pom.xml | 2 +- appserver/tests/sse/basic/pom.xml | 2 +- appserver/tests/sse/videoplayer/pom.xml | 2 +- appserver/tests/tck/authentication/pom.xml | 2 +- appserver/tests/tck/authorization/pom.xml | 2 +- .../tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml | 2 +- appserver/tests/tck/embedded_ejb_smoke/pom.xml | 2 +- appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml | 2 +- appserver/tests/tck/faces/pom.xml | 2 +- appserver/tests/tck/pom.xml | 2 +- appserver/tests/tck/rest/pom.xml | 2 +- .../tck/tck-download/jakarta-authentication-tck/pom.xml | 2 +- .../tck/tck-download/jakarta-authorization-tck/pom.xml | 2 +- appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml | 2 +- appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml | 2 +- appserver/tests/tck/tck-download/javatest/pom.xml | 2 +- appserver/tests/tck/tck-download/pom.xml | 2 +- appserver/tests/tck/tck-download/tsharness/pom.xml | 2 +- appserver/transaction/internal-api/pom.xml | 2 +- appserver/transaction/jta/pom.xml | 2 +- appserver/transaction/jts/pom.xml | 2 +- appserver/transaction/pom.xml | 2 +- appserver/web/admin/pom.xml | 2 +- appserver/web/cdi-api-fragment/pom.xml | 2 +- appserver/web/gf-web-connector/pom.xml | 2 +- appserver/web/gf-weld-connector/pom.xml | 2 +- appserver/web/gui-plugin-common/pom.xml | 2 +- appserver/web/jersey-ejb-component-provider/pom.xml | 2 +- appserver/web/jersey-mvc-connector/pom.xml | 2 +- appserver/web/jsf-connector/pom.xml | 2 +- appserver/web/jspcaching-connector/pom.xml | 2 +- appserver/web/jstl-connector/pom.xml | 2 +- appserver/web/pom.xml | 2 +- appserver/web/war-util/pom.xml | 2 +- appserver/web/web-core/pom.xml | 2 +- appserver/web/web-embed/api/pom.xml | 2 +- appserver/web/web-embed/pom.xml | 2 +- appserver/web/web-glue/pom.xml | 2 +- appserver/web/web-ha/pom.xml | 2 +- appserver/web/web-naming/pom.xml | 2 +- appserver/web/web-sse/pom.xml | 2 +- appserver/web/webtier-all/pom.xml | 2 +- appserver/web/weld-integration-fragment/pom.xml | 2 +- appserver/web/weld-integration-test-fragment/pom.xml | 2 +- appserver/web/weld-integration/pom.xml | 2 +- appserver/webservices/connector/pom.xml | 2 +- appserver/webservices/jsr109-impl/pom.xml | 2 +- appserver/webservices/metro-fragments/pom.xml | 2 +- appserver/webservices/metro-glue/pom.xml | 2 +- appserver/webservices/pom.xml | 2 +- appserver/webservices/soap-tcp/pom.xml | 2 +- appserver/webservices/webservices-scripts/pom.xml | 2 +- docs/add-on-component-development-guide/pom.xml | 2 +- docs/administration-guide/pom.xml | 2 +- docs/application-deployment-guide/pom.xml | 2 +- docs/application-development-guide/pom.xml | 2 +- docs/deployment-planning-guide/pom.xml | 2 +- docs/distribution/pom.xml | 2 +- docs/embedded-server-guide/pom.xml | 2 +- docs/error-messages-reference/pom.xml | 2 +- docs/ha-administration-guide/pom.xml | 2 +- docs/installation-guide/pom.xml | 2 +- docs/parent/pom.xml | 2 +- docs/performance-tuning-guide/pom.xml | 2 +- docs/pom.xml | 2 +- docs/publish/pom.xml | 2 +- docs/quick-start-guide/pom.xml | 2 +- docs/reference-manual/pom.xml | 2 +- docs/release-notes/pom.xml | 2 +- docs/security-guide/pom.xml | 2 +- docs/troubleshooting-guide/pom.xml | 2 +- docs/upgrade-guide/pom.xml | 2 +- docs/website/pom.xml | 2 +- nucleus/admin/cli/pom.xml | 2 +- nucleus/admin/config-api/pom.xml | 2 +- nucleus/admin/launcher/pom.xml | 2 +- nucleus/admin/monitor/pom.xml | 2 +- nucleus/admin/pom.xml | 2 +- nucleus/admin/rest/gf-restadmin-connector/pom.xml | 2 +- nucleus/admin/rest/pom.xml | 2 +- nucleus/admin/rest/rest-client/pom.xml | 2 +- nucleus/admin/rest/rest-service/pom.xml | 2 +- nucleus/admin/rest/rest-testing/pom.xml | 2 +- nucleus/admin/server-mgmt/pom.xml | 2 +- nucleus/admin/template/pom.xml | 2 +- nucleus/admin/util/pom.xml | 2 +- nucleus/cluster/admin/pom.xml | 2 +- nucleus/cluster/cli/pom.xml | 2 +- nucleus/cluster/common/pom.xml | 2 +- nucleus/cluster/gms-adapter/pom.xml | 2 +- nucleus/cluster/gms-bootstrap/pom.xml | 2 +- nucleus/cluster/pom.xml | 2 +- nucleus/cluster/ssh/pom.xml | 2 +- nucleus/common/amx-core/pom.xml | 2 +- nucleus/common/common-util/pom.xml | 2 +- nucleus/common/glassfish-api/pom.xml | 2 +- nucleus/common/internal-api/pom.xml | 2 +- nucleus/common/mbeanserver/pom.xml | 2 +- nucleus/common/pom.xml | 2 +- nucleus/common/scattered-archive-api/pom.xml | 2 +- nucleus/common/simple-glassfish-api/pom.xml | 2 +- nucleus/core/api-exporter/pom.xml | 2 +- nucleus/core/bootstrap/pom.xml | 2 +- nucleus/core/context-propagation/pom.xml | 2 +- nucleus/core/extra-jre-packages/pom.xml | 2 +- nucleus/core/kernel/pom.xml | 2 +- nucleus/core/logging/pom.xml | 2 +- nucleus/core/pom.xml | 2 +- nucleus/deployment/admin/pom.xml | 2 +- nucleus/deployment/autodeploy/pom.xml | 2 +- nucleus/deployment/common/pom.xml | 2 +- nucleus/deployment/dtds/pom.xml | 2 +- nucleus/deployment/pom.xml | 2 +- nucleus/deployment/schemas/pom.xml | 2 +- nucleus/diagnostics/context/pom.xml | 2 +- nucleus/diagnostics/diagnostics-api/pom.xml | 2 +- nucleus/diagnostics/pom.xml | 2 +- nucleus/distributions/atomic/pom.xml | 2 +- nucleus/distributions/nucleus-common/pom.xml | 2 +- nucleus/distributions/nucleus/pom.xml | 2 +- nucleus/distributions/pom.xml | 2 +- nucleus/featuresets/atomic/pom.xml | 2 +- nucleus/featuresets/nucleus/pom.xml | 2 +- nucleus/featuresets/pom.xml | 2 +- nucleus/flashlight/agent/pom.xml | 2 +- nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml | 2 +- nucleus/flashlight/framework/pom.xml | 2 +- nucleus/flashlight/pom.xml | 2 +- nucleus/grizzly/config/pom.xml | 2 +- nucleus/grizzly/nucleus-grizzly-all/pom.xml | 2 +- nucleus/grizzly/pom.xml | 2 +- nucleus/hk2/config-generator/pom.xml | 2 +- nucleus/hk2/config-types/pom.xml | 2 +- nucleus/hk2/hk2-config/pom.xml | 2 +- nucleus/hk2/pom.xml | 2 +- nucleus/hk2/tiger-types/pom.xml | 2 +- nucleus/osgi-platforms/felix/pom.xml | 2 +- nucleus/osgi-platforms/osgi-cli-interactive/pom.xml | 2 +- nucleus/osgi-platforms/osgi-cli-remote/pom.xml | 2 +- nucleus/osgi-platforms/osgi-container/pom.xml | 2 +- nucleus/osgi-platforms/pom.xml | 2 +- nucleus/parent/pom.xml | 2 +- nucleus/pom.xml | 2 +- nucleus/resources/pom.xml | 2 +- nucleus/security/core/pom.xml | 2 +- nucleus/security/pom.xml | 2 +- nucleus/security/services/pom.xml | 2 +- nucleus/security/ssl-impl/pom.xml | 2 +- nucleus/test-utils/pom.xml | 2 +- nucleus/tests/admin/pom.xml | 2 +- nucleus/tests/pom.xml | 2 +- pom.xml | 2 +- qa/pom.xml | 2 +- 509 files changed, 548 insertions(+), 548 deletions(-) diff --git a/appserver/admin/admin-core/pom.xml b/appserver/admin/admin-core/pom.xml index c665ea82c04..5324b04950b 100755 --- a/appserver/admin/admin-core/pom.xml +++ b/appserver/admin/admin-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.5-SNAPSHOT + 6.2.5 admin-core diff --git a/appserver/admin/backup/pom.xml b/appserver/admin/backup/pom.xml index f9334c32973..1d57b714816 100644 --- a/appserver/admin/backup/pom.xml +++ b/appserver/admin/backup/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.5-SNAPSHOT + 6.2.5 backup diff --git a/appserver/admin/cli-optional/pom.xml b/appserver/admin/cli-optional/pom.xml index 83bc3e9e20e..6f4efa84b41 100755 --- a/appserver/admin/cli-optional/pom.xml +++ b/appserver/admin/cli-optional/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.5-SNAPSHOT + 6.2.5 cli-optional diff --git a/appserver/admin/cli/pom.xml b/appserver/admin/cli/pom.xml index b431be3d8fb..63b61d998ae 100755 --- a/appserver/admin/cli/pom.xml +++ b/appserver/admin/cli/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.5-SNAPSHOT + 6.2.5 appserver-cli diff --git a/appserver/admin/pom.xml b/appserver/admin/pom.xml index 90b6b78b97c..90b12f2ab46 100755 --- a/appserver/admin/pom.xml +++ b/appserver/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admin/template/pom.xml b/appserver/admin/template/pom.xml index 74344e8104c..2b12043f8a2 100644 --- a/appserver/admin/template/pom.xml +++ b/appserver/admin/template/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.5-SNAPSHOT + 6.2.5 appserver-domain diff --git a/appserver/admingui/cluster/pom.xml b/appserver/admingui/cluster/pom.xml index 7f12263602c..8a399ee7b16 100644 --- a/appserver/admingui/cluster/pom.xml +++ b/appserver/admingui/cluster/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml index 856d437fbb3..6a3705c13d7 100644 --- a/appserver/admingui/common/pom.xml +++ b/appserver/admingui/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/community-theme/pom.xml b/appserver/admingui/community-theme/pom.xml index cdd11f6fe1e..0c2eaa9a89f 100644 --- a/appserver/admingui/community-theme/pom.xml +++ b/appserver/admingui/community-theme/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/concurrent/pom.xml b/appserver/admingui/concurrent/pom.xml index c366be667aa..a3a72f70f34 100644 --- a/appserver/admingui/concurrent/pom.xml +++ b/appserver/admingui/concurrent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/corba/pom.xml b/appserver/admingui/corba/pom.xml index 92082282ccc..5b12371495a 100644 --- a/appserver/admingui/corba/pom.xml +++ b/appserver/admingui/corba/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/core/pom.xml b/appserver/admingui/core/pom.xml index 596f901f9fb..5c291f3d18c 100644 --- a/appserver/admingui/core/pom.xml +++ b/appserver/admingui/core/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/dataprovider/pom.xml b/appserver/admingui/dataprovider/pom.xml index a6805f6b184..038cf6216bf 100644 --- a/appserver/admingui/dataprovider/pom.xml +++ b/appserver/admingui/dataprovider/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/admingui/dist-fragment/pom.xml b/appserver/admingui/dist-fragment/pom.xml index 0eab2a09946..d72881010fd 100644 --- a/appserver/admingui/dist-fragment/pom.xml +++ b/appserver/admingui/dist-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 dist-fragment diff --git a/appserver/admingui/ejb-lite/pom.xml b/appserver/admingui/ejb-lite/pom.xml index 8dd6f83b470..2b34d17bcd3 100644 --- a/appserver/admingui/ejb-lite/pom.xml +++ b/appserver/admingui/ejb-lite/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/ejb/pom.xml b/appserver/admingui/ejb/pom.xml index 17a93c9d159..73d65b65f1f 100644 --- a/appserver/admingui/ejb/pom.xml +++ b/appserver/admingui/ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/full/pom.xml b/appserver/admingui/full/pom.xml index fc01f1393a5..32e32b1c28e 100644 --- a/appserver/admingui/full/pom.xml +++ b/appserver/admingui/full/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/gf-admingui-connector/pom.xml b/appserver/admingui/gf-admingui-connector/pom.xml index 772888cfbca..35fbb7b5ac6 100755 --- a/appserver/admingui/gf-admingui-connector/pom.xml +++ b/appserver/admingui/gf-admingui-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/admingui/jackson-jaxb/pom.xml b/appserver/admingui/jackson-jaxb/pom.xml index f5bdb71b6ee..69738f062a9 100644 --- a/appserver/admingui/jackson-jaxb/pom.xml +++ b/appserver/admingui/jackson-jaxb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/admingui/jca/pom.xml b/appserver/admingui/jca/pom.xml index ab634b4ebd1..d6dd71b163d 100644 --- a/appserver/admingui/jca/pom.xml +++ b/appserver/admingui/jca/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/jdbc/pom.xml b/appserver/admingui/jdbc/pom.xml index 312df53dcac..ca4ef98175a 100644 --- a/appserver/admingui/jdbc/pom.xml +++ b/appserver/admingui/jdbc/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/jms-plugin/pom.xml b/appserver/admingui/jms-plugin/pom.xml index d29b1c8ae97..1cac9ea828f 100644 --- a/appserver/admingui/jms-plugin/pom.xml +++ b/appserver/admingui/jms-plugin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/jts/pom.xml b/appserver/admingui/jts/pom.xml index 6c09830c08f..82963dbd744 100644 --- a/appserver/admingui/jts/pom.xml +++ b/appserver/admingui/jts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/plugin-service/pom.xml b/appserver/admingui/plugin-service/pom.xml index 251ea6d1787..cef0abb0fc0 100644 --- a/appserver/admingui/plugin-service/pom.xml +++ b/appserver/admingui/plugin-service/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/admingui/pom.xml b/appserver/admingui/pom.xml index 478540935c5..b3988836a16 100644 --- a/appserver/admingui/pom.xml +++ b/appserver/admingui/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/admingui/war/pom.xml b/appserver/admingui/war/pom.xml index 4e33153d6be..505f6741bb9 100644 --- a/appserver/admingui/war/pom.xml +++ b/appserver/admingui/war/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/admingui/web/pom.xml b/appserver/admingui/web/pom.xml index 859c2f86838..76248af355c 100644 --- a/appserver/admingui/web/pom.xml +++ b/appserver/admingui/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 console-web-plugin diff --git a/appserver/ant-tasks/pom.xml b/appserver/ant-tasks/pom.xml index b427cdb4c8a..9b677f62899 100644 --- a/appserver/ant-tasks/pom.xml +++ b/appserver/ant-tasks/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/appclient/client/acc-config/pom.xml b/appserver/appclient/client/acc-config/pom.xml index 14ad326d299..24fed3be409 100755 --- a/appserver/appclient/client/acc-config/pom.xml +++ b/appserver/appclient/client/acc-config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.5-SNAPSHOT + 6.2.5 acc-config diff --git a/appserver/appclient/client/acc-standalone/pom.xml b/appserver/appclient/client/acc-standalone/pom.xml index b67f2fc0c41..5d8a4e4f2df 100755 --- a/appserver/appclient/client/acc-standalone/pom.xml +++ b/appserver/appclient/client/acc-standalone/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/appclient/client/acc/pom.xml b/appserver/appclient/client/acc/pom.xml index 64ae23f4a0d..c1781a8f836 100755 --- a/appserver/appclient/client/acc/pom.xml +++ b/appserver/appclient/client/acc/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.5-SNAPSHOT + 6.2.5 gf-client-module diff --git a/appserver/appclient/client/appclient-scripts/pom.xml b/appserver/appclient/client/appclient-scripts/pom.xml index 9ab386d570e..46d30676b75 100644 --- a/appserver/appclient/client/appclient-scripts/pom.xml +++ b/appserver/appclient/client/appclient-scripts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.5-SNAPSHOT + 6.2.5 appclient-scripts diff --git a/appserver/appclient/client/pom.xml b/appserver/appclient/client/pom.xml index ca2283bce9c..e3d52f06a31 100755 --- a/appserver/appclient/client/pom.xml +++ b/appserver/appclient/client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main appclient - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.appclient diff --git a/appserver/appclient/pom.xml b/appserver/appclient/pom.xml index 4c5a4b3f938..3950635dd27 100755 --- a/appserver/appclient/pom.xml +++ b/appserver/appclient/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 appclient diff --git a/appserver/appclient/server/connector/pom.xml b/appserver/appclient/server/connector/pom.xml index 5caebf9d867..bcf00fd8a60 100644 --- a/appserver/appclient/server/connector/pom.xml +++ b/appserver/appclient/server/connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient server - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.appclient.server diff --git a/appserver/appclient/server/core/pom.xml b/appserver/appclient/server/core/pom.xml index 7237ae67829..a991d48afee 100644 --- a/appserver/appclient/server/core/pom.xml +++ b/appserver/appclient/server/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient server - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.appclient.server diff --git a/appserver/appclient/server/pom.xml b/appserver/appclient/server/pom.xml index 451cd5244ce..020643cb2a3 100755 --- a/appserver/appclient/server/pom.xml +++ b/appserver/appclient/server/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main appclient - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/batch/batch-database/pom.xml b/appserver/batch/batch-database/pom.xml index 7248e865c7a..c4c799ed00d 100644 --- a/appserver/batch/batch-database/pom.xml +++ b/appserver/batch/batch-database/pom.xml @@ -26,7 +26,7 @@ org.glassfish.main.batch batch - 6.2.5-SNAPSHOT + 6.2.5 batch-databases diff --git a/appserver/batch/glassfish-batch-commands/pom.xml b/appserver/batch/glassfish-batch-commands/pom.xml index 96768d5519a..d7e1734571a 100755 --- a/appserver/batch/glassfish-batch-commands/pom.xml +++ b/appserver/batch/glassfish-batch-commands/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.batch batch - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/batch/glassfish-batch-connector/pom.xml b/appserver/batch/glassfish-batch-connector/pom.xml index ccd76bc2510..270b34b3f4a 100755 --- a/appserver/batch/glassfish-batch-connector/pom.xml +++ b/appserver/batch/glassfish-batch-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.batch batch - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/batch/pom.xml b/appserver/batch/pom.xml index c63e096c46b..2abd3c6627f 100755 --- a/appserver/batch/pom.xml +++ b/appserver/batch/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/common/amx-javaee/pom.xml b/appserver/common/amx-javaee/pom.xml index be3a80e8878..8a334879c8c 100755 --- a/appserver/common/amx-javaee/pom.xml +++ b/appserver/common/amx-javaee/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5-SNAPSHOT + 6.2.5 amx-javaee diff --git a/appserver/common/annotation-framework/pom.xml b/appserver/common/annotation-framework/pom.xml index 8e8e1d01c7c..dc7ab88f728 100755 --- a/appserver/common/annotation-framework/pom.xml +++ b/appserver/common/annotation-framework/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5-SNAPSHOT + 6.2.5 annotation-framework diff --git a/appserver/common/container-common/pom.xml b/appserver/common/container-common/pom.xml index dd1965928ee..0b7095fa0ee 100755 --- a/appserver/common/container-common/pom.xml +++ b/appserver/common/container-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/common/glassfish-ee-api/pom.xml b/appserver/common/glassfish-ee-api/pom.xml index 537edb9a0a7..f999c5daac6 100644 --- a/appserver/common/glassfish-ee-api/pom.xml +++ b/appserver/common/glassfish-ee-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5-SNAPSHOT + 6.2.5 glassfish-ee-api diff --git a/appserver/common/glassfish-naming/pom.xml b/appserver/common/glassfish-naming/pom.xml index 8360a1412e1..0e032255eeb 100755 --- a/appserver/common/glassfish-naming/pom.xml +++ b/appserver/common/glassfish-naming/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5-SNAPSHOT + 6.2.5 glassfish-naming diff --git a/appserver/common/pom.xml b/appserver/common/pom.xml index 20990219e3b..af230689e52 100755 --- a/appserver/common/pom.xml +++ b/appserver/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/common/stats77/pom.xml b/appserver/common/stats77/pom.xml index ad1e3a2c65e..8a4503da595 100755 --- a/appserver/common/stats77/pom.xml +++ b/appserver/common/stats77/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5-SNAPSHOT + 6.2.5 stats77 diff --git a/appserver/concurrent/concurrent-connector/pom.xml b/appserver/concurrent/concurrent-connector/pom.xml index 2d0d19edb37..66048ab2464 100644 --- a/appserver/concurrent/concurrent-connector/pom.xml +++ b/appserver/concurrent/concurrent-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.concurrent concurrent - 6.2.5-SNAPSHOT + 6.2.5 concurrent-connector diff --git a/appserver/concurrent/concurrent-impl/pom.xml b/appserver/concurrent/concurrent-impl/pom.xml index 1e3ce7bfa95..e48f976c0cf 100644 --- a/appserver/concurrent/concurrent-impl/pom.xml +++ b/appserver/concurrent/concurrent-impl/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.concurrent concurrent - 6.2.5-SNAPSHOT + 6.2.5 concurrent-impl diff --git a/appserver/concurrent/pom.xml b/appserver/concurrent/pom.xml index caa81d80480..7dcd50f6342 100755 --- a/appserver/concurrent/pom.xml +++ b/appserver/concurrent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.concurrent diff --git a/appserver/connectors/admin/pom.xml b/appserver/connectors/admin/pom.xml index 8357b845274..4e9f62100ba 100644 --- a/appserver/connectors/admin/pom.xml +++ b/appserver/connectors/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5-SNAPSHOT + 6.2.5 connectors-admin diff --git a/appserver/connectors/connectors-connector/pom.xml b/appserver/connectors/connectors-connector/pom.xml index 7b38e415b1f..e47e5eb3317 100644 --- a/appserver/connectors/connectors-connector/pom.xml +++ b/appserver/connectors/connectors-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5-SNAPSHOT + 6.2.5 gf-connectors-connector diff --git a/appserver/connectors/connectors-inbound-runtime/pom.xml b/appserver/connectors/connectors-inbound-runtime/pom.xml index 01e8247ed8a..755bb1493f2 100644 --- a/appserver/connectors/connectors-inbound-runtime/pom.xml +++ b/appserver/connectors/connectors-inbound-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/connectors/connectors-internal-api/pom.xml b/appserver/connectors/connectors-internal-api/pom.xml index f58a8709be8..56f27430449 100755 --- a/appserver/connectors/connectors-internal-api/pom.xml +++ b/appserver/connectors/connectors-internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/connectors/connectors-runtime/pom.xml b/appserver/connectors/connectors-runtime/pom.xml index 465a939ba62..fd5aae51257 100644 --- a/appserver/connectors/connectors-runtime/pom.xml +++ b/appserver/connectors/connectors-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/connectors/descriptors/pom.xml b/appserver/connectors/descriptors/pom.xml index 079ecd0733a..201959cca6f 100644 --- a/appserver/connectors/descriptors/pom.xml +++ b/appserver/connectors/descriptors/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5-SNAPSHOT + 6.2.5 descriptors diff --git a/appserver/connectors/pom.xml b/appserver/connectors/pom.xml index 2ac2dfe92c6..68fe945f88f 100644 --- a/appserver/connectors/pom.xml +++ b/appserver/connectors/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.connectors diff --git a/appserver/connectors/work-management/pom.xml b/appserver/connectors/work-management/pom.xml index b0eeba34df1..dbc7789da3d 100644 --- a/appserver/connectors/work-management/pom.xml +++ b/appserver/connectors/work-management/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5-SNAPSHOT + 6.2.5 work-management diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml index f98736ca5b2..9585938eeb6 100755 --- a/appserver/core/api-exporter-fragment/pom.xml +++ b/appserver/core/api-exporter-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core core - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/core/javaee-kernel/pom.xml b/appserver/core/javaee-kernel/pom.xml index fd36a757cac..ed02f1fa883 100755 --- a/appserver/core/javaee-kernel/pom.xml +++ b/appserver/core/javaee-kernel/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core core - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/core/pom.xml b/appserver/core/pom.xml index ad968f3a1ba..ce153fd5d5c 100644 --- a/appserver/core/pom.xml +++ b/appserver/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/deployment/dol/pom.xml b/appserver/deployment/dol/pom.xml index 462b9c00d59..7333ccd4a80 100755 --- a/appserver/deployment/dol/pom.xml +++ b/appserver/deployment/dol/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.5-SNAPSHOT + 6.2.5 dol diff --git a/appserver/deployment/dtds/pom.xml b/appserver/deployment/dtds/pom.xml index 107a1b24ec0..913154eef5a 100644 --- a/appserver/deployment/dtds/pom.xml +++ b/appserver/deployment/dtds/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.5-SNAPSHOT + 6.2.5 appserver-dtds diff --git a/appserver/deployment/javaee-core/pom.xml b/appserver/deployment/javaee-core/pom.xml index 81652ba79d7..4773a50c5c6 100755 --- a/appserver/deployment/javaee-core/pom.xml +++ b/appserver/deployment/javaee-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/deployment/javaee-full/pom.xml b/appserver/deployment/javaee-full/pom.xml index 69f54ff4657..4a1b6df9cba 100755 --- a/appserver/deployment/javaee-full/pom.xml +++ b/appserver/deployment/javaee-full/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/deployment/pom.xml b/appserver/deployment/pom.xml index 5caff11a466..0915f1d93d3 100755 --- a/appserver/deployment/pom.xml +++ b/appserver/deployment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/deployment/schemas/pom.xml b/appserver/deployment/schemas/pom.xml index 0cbc0e3a7db..d65b61888ca 100644 --- a/appserver/deployment/schemas/pom.xml +++ b/appserver/deployment/schemas/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.5-SNAPSHOT + 6.2.5 appserver-schemas diff --git a/appserver/distributions/glassfish-common/pom.xml b/appserver/distributions/glassfish-common/pom.xml index 091764c60d8..1cde38d061c 100644 --- a/appserver/distributions/glassfish-common/pom.xml +++ b/appserver/distributions/glassfish-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions distributions - 6.2.5-SNAPSHOT + 6.2.5 glassfish-common diff --git a/appserver/distributions/glassfish/pom.xml b/appserver/distributions/glassfish/pom.xml index 962f58f93c8..a342b65b662 100644 --- a/appserver/distributions/glassfish/pom.xml +++ b/appserver/distributions/glassfish/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions distributions - 6.2.5-SNAPSHOT + 6.2.5 glassfish diff --git a/appserver/distributions/pom.xml b/appserver/distributions/pom.xml index 43c1c8b3e48..e0bda072898 100644 --- a/appserver/distributions/pom.xml +++ b/appserver/distributions/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.distributions diff --git a/appserver/distributions/web/pom.xml b/appserver/distributions/web/pom.xml index 35822f79e04..5e6c9e33848 100644 --- a/appserver/distributions/web/pom.xml +++ b/appserver/distributions/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions distributions - 6.2.5-SNAPSHOT + 6.2.5 web diff --git a/appserver/ejb/ejb-all/pom.xml b/appserver/ejb/ejb-all/pom.xml index 6be4bae96e9..d80f2deb9b1 100755 --- a/appserver/ejb/ejb-all/pom.xml +++ b/appserver/ejb/ejb-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/ejb/ejb-client/pom.xml b/appserver/ejb/ejb-client/pom.xml index 185b9e8ea89..58aced2aa5d 100755 --- a/appserver/ejb/ejb-client/pom.xml +++ b/appserver/ejb/ejb-client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5-SNAPSHOT + 6.2.5 ejb-client diff --git a/appserver/ejb/ejb-connector/pom.xml b/appserver/ejb/ejb-connector/pom.xml index 473e93aba77..126550218af 100755 --- a/appserver/ejb/ejb-connector/pom.xml +++ b/appserver/ejb/ejb-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/ejb/ejb-container/pom.xml b/appserver/ejb/ejb-container/pom.xml index 1532bde10fd..5e40e8ea740 100755 --- a/appserver/ejb/ejb-container/pom.xml +++ b/appserver/ejb/ejb-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/ejb/ejb-full-container/pom.xml b/appserver/ejb/ejb-full-container/pom.xml index 4219b7d9f1c..3f820d69fe2 100644 --- a/appserver/ejb/ejb-full-container/pom.xml +++ b/appserver/ejb/ejb-full-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/ejb/ejb-internal-api/pom.xml b/appserver/ejb/ejb-internal-api/pom.xml index 5edd8a50780..9be441200bb 100755 --- a/appserver/ejb/ejb-internal-api/pom.xml +++ b/appserver/ejb/ejb-internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/ejb/ejb-timer-databases/pom.xml b/appserver/ejb/ejb-timer-databases/pom.xml index 8e188192cf0..3e29f8a2756 100644 --- a/appserver/ejb/ejb-timer-databases/pom.xml +++ b/appserver/ejb/ejb-timer-databases/pom.xml @@ -26,7 +26,7 @@ org.glassfish.main.ejb ejb - 6.2.5-SNAPSHOT + 6.2.5 ejb-timer-databases diff --git a/appserver/ejb/ejb-timer-service-app/pom.xml b/appserver/ejb/ejb-timer-service-app/pom.xml index e45a6caece9..5eb9c302aa1 100644 --- a/appserver/ejb/ejb-timer-service-app/pom.xml +++ b/appserver/ejb/ejb-timer-service-app/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/ejb/pom.xml b/appserver/ejb/pom.xml index d36259772cd..dc53ec26caf 100755 --- a/appserver/ejb/pom.xml +++ b/appserver/ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.ejb diff --git a/appserver/extras/appserv-rt/dist-frag/pom.xml b/appserver/extras/appserv-rt/dist-frag/pom.xml index de58c733cb8..bc2b75839ec 100644 --- a/appserver/extras/appserv-rt/dist-frag/pom.xml +++ b/appserver/extras/appserv-rt/dist-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras appserv-rt-pom - 6.2.5-SNAPSHOT + 6.2.5 appserv-rt-frag diff --git a/appserver/extras/appserv-rt/manifest-jar/pom.xml b/appserver/extras/appserv-rt/manifest-jar/pom.xml index b6b3d23fae0..5ed49c299ba 100644 --- a/appserver/extras/appserv-rt/manifest-jar/pom.xml +++ b/appserver/extras/appserv-rt/manifest-jar/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras appserv-rt-pom - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/extras/appserv-rt/pom.xml b/appserver/extras/appserv-rt/pom.xml index 4f7143b79e1..3c685a9730e 100644 --- a/appserver/extras/appserv-rt/pom.xml +++ b/appserver/extras/appserv-rt/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml index fe0e31e9e49..42a540d5639 100644 --- a/appserver/extras/embedded/all/pom.xml +++ b/appserver/extras/embedded/all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/extras/embedded/common/bootstrap/pom.xml b/appserver/extras/embedded/common/bootstrap/pom.xml index aaa264e1a6a..010099763aa 100644 --- a/appserver/extras/embedded/common/bootstrap/pom.xml +++ b/appserver/extras/embedded/common/bootstrap/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/extras/embedded/common/installroot-builder/pom.xml b/appserver/extras/embedded/common/installroot-builder/pom.xml index 253bc27e5ba..fac9f48bc36 100644 --- a/appserver/extras/embedded/common/installroot-builder/pom.xml +++ b/appserver/extras/embedded/common/installroot-builder/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/extras/embedded/common/instanceroot-builder/pom.xml b/appserver/extras/embedded/common/instanceroot-builder/pom.xml index 1c453ea0d1e..faa7e7cc7b6 100644 --- a/appserver/extras/embedded/common/instanceroot-builder/pom.xml +++ b/appserver/extras/embedded/common/instanceroot-builder/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/extras/embedded/common/osgi-main/pom.xml b/appserver/extras/embedded/common/osgi-main/pom.xml index b251ca596bd..1d8b9f669f7 100644 --- a/appserver/extras/embedded/common/osgi-main/pom.xml +++ b/appserver/extras/embedded/common/osgi-main/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml b/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml index d7d315ec680..625c57f9996 100644 --- a/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml +++ b/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/extras/embedded/common/pom.xml b/appserver/extras/embedded/common/pom.xml index 96cb97ff10e..212933e439f 100644 --- a/appserver/extras/embedded/common/pom.xml +++ b/appserver/extras/embedded/common/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/extras/embedded/nucleus/pom.xml b/appserver/extras/embedded/nucleus/pom.xml index e55f95c81b0..c8203ebeb17 100644 --- a/appserver/extras/embedded/nucleus/pom.xml +++ b/appserver/extras/embedded/nucleus/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/extras/embedded/pom.xml b/appserver/extras/embedded/pom.xml index ab28f8d0c41..295b3141f34 100644 --- a/appserver/extras/embedded/pom.xml +++ b/appserver/extras/embedded/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 embedded diff --git a/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml index b0c916b4300..8946fee8415 100644 --- a/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 ../../../pom.xml diff --git a/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml index 57bca4199df..004d490e7cb 100755 --- a/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 ../../../pom.xml diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml index d6117b392b7..dca26b6f374 100644 --- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 ../../../pom.xml diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml index 809871b6d4d..f95c3b4a45a 100755 --- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 ../../../pom.xml diff --git a/appserver/extras/embedded/shell/pom.xml b/appserver/extras/embedded/shell/pom.xml index d06c6562755..2743b208471 100755 --- a/appserver/extras/embedded/shell/pom.xml +++ b/appserver/extras/embedded/shell/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/extras/embedded/tests/pom.xml b/appserver/extras/embedded/tests/pom.xml index 92f1731afd1..66e5be25b7f 100644 --- a/appserver/extras/embedded/tests/pom.xml +++ b/appserver/extras/embedded/tests/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras embedded - 6.2.5-SNAPSHOT + 6.2.5 tests-embedded diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml index b1048b58261..55b7487bb11 100644 --- a/appserver/extras/embedded/web/pom.xml +++ b/appserver/extras/embedded/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/extras/javaee/dist-frag/pom.xml b/appserver/extras/javaee/dist-frag/pom.xml index 6bd636d7622..9b2b14b4a18 100644 --- a/appserver/extras/javaee/dist-frag/pom.xml +++ b/appserver/extras/javaee/dist-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras javaee-pom - 6.2.5-SNAPSHOT + 6.2.5 javaee-frag diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/javaee/manifest-jar/pom.xml index 43946d63170..655b0b2747d 100644 --- a/appserver/extras/javaee/manifest-jar/pom.xml +++ b/appserver/extras/javaee/manifest-jar/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras javaee-pom - 6.2.5-SNAPSHOT + 6.2.5 javaee diff --git a/appserver/extras/javaee/pom.xml b/appserver/extras/javaee/pom.xml index 7e8bb11e309..f22db9a00d9 100644 --- a/appserver/extras/javaee/pom.xml +++ b/appserver/extras/javaee/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/extras/pom.xml b/appserver/extras/pom.xml index 53eb8c9f225..87cf11291d6 100755 --- a/appserver/extras/pom.xml +++ b/appserver/extras/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.extras diff --git a/appserver/featuresets/debug/pom.xml b/appserver/featuresets/debug/pom.xml index d2633fc3dee..6aeb58adac9 100644 --- a/appserver/featuresets/debug/pom.xml +++ b/appserver/featuresets/debug/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets featuresets - 6.2.5-SNAPSHOT + 6.2.5 debug diff --git a/appserver/featuresets/glassfish/pom.xml b/appserver/featuresets/glassfish/pom.xml index f79f36e469c..5629a472385 100644 --- a/appserver/featuresets/glassfish/pom.xml +++ b/appserver/featuresets/glassfish/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets featuresets - 6.2.5-SNAPSHOT + 6.2.5 glassfish diff --git a/appserver/featuresets/pom.xml b/appserver/featuresets/pom.xml index ef1473d6aef..bcbd1cddd87 100644 --- a/appserver/featuresets/pom.xml +++ b/appserver/featuresets/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.featuresets diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml index 497c67311b9..f83660860bc 100644 --- a/appserver/featuresets/web/pom.xml +++ b/appserver/featuresets/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets featuresets - 6.2.5-SNAPSHOT + 6.2.5 web diff --git a/appserver/flashlight/client/pom.xml b/appserver/flashlight/client/pom.xml index 3af1e7722af..2bb25ef6e9e 100755 --- a/appserver/flashlight/client/pom.xml +++ b/appserver/flashlight/client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5-SNAPSHOT + 6.2.5 ../../common/pom.xml diff --git a/appserver/flashlight/pom.xml b/appserver/flashlight/pom.xml index 2563ab6f436..8d837a9a9bf 100755 --- a/appserver/flashlight/pom.xml +++ b/appserver/flashlight/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml b/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml index 9e46eefc73c..d399320285f 100644 --- a/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml +++ b/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly glassfish-grizzly - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/grizzly/grizzly-container/pom.xml b/appserver/grizzly/grizzly-container/pom.xml index 0d432eed17a..c46a9dc9190 100755 --- a/appserver/grizzly/grizzly-container/pom.xml +++ b/appserver/grizzly/grizzly-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly glassfish-grizzly - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/grizzly/pom.xml b/appserver/grizzly/pom.xml index 28f9bdb1182..b8311cf2196 100755 --- a/appserver/grizzly/pom.xml +++ b/appserver/grizzly/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/ha/ha-file-store/pom.xml b/appserver/ha/ha-file-store/pom.xml index b5eb5f171bb..d815001022b 100644 --- a/appserver/ha/ha-file-store/pom.xml +++ b/appserver/ha/ha-file-store/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ha ha - 6.2.5-SNAPSHOT + 6.2.5 ha-file-store diff --git a/appserver/ha/ha-shoal-cache-bootstrap/pom.xml b/appserver/ha/ha-shoal-cache-bootstrap/pom.xml index 731eee6ff2a..7ebee0aefd0 100644 --- a/appserver/ha/ha-shoal-cache-bootstrap/pom.xml +++ b/appserver/ha/ha-shoal-cache-bootstrap/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ha ha - 6.2.5-SNAPSHOT + 6.2.5 ha-shoal-cache-bootstrap diff --git a/appserver/ha/ha-shoal-store/pom.xml b/appserver/ha/ha-shoal-store/pom.xml index cb21aac6630..925467845ae 100644 --- a/appserver/ha/ha-shoal-store/pom.xml +++ b/appserver/ha/ha-shoal-store/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ha ha - 6.2.5-SNAPSHOT + 6.2.5 ha-shoal-cache-store diff --git a/appserver/ha/pom.xml b/appserver/ha/pom.xml index f6891bb44dd..b82c95a539a 100755 --- a/appserver/ha/pom.xml +++ b/appserver/ha/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/jdbc/admin/pom.xml b/appserver/jdbc/admin/pom.xml index a2f0356722f..36998e41102 100644 --- a/appserver/jdbc/admin/pom.xml +++ b/appserver/jdbc/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc jdbc - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/jdbc/jdbc-config/pom.xml b/appserver/jdbc/jdbc-config/pom.xml index 263e3937c06..e186d16eef1 100644 --- a/appserver/jdbc/jdbc-config/pom.xml +++ b/appserver/jdbc/jdbc-config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc jdbc - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml b/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml index 8eedcca48ac..0788f93eaae 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml +++ b/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc.jdbc-ra jdbc-ra - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml b/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml index e6b88b22d8f..98efbf89170 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml +++ b/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc.jdbc-ra jdbc-ra - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/jdbc40/pom.xml b/appserver/jdbc/jdbc-ra/jdbc40/pom.xml index 3864b895d7f..41adaeff957 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/pom.xml +++ b/appserver/jdbc/jdbc-ra/jdbc40/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc.jdbc-ra jdbc-ra - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/pom.xml b/appserver/jdbc/jdbc-ra/pom.xml index 6163ce33dbe..03588245b03 100644 --- a/appserver/jdbc/jdbc-ra/pom.xml +++ b/appserver/jdbc/jdbc-ra/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/jdbc/jdbc-runtime/pom.xml b/appserver/jdbc/jdbc-runtime/pom.xml index 2644faf22b4..79c3ca4b93d 100644 --- a/appserver/jdbc/jdbc-runtime/pom.xml +++ b/appserver/jdbc/jdbc-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc jdbc - 6.2.5-SNAPSHOT + 6.2.5 jdbc-runtime diff --git a/appserver/jdbc/pom.xml b/appserver/jdbc/pom.xml index 36732a3aedf..f92122657bf 100755 --- a/appserver/jdbc/pom.xml +++ b/appserver/jdbc/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.jdbc diff --git a/appserver/jdbc/templates/pom.xml b/appserver/jdbc/templates/pom.xml index 79b9e5977bc..de53b9d7f0f 100644 --- a/appserver/jdbc/templates/pom.xml +++ b/appserver/jdbc/templates/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main.jdbc jdbc - 6.2.5-SNAPSHOT + 6.2.5 templates JDBC Templates diff --git a/appserver/jms/admin/pom.xml b/appserver/jms/admin/pom.xml index 9f29836f64e..da995f6761e 100644 --- a/appserver/jms/admin/pom.xml +++ b/appserver/jms/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/jms/gf-jms-connector/pom.xml b/appserver/jms/gf-jms-connector/pom.xml index 0d38313f053..ddb6513dba1 100644 --- a/appserver/jms/gf-jms-connector/pom.xml +++ b/appserver/jms/gf-jms-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/jms/gf-jms-injection/pom.xml b/appserver/jms/gf-jms-injection/pom.xml index 201d09ace88..11a34a5d567 100644 --- a/appserver/jms/gf-jms-injection/pom.xml +++ b/appserver/jms/gf-jms-injection/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/jms/jms-core/pom.xml b/appserver/jms/jms-core/pom.xml index 125ca2638a2..479ebd48e31 100644 --- a/appserver/jms/jms-core/pom.xml +++ b/appserver/jms/jms-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/jms/jmsra/pom.xml b/appserver/jms/jmsra/pom.xml index 835838432f5..94ca7559869 100644 --- a/appserver/jms/jmsra/pom.xml +++ b/appserver/jms/jmsra/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/jms/pom.xml b/appserver/jms/pom.xml index 0c7062a1cf0..9f6c42a09a3 100644 --- a/appserver/jms/pom.xml +++ b/appserver/jms/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/ldapbp/pom.xml b/appserver/ldapbp/pom.xml index 7fe5f98f8e4..6450528a2e5 100644 --- a/appserver/ldapbp/pom.xml +++ b/appserver/ldapbp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.ldapbp diff --git a/appserver/libpam4j/pom.xml b/appserver/libpam4j/pom.xml index 991f90334bf..008fb87f2cc 100644 --- a/appserver/libpam4j/pom.xml +++ b/appserver/libpam4j/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.libpam4j diff --git a/appserver/load-balancer/admin/pom.xml b/appserver/load-balancer/admin/pom.xml index 3ba66a181c4..e45a7839ad6 100644 --- a/appserver/load-balancer/admin/pom.xml +++ b/appserver/load-balancer/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.loadbalancer load-balancer - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/load-balancer/gf-load-balancer-connector/pom.xml b/appserver/load-balancer/gf-load-balancer-connector/pom.xml index 3f0deb1c3ac..c0d58ffd4f5 100644 --- a/appserver/load-balancer/gf-load-balancer-connector/pom.xml +++ b/appserver/load-balancer/gf-load-balancer-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.loadbalancer load-balancer - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/load-balancer/pom.xml b/appserver/load-balancer/pom.xml index 190a7960442..31675ac1836 100644 --- a/appserver/load-balancer/pom.xml +++ b/appserver/load-balancer/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/orb/orb-connector/pom.xml b/appserver/orb/orb-connector/pom.xml index 6ec05c20f52..725e913b654 100755 --- a/appserver/orb/orb-connector/pom.xml +++ b/appserver/orb/orb-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.orb orb - 6.2.5-SNAPSHOT + 6.2.5 orb-connector diff --git a/appserver/orb/orb-enabler/pom.xml b/appserver/orb/orb-enabler/pom.xml index d4ad251e204..fdedccaabce 100755 --- a/appserver/orb/orb-enabler/pom.xml +++ b/appserver/orb/orb-enabler/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.orb orb - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/orb/orb-iiop/pom.xml b/appserver/orb/orb-iiop/pom.xml index e7232b1453e..133edc48d34 100755 --- a/appserver/orb/orb-iiop/pom.xml +++ b/appserver/orb/orb-iiop/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.orb orb - 6.2.5-SNAPSHOT + 6.2.5 orb-iiop diff --git a/appserver/orb/pom.xml b/appserver/orb/pom.xml index 2aa35531e25..038c14a6ac5 100755 --- a/appserver/orb/pom.xml +++ b/appserver/orb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/osgi-platforms/felix-webconsole-extension/pom.xml b/appserver/osgi-platforms/felix-webconsole-extension/pom.xml index 925b5ed2486..29bbcb321e0 100644 --- a/appserver/osgi-platforms/felix-webconsole-extension/pom.xml +++ b/appserver/osgi-platforms/felix-webconsole-extension/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-console-extensions - 6.2.5-SNAPSHOT + 6.2.5 felix-webconsole-extension diff --git a/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml b/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml index 33d656629dc..90eb7b3bbb5 100644 --- a/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml +++ b/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../../admingui/pom.xml diff --git a/appserver/osgi-platforms/pom.xml b/appserver/osgi-platforms/pom.xml index 161e0021a28..31c54f28586 100644 --- a/appserver/osgi-platforms/pom.xml +++ b/appserver/osgi-platforms/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/cmp/cmp-all/pom.xml b/appserver/persistence/cmp/cmp-all/pom.xml index a00824c3e5f..d446b18d701 100755 --- a/appserver/persistence/cmp/cmp-all/pom.xml +++ b/appserver/persistence/cmp/cmp-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/cmp/cmp-scripts/pom.xml b/appserver/persistence/cmp/cmp-scripts/pom.xml index a0b452abde5..01ec655c77b 100755 --- a/appserver/persistence/cmp/cmp-scripts/pom.xml +++ b/appserver/persistence/cmp/cmp-scripts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5-SNAPSHOT + 6.2.5 cmp-scripts diff --git a/appserver/persistence/cmp/ejb-mapping/pom.xml b/appserver/persistence/cmp/ejb-mapping/pom.xml index 01903172b81..7e926b6c3c1 100644 --- a/appserver/persistence/cmp/ejb-mapping/pom.xml +++ b/appserver/persistence/cmp/ejb-mapping/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/cmp/enhancer/pom.xml b/appserver/persistence/cmp/enhancer/pom.xml index afd84c243f6..45fd74cf7a2 100644 --- a/appserver/persistence/cmp/enhancer/pom.xml +++ b/appserver/persistence/cmp/enhancer/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/cmp/generator-database/pom.xml b/appserver/persistence/cmp/generator-database/pom.xml index e995f520c3e..48111fc8c26 100644 --- a/appserver/persistence/cmp/generator-database/pom.xml +++ b/appserver/persistence/cmp/generator-database/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/cmp/internal-api/pom.xml b/appserver/persistence/cmp/internal-api/pom.xml index 4ea7c328243..8dfdc34371a 100644 --- a/appserver/persistence/cmp/internal-api/pom.xml +++ b/appserver/persistence/cmp/internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/cmp/model/pom.xml b/appserver/persistence/cmp/model/pom.xml index 309ecaa2f08..aeeaefb905e 100644 --- a/appserver/persistence/cmp/model/pom.xml +++ b/appserver/persistence/cmp/model/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/cmp/pom.xml b/appserver/persistence/cmp/pom.xml index 65d7e409728..43cba724ed6 100644 --- a/appserver/persistence/cmp/pom.xml +++ b/appserver/persistence/cmp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.persistence.cmp diff --git a/appserver/persistence/cmp/support-ejb/pom.xml b/appserver/persistence/cmp/support-ejb/pom.xml index 2bdd4287782..dfcb0084d9d 100644 --- a/appserver/persistence/cmp/support-ejb/pom.xml +++ b/appserver/persistence/cmp/support-ejb/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5-SNAPSHOT + 6.2.5 cmp-support-ejb diff --git a/appserver/persistence/cmp/support-sqlstore/pom.xml b/appserver/persistence/cmp/support-sqlstore/pom.xml index b0123e5b021..65ed8009bfc 100644 --- a/appserver/persistence/cmp/support-sqlstore/pom.xml +++ b/appserver/persistence/cmp/support-sqlstore/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5-SNAPSHOT + 6.2.5 cmp-support-sqlstore diff --git a/appserver/persistence/cmp/utility/pom.xml b/appserver/persistence/cmp/utility/pom.xml index 1380045b923..69e0b57b204 100644 --- a/appserver/persistence/cmp/utility/pom.xml +++ b/appserver/persistence/cmp/utility/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/common/pom.xml b/appserver/persistence/common/pom.xml index eb65f240cab..ba33d336e1d 100644 --- a/appserver/persistence/common/pom.xml +++ b/appserver/persistence/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/eclipselink-wrapper/pom.xml b/appserver/persistence/eclipselink-wrapper/pom.xml index 9d39ef4bff7..e192520a852 100644 --- a/appserver/persistence/eclipselink-wrapper/pom.xml +++ b/appserver/persistence/eclipselink-wrapper/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/entitybean-container/pom.xml b/appserver/persistence/entitybean-container/pom.xml index adc2d985e37..fe22e7189db 100644 --- a/appserver/persistence/entitybean-container/pom.xml +++ b/appserver/persistence/entitybean-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/gf-jpa-connector/pom.xml b/appserver/persistence/gf-jpa-connector/pom.xml index fec7596c0c5..cc9e9990863 100644 --- a/appserver/persistence/gf-jpa-connector/pom.xml +++ b/appserver/persistence/gf-jpa-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/jpa-container/pom.xml b/appserver/persistence/jpa-container/pom.xml index 005de264f22..2612756e583 100644 --- a/appserver/persistence/jpa-container/pom.xml +++ b/appserver/persistence/jpa-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/persistence/oracle-jdbc-driver-packages/pom.xml b/appserver/persistence/oracle-jdbc-driver-packages/pom.xml index 343ec2be50a..b22921c08e3 100755 --- a/appserver/persistence/oracle-jdbc-driver-packages/pom.xml +++ b/appserver/persistence/oracle-jdbc-driver-packages/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5-SNAPSHOT + 6.2.5 glassfish-oracle-jdbc-driver-packages diff --git a/appserver/persistence/pom.xml b/appserver/persistence/pom.xml index 5628ac4cf93..ea3b60a1a19 100644 --- a/appserver/persistence/pom.xml +++ b/appserver/persistence/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.persistence diff --git a/appserver/pom.xml b/appserver/pom.xml index 568585ddf49..1b65f7ffa9f 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 ../nucleus/pom.xml diff --git a/appserver/resources/mail/mail-connector/pom.xml b/appserver/resources/mail/mail-connector/pom.xml index b4e9aa8840f..364712cf0cd 100644 --- a/appserver/resources/mail/mail-connector/pom.xml +++ b/appserver/resources/mail/mail-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources mail - 6.2.5-SNAPSHOT + 6.2.5 mail-connector diff --git a/appserver/resources/mail/mail-runtime/pom.xml b/appserver/resources/mail/mail-runtime/pom.xml index c1fb769616d..205d1e6e19c 100644 --- a/appserver/resources/mail/mail-runtime/pom.xml +++ b/appserver/resources/mail/mail-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources mail - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/resources/mail/pom.xml b/appserver/resources/mail/pom.xml index 3002d5110da..e99286640a5 100644 --- a/appserver/resources/mail/pom.xml +++ b/appserver/resources/mail/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources resources - 6.2.5-SNAPSHOT + 6.2.5 mail diff --git a/appserver/resources/pom.xml b/appserver/resources/pom.xml index 6356e4e1f9a..3dffb7cf42d 100644 --- a/appserver/resources/pom.xml +++ b/appserver/resources/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/resources/resources-connector/pom.xml b/appserver/resources/resources-connector/pom.xml index e11b62ee77a..2394b2017b4 100755 --- a/appserver/resources/resources-connector/pom.xml +++ b/appserver/resources/resources-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources resources - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/resources/resources-runtime/pom.xml b/appserver/resources/resources-runtime/pom.xml index 9dbff87510a..808e51c7056 100755 --- a/appserver/resources/resources-runtime/pom.xml +++ b/appserver/resources/resources-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources resources - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/security/appclient.security/pom.xml b/appserver/security/appclient.security/pom.xml index faa2fd18734..f3d3ff4607d 100644 --- a/appserver/security/appclient.security/pom.xml +++ b/appserver/security/appclient.security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5-SNAPSHOT + 6.2.5 appclient.security diff --git a/appserver/security/core-ee/pom.xml b/appserver/security/core-ee/pom.xml index 920a6ceeafa..1396c4d41b6 100644 --- a/appserver/security/core-ee/pom.xml +++ b/appserver/security/core-ee/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5-SNAPSHOT + 6.2.5 security-ee diff --git a/appserver/security/ejb.security/pom.xml b/appserver/security/ejb.security/pom.xml index ca301c78263..9bf7625ee73 100644 --- a/appserver/security/ejb.security/pom.xml +++ b/appserver/security/ejb.security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/security/jaspic-provider-framework/pom.xml b/appserver/security/jaspic-provider-framework/pom.xml index e68a87cac3b..ec422a4ce1f 100644 --- a/appserver/security/jaspic-provider-framework/pom.xml +++ b/appserver/security/jaspic-provider-framework/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/security/pom.xml b/appserver/security/pom.xml index 0788ca7129b..0d78491c2fa 100644 --- a/appserver/security/pom.xml +++ b/appserver/security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/security/security-all/pom.xml b/appserver/security/security-all/pom.xml index fd93f34335d..4c7fcfb0977 100644 --- a/appserver/security/security-all/pom.xml +++ b/appserver/security/security-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/security/webintegration/pom.xml b/appserver/security/webintegration/pom.xml index 6cd0cf4514b..9b833cde648 100644 --- a/appserver/security/webintegration/pom.xml +++ b/appserver/security/webintegration/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/security/webservices.security/pom.xml b/appserver/security/webservices.security/pom.xml index 3aa20a7a858..87e9a9a7a50 100644 --- a/appserver/security/webservices.security/pom.xml +++ b/appserver/security/webservices.security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5-SNAPSHOT + 6.2.5 webservices.security diff --git a/appserver/tests/admingui/auto-test/pom.xml b/appserver/tests/admingui/auto-test/pom.xml index d593b5ad934..bc4e107e578 100644 --- a/appserver/tests/admingui/auto-test/pom.xml +++ b/appserver/tests/admingui/auto-test/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml console-auto-tests diff --git a/appserver/tests/admingui/pom.xml b/appserver/tests/admingui/pom.xml index 69593072d95..7287a95c640 100644 --- a/appserver/tests/admingui/pom.xml +++ b/appserver/tests/admingui/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.admingui admingui - 6.2.5-SNAPSHOT + 6.2.5 pom GlassFish admingui Tests diff --git a/appserver/tests/amx/pom.xml b/appserver/tests/amx/pom.xml index 7d485285e84..504c446adb2 100755 --- a/appserver/tests/amx/pom.xml +++ b/appserver/tests/amx/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests tests - 6.2.5-SNAPSHOT + 6.2.5 4.0.0 amx-tests diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml b/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml index 00c35c463eb..2ba2f525ab5 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml +++ b/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests ant-tests - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.tests.connectors diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml index 1ec9745655a..b97ae24c9c9 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests.connectors connectors-ra-redeploy - 6.2.5-SNAPSHOT + 6.2.5 connectors-ra-redeploy-jars diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml index 556f176ccac..f146e745cce 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests ant-tests - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.tests.connectors connectors-ra-redeploy diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml index c18cfcedfb3..47e0c4f84f2 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests.connectors connectors-ra-redeploy - 6.2.5-SNAPSHOT + 6.2.5 connectors-ra-redeploy-rars-xa rar diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml index 1c04d63d2a7..29fc70c023e 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests.connectors connectors-ra-redeploy - 6.2.5-SNAPSHOT + 6.2.5 connectors-ra-redeploy-rars rar diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml index 9d20fe3f63d..2052bd6915f 100644 --- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml +++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main batch-dev-tests - 6.2.5-SNAPSHOT + 6.2.5 batch-commands-tests jar diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml index 81c8d61783e..61758cc902b 100644 --- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml +++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main batch-dev-tests - 6.2.5-SNAPSHOT + 6.2.5 batch-tests-utils jar diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml index eeb6977846c..6b6a1c6430b 100644 --- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml +++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 batch-dev-tests diff --git a/appserver/tests/appserv-tests/devtests/cdi/pom.xml b/appserver/tests/appserv-tests/devtests/cdi/pom.xml index 05f32c2d329..6e6bf93f6d2 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/pom.xml +++ b/appserver/tests/appserv-tests/devtests/cdi/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.tests tests diff --git a/appserver/tests/appserv-tests/devtests/ejb/pom.xml b/appserver/tests/appserv-tests/devtests/ejb/pom.xml index 7f079aee58f..5f81d8976ee 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/pom.xml +++ b/appserver/tests/appserv-tests/devtests/ejb/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.tests tests diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml index 04d6d9e8d78..4fef1caff0b 100644 --- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml @@ -21,7 +21,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 4.0.0 diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml index 7a9ab258ccb..93c3d2d75d9 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.jaccApi.test prog-auth - 6.2.5-SNAPSHOT + 6.2.5 jaccApi-common diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml index 90d932e7c80..1ec97e3c01f 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.jaccApi.test prog-auth - 6.2.5-SNAPSHOT + 6.2.5 pom Programmatic authentication with Jakarta Authorization api diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml index 6fcbc30c6f8..1cbcc9df070 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml @@ -23,7 +23,7 @@ org.glassfish.jaccApi.test prog-auth - 6.2.5-SNAPSHOT + 6.2.5 programmatic-authentication-jacc-api diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml index f796efec9c4..d1119bf7e20 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-bundled-ham-basic-login-config-form diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml index cedcfadedca..338689ce523 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-caller-principal diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml index e273a02e4e0..45d4ccda854 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-custom-identity-store-handler diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml index f431ddc2972..f51739fc00b 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-custom-rememberme diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml index 0c44d9e946d..462e704e24a 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-custom-session diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml index c6c46145c53..9096e3ff28b 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-custom diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml index 2a99781bfb6..b8b7dc3772e 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-db @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml index 4c3eafa637b..deab4b271ab 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-double-ham @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml index d60d8925434..31148dcbd81 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-ham-ordering @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml index ddf6efef420..dc45a6a7c7a 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-mem-basic @@ -41,7 +41,7 @@ org.glassfish.soteria.test common - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml index da3097a1292..480fc5dadb7 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-mem-form @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml index 4470a45e5af..8975df4ff53 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-multiple-store-backup @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml index e85938c3a15..06938f815b0 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-multiple-store @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml index 313c6c8565a..c4786f8fe80 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-no-application-caller-principal @@ -39,7 +39,7 @@ org.glassfish.soteria.test common - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml index f41f515f3bb..323012c58ea 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml @@ -24,7 +24,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-no-role-mapping @@ -42,7 +42,7 @@ org.glassfish.soteria.test common - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml index 06e957fb494..94cad07b8d7 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-securitycontext-auth-ejb @@ -41,7 +41,7 @@ org.glassfish.soteria.test common - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml index 104199769bc..bd2713c9020 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 app-securitycontext-auth @@ -41,7 +41,7 @@ org.glassfish.soteria.test common - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml index ef814cb30ec..b7e3e5e0faf 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 common diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml index b2a89e984da..07a6ad6632f 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.soteria.test soteria - 6.2.5-SNAPSHOT + 6.2.5 pom Soteria ${project.version} Integration tests and examples diff --git a/appserver/tests/appserv-tests/pom.xml b/appserver/tests/appserv-tests/pom.xml index 2043cc4e40a..98a1b493c7c 100644 --- a/appserver/tests/appserv-tests/pom.xml +++ b/appserver/tests/appserv-tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main.tests tests - 6.2.5-SNAPSHOT + 6.2.5 ant-tests diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml index ffd1b9b00bd..868e89a7350 100755 --- a/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi.cases multiBeansXml - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.cdi.cases.multiBeansXml ejb1 - 6.2.5-SNAPSHOT + 6.2.5 GlassFish Ejb1 With Specific beans.xml diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml index 9dff86e5728..066e5c5c3a6 100755 --- a/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi.cases multiBeansXml - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.cdi.cases.multiBeansXml ejb2 - 6.2.5-SNAPSHOT + 6.2.5 GlassFish Ejb2 With Specific beans.xml diff --git a/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml index 9e8c2d6274d..3b8709107ac 100644 --- a/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi.cases multiBeansXml - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.cdi.cases.multiBeansXml diff --git a/appserver/tests/cdi/cases/multiBeansXml/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/pom.xml index 838ffc708b9..2162638ceb3 100755 --- a/appserver/tests/cdi/cases/multiBeansXml/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.cdi cases - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.cdi.cases multiBeansXml pom - 6.2.5-SNAPSHOT + 6.2.5 GlassFish CDI MultiBeanXml Test diff --git a/appserver/tests/cdi/cases/pom.xml b/appserver/tests/cdi/cases/pom.xml index 69b1d39b481..33472413f8c 100755 --- a/appserver/tests/cdi/cases/pom.xml +++ b/appserver/tests/cdi/cases/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests cdi - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.cdi cases pom - 6.2.5-SNAPSHOT + 6.2.5 GlassFish CDI Test Cases diff --git a/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml index 52c8189d076..d6f620e6ff2 100644 --- a/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi.cases preDestroyScoping - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.cdi.cases.preDestroyScoping diff --git a/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml index f4c8ac44373..41c054d0cc7 100755 --- a/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi.cases preDestroyScoping - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.cdi.cases.preDestroyScoping lib - 6.2.5-SNAPSHOT + 6.2.5 GlassFish library for PreDestroyScoping test diff --git a/appserver/tests/cdi/cases/preDestroyScoping/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/pom.xml index 1bbb7034a94..3faea5cd8e1 100755 --- a/appserver/tests/cdi/cases/preDestroyScoping/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.cdi cases - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.cdi.cases preDestroyScoping pom - 6.2.5-SNAPSHOT + 6.2.5 GlassFish CDI PreDestroyScoping Test diff --git a/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml index 2163a623efb..56caf55968a 100644 --- a/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi.cases preDestroyScoping - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.cdi.cases.preDestroyScoping diff --git a/appserver/tests/cdi/cases/runner/pom.xml b/appserver/tests/cdi/cases/runner/pom.xml index 9136c05ef25..c60f43a1ac7 100644 --- a/appserver/tests/cdi/cases/runner/pom.xml +++ b/appserver/tests/cdi/cases/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi cases - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.cdi.cases diff --git a/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml b/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml index ec70df9cd1c..5c9243e800c 100755 --- a/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml +++ b/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi negative - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.cdi.negative normalScopeWithFinal - 6.2.5-SNAPSHOT + 6.2.5 GlassFish Normal Scoped Bean With Final Methods diff --git a/appserver/tests/cdi/negative/pom.xml b/appserver/tests/cdi/negative/pom.xml index 4a68338261a..e5a24bad181 100755 --- a/appserver/tests/cdi/negative/pom.xml +++ b/appserver/tests/cdi/negative/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests cdi - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.cdi negative pom - 6.2.5-SNAPSHOT + 6.2.5 GlassFish CDI Negative Tests diff --git a/appserver/tests/cdi/negative/runner/pom.xml b/appserver/tests/cdi/negative/runner/pom.xml index 27b164e5aea..7342b5b0e88 100644 --- a/appserver/tests/cdi/negative/runner/pom.xml +++ b/appserver/tests/cdi/negative/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi negative - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.cdi.negative diff --git a/appserver/tests/cdi/pom.xml b/appserver/tests/cdi/pom.xml index 9421d1dd3c8..dcc81493239 100755 --- a/appserver/tests/cdi/pom.xml +++ b/appserver/tests/cdi/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests tests - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests diff --git a/appserver/tests/community/pom.xml b/appserver/tests/community/pom.xml index cd348171480..33e3fdf2670 100644 --- a/appserver/tests/community/pom.xml +++ b/appserver/tests/community/pom.xml @@ -28,7 +28,7 @@ quicklook Glassfish Quicklook Bundle jar - 6.2.5-SNAPSHOT + 6.2.5 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/embedded/basic/lifecycle/pom.xml b/appserver/tests/embedded/basic/lifecycle/pom.xml index 2e3e10d3d62..8e42796adf1 100644 --- a/appserver/tests/embedded/basic/lifecycle/pom.xml +++ b/appserver/tests/embedded/basic/lifecycle/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic lifecycle - 6.2.5-SNAPSHOT + 6.2.5 Test newGlassFish(), start(), stop(), dispose() lifecyle operations diff --git a/appserver/tests/embedded/basic/pom.xml b/appserver/tests/embedded/basic/pom.xml index 3c7d1c69e0d..a700cf67586 100755 --- a/appserver/tests/embedded/basic/pom.xml +++ b/appserver/tests/embedded/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded basic - 6.2.5-SNAPSHOT + 6.2.5 pom Basic tests for testing org.glassfish.embeddable APIs diff --git a/appserver/tests/embedded/cdi_basic/pom.xml b/appserver/tests/embedded/cdi_basic/pom.xml index 7ac831ab3a6..0fbb2559861 100644 --- a/appserver/tests/embedded/cdi_basic/pom.xml +++ b/appserver/tests/embedded/cdi_basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic cdi_basic - 6.2.5-SNAPSHOT + 6.2.5 Basic CDI Test cdi_basic @@ -57,7 +57,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5-SNAPSHOT + 6.2.5 junit diff --git a/appserver/tests/embedded/cdi_ejb_jpa/pom.xml b/appserver/tests/embedded/cdi_ejb_jpa/pom.xml index 62c21c4dc1b..522ca6f0514 100644 --- a/appserver/tests/embedded/cdi_ejb_jpa/pom.xml +++ b/appserver/tests/embedded/cdi_ejb_jpa/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic cdi_ejb_jpa - 6.2.5-SNAPSHOT + 6.2.5 CDI, EJB, JPA integration test cdi_ejb_jpa diff --git a/appserver/tests/embedded/ejb/basic/pom.xml b/appserver/tests/embedded/ejb/basic/pom.xml index bcc03e8e706..1a4c7a7a1c8 100644 --- a/appserver/tests/embedded/ejb/basic/pom.xml +++ b/appserver/tests/embedded/ejb/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.ejb basic - 6.2.5-SNAPSHOT + 6.2.5 Test HelloWorld and Timer EJB deployed with org.glassfish.embeddable APIs @@ -53,7 +53,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5-SNAPSHOT + 6.2.5 diff --git a/appserver/tests/embedded/ejb/ejb-api/pom.xml b/appserver/tests/embedded/ejb/ejb-api/pom.xml index 49c4f7087d1..cb4ba54115e 100644 --- a/appserver/tests/embedded/ejb/ejb-api/pom.xml +++ b/appserver/tests/embedded/ejb/ejb-api/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.ejb ejb-api-test - 6.2.5-SNAPSHOT + 6.2.5 EJB Embedded API test @@ -57,7 +57,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5-SNAPSHOT + 6.2.5 diff --git a/appserver/tests/embedded/ejb/ejb-main/pom.xml b/appserver/tests/embedded/ejb/ejb-main/pom.xml index 6e5a9a1c166..65111278531 100644 --- a/appserver/tests/embedded/ejb/ejb-main/pom.xml +++ b/appserver/tests/embedded/ejb/ejb-main/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded ejb - 6.2.5-SNAPSHOT + 6.2.5 4.0.0 org.glassfish.tests.embedded.ejb diff --git a/appserver/tests/embedded/ejb/pom.xml b/appserver/tests/embedded/ejb/pom.xml index e05e2644cf8..7dcee0ea63d 100755 --- a/appserver/tests/embedded/ejb/pom.xml +++ b/appserver/tests/embedded/ejb/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded ejb - 6.2.5-SNAPSHOT + 6.2.5 pom EJB related Embedded Tests diff --git a/appserver/tests/embedded/ejb/remoteejb/pom.xml b/appserver/tests/embedded/ejb/remoteejb/pom.xml index 23e925a7115..31dc20ee100 100644 --- a/appserver/tests/embedded/ejb/remoteejb/pom.xml +++ b/appserver/tests/embedded/ejb/remoteejb/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.ejb remoteejb - 6.2.5-SNAPSHOT + 6.2.5 Test remote EJB deployment with org.glassfish.embeddable APIs remoteejb @@ -65,7 +65,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5-SNAPSHOT + 6.2.5 diff --git a/appserver/tests/embedded/glassfish_resources_xml/pom.xml b/appserver/tests/embedded/glassfish_resources_xml/pom.xml index 4c57f633513..16e1bfd3ab0 100644 --- a/appserver/tests/embedded/glassfish_resources_xml/pom.xml +++ b/appserver/tests/embedded/glassfish_resources_xml/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic glassfish_resources_xml - 6.2.5-SNAPSHOT + 6.2.5 CDI, EJB, JPA integration test which has glassfish-resources.xml glassfish_resources_xml diff --git a/appserver/tests/embedded/inplanted/pom.xml b/appserver/tests/embedded/inplanted/pom.xml index a06d3472f99..e545f9985db 100755 --- a/appserver/tests/embedded/inplanted/pom.xml +++ b/appserver/tests/embedded/inplanted/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 4.0.0 @@ -74,7 +74,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5-SNAPSHOT + 6.2.5 diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml index 6ad65ddae97..74e0229fd82 100644 --- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml +++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin applicationDispatcher diff --git a/appserver/tests/embedded/maven-plugin/dirListing/pom.xml b/appserver/tests/embedded/maven-plugin/dirListing/pom.xml index 87649c16fcb..7ad3d71402a 100644 --- a/appserver/tests/embedded/maven-plugin/dirListing/pom.xml +++ b/appserver/tests/embedded/maven-plugin/dirListing/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin dirListing diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml b/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml index a5ac4fbd6c1..7241a188724 100644 --- a/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml +++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin filterURIMapping diff --git a/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml b/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml index ac09b0df523..80fe7ae1fd6 100644 --- a/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml +++ b/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin getRequestURI diff --git a/appserver/tests/embedded/maven-plugin/index/pom.xml b/appserver/tests/embedded/maven-plugin/index/pom.xml index 03a288d24c5..898a2a97485 100644 --- a/appserver/tests/embedded/maven-plugin/index/pom.xml +++ b/appserver/tests/embedded/maven-plugin/index/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin index diff --git a/appserver/tests/embedded/maven-plugin/init/pom.xml b/appserver/tests/embedded/maven-plugin/init/pom.xml index a70aa634334..cbc52083718 100644 --- a/appserver/tests/embedded/maven-plugin/init/pom.xml +++ b/appserver/tests/embedded/maven-plugin/init/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin init diff --git a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml index 7940e09553d..db924152839 100644 --- a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin jmxUndeployEvent diff --git a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml index 029d2376a52..fd99e9b27b7 100644 --- a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin jsftest diff --git a/appserver/tests/embedded/maven-plugin/jsptest/pom.xml b/appserver/tests/embedded/maven-plugin/jsptest/pom.xml index 34a5094c2c2..0a8da4e437e 100644 --- a/appserver/tests/embedded/maven-plugin/jsptest/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jsptest/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin jsptest diff --git a/appserver/tests/embedded/maven-plugin/localejbs/pom.xml b/appserver/tests/embedded/maven-plugin/localejbs/pom.xml index 0c6d2dd543e..2be545b620b 100644 --- a/appserver/tests/embedded/maven-plugin/localejbs/pom.xml +++ b/appserver/tests/embedded/maven-plugin/localejbs/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin localejbs diff --git a/appserver/tests/embedded/maven-plugin/mdb/pom.xml b/appserver/tests/embedded/maven-plugin/mdb/pom.xml index 01544772369..ff9446f0fee 100644 --- a/appserver/tests/embedded/maven-plugin/mdb/pom.xml +++ b/appserver/tests/embedded/maven-plugin/mdb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin mdb diff --git a/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml b/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml index 587ec0bbf7e..ef546eb72db 100644 --- a/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml +++ b/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin multipleApps diff --git a/appserver/tests/embedded/maven-plugin/pom.xml b/appserver/tests/embedded/maven-plugin/pom.xml index 41906f252e4..7437f6134ec 100644 --- a/appserver/tests/embedded/maven-plugin/pom.xml +++ b/appserver/tests/embedded/maven-plugin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 pom GlassFish Embedded Maven Plugin Tests diff --git a/appserver/tests/embedded/maven-plugin/queryString/pom.xml b/appserver/tests/embedded/maven-plugin/queryString/pom.xml index 764507c5e11..fa9b170598a 100644 --- a/appserver/tests/embedded/maven-plugin/queryString/pom.xml +++ b/appserver/tests/embedded/maven-plugin/queryString/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin queryString diff --git a/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml b/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml index 5066815ad82..14c903d80ee 100644 --- a/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml +++ b/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin remoteejbs diff --git a/appserver/tests/embedded/maven-plugin/scattered/pom.xml b/appserver/tests/embedded/maven-plugin/scattered/pom.xml index ee93722faee..810ac0a40a5 100644 --- a/appserver/tests/embedded/maven-plugin/scattered/pom.xml +++ b/appserver/tests/embedded/maven-plugin/scattered/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish scattered diff --git a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml index 67f16ba0c15..1ff2667adee 100644 --- a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml +++ b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin securewebapp diff --git a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml index 09ef5ab171a..8a2acc57d50 100644 --- a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml +++ b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin sessionDestroyed diff --git a/appserver/tests/embedded/maven-plugin/simple/pom.xml b/appserver/tests/embedded/maven-plugin/simple/pom.xml index 058e047b206..267158ea79e 100644 --- a/appserver/tests/embedded/maven-plugin/simple/pom.xml +++ b/appserver/tests/embedded/maven-plugin/simple/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish maven-glassfish-plugin-tester-deploy diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml b/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml index 5e4c8641807..d442f6598b3 100644 --- a/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml +++ b/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin standalonewar diff --git a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml index a3103d8c0a4..ced65c8cc79 100644 --- a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml +++ b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin init diff --git a/appserver/tests/embedded/maven-plugin/webservice/pom.xml b/appserver/tests/embedded/maven-plugin/webservice/pom.xml index 5fadf596056..a878de5b830 100644 --- a/appserver/tests/embedded/maven-plugin/webservice/pom.xml +++ b/appserver/tests/embedded/maven-plugin/webservice/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin webservice diff --git a/appserver/tests/embedded/maven-plugin/websockets/pom.xml b/appserver/tests/embedded/maven-plugin/websockets/pom.xml index 4f53536d537..0a09be8850b 100644 --- a/appserver/tests/embedded/maven-plugin/websockets/pom.xml +++ b/appserver/tests/embedded/maven-plugin/websockets/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.embedded.maven-plugin websockets diff --git a/appserver/tests/embedded/mysql/pom.xml b/appserver/tests/embedded/mysql/pom.xml index 55b15521183..080a3d17afe 100644 --- a/appserver/tests/embedded/mysql/pom.xml +++ b/appserver/tests/embedded/mysql/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded mysql - 6.2.5-SNAPSHOT + 6.2.5 war Simple web application which uses mysql as database @@ -65,7 +65,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5-SNAPSHOT + 6.2.5 mysql diff --git a/appserver/tests/embedded/pom.xml b/appserver/tests/embedded/pom.xml index 2707229efeb..b6d18e9a2ce 100755 --- a/appserver/tests/embedded/pom.xml +++ b/appserver/tests/embedded/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests embedded - 6.2.5-SNAPSHOT + 6.2.5 pom GlassFish Embedded Tests diff --git a/appserver/tests/embedded/scatteredarchive/pom.xml b/appserver/tests/embedded/scatteredarchive/pom.xml index f414207b13b..1c3573c66fd 100644 --- a/appserver/tests/embedded/scatteredarchive/pom.xml +++ b/appserver/tests/embedded/scatteredarchive/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic scatteredarchive - 6.2.5-SNAPSHOT + 6.2.5 Scattered Archive Test scatteredarchive @@ -57,7 +57,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5-SNAPSHOT + 6.2.5 diff --git a/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml b/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml index 71e7f75d438..99fd09ad56d 100644 --- a/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml +++ b/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic servlet_runs_admin_cmds - 6.2.5-SNAPSHOT + 6.2.5 Servlet Running Admin Commands using org.glassfish.embeddable.CommandRunner war diff --git a/appserver/tests/embedded/static/ejb/pom.xml b/appserver/tests/embedded/static/ejb/pom.xml index a91b6583380..07664cc4b14 100755 --- a/appserver/tests/embedded/static/ejb/pom.xml +++ b/appserver/tests/embedded/static/ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded static - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml org.glassfish.tests.embedded.static diff --git a/appserver/tests/embedded/static/ejb/simple/pom.xml b/appserver/tests/embedded/static/ejb/simple/pom.xml index 53f95b69889..5421f13392c 100644 --- a/appserver/tests/embedded/static/ejb/simple/pom.xml +++ b/appserver/tests/embedded/static/ejb/simple/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded.static ejb - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml 4.0.0 @@ -44,7 +44,7 @@ org.glassfish.extras glassfish-embedded-web - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/embedded/static/pom.xml b/appserver/tests/embedded/static/pom.xml index 1bb66bb62d6..b78a052709b 100755 --- a/appserver/tests/embedded/static/pom.xml +++ b/appserver/tests/embedded/static/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml org.glassfish.tests.embedded diff --git a/appserver/tests/embedded/static/web/pom.xml b/appserver/tests/embedded/static/web/pom.xml index 2149a253e89..9e87a8efc4a 100755 --- a/appserver/tests/embedded/static/web/pom.xml +++ b/appserver/tests/embedded/static/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 4.0.0 diff --git a/appserver/tests/embedded/utils/pom.xml b/appserver/tests/embedded/utils/pom.xml index dcd004a023a..6133ad51bd6 100644 --- a/appserver/tests/embedded/utils/pom.xml +++ b/appserver/tests/embedded/utils/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.embedded @@ -33,7 +33,7 @@ org.glassfish.main.extras glassfish-embedded-shell - 6.2.5-SNAPSHOT + 6.2.5 junit diff --git a/appserver/tests/embedded/web/autodelete/pom.xml b/appserver/tests/embedded/web/autodelete/pom.xml index 99410083006..d7e7709d66e 100644 --- a/appserver/tests/embedded/web/autodelete/pom.xml +++ b/appserver/tests/embedded/web/autodelete/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded web - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/tests/embedded/web/pom.xml b/appserver/tests/embedded/web/pom.xml index 47c8c6e6f54..084d0b0dc02 100755 --- a/appserver/tests/embedded/web/pom.xml +++ b/appserver/tests/embedded/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded web pom - 6.2.5-SNAPSHOT + 6.2.5 GlassFish Web Embedded Tests web-api diff --git a/appserver/tests/embedded/web/servlet/pom.xml b/appserver/tests/embedded/web/servlet/pom.xml index 0fc6be407a2..e92dbba38bd 100644 --- a/appserver/tests/embedded/web/servlet/pom.xml +++ b/appserver/tests/embedded/web/servlet/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded web - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/appserver/tests/embedded/web/web-all/pom.xml b/appserver/tests/embedded/web/web-all/pom.xml index 84dd5ed5158..16fe056f582 100644 --- a/appserver/tests/embedded/web/web-all/pom.xml +++ b/appserver/tests/embedded/web/web-all/pom.xml @@ -28,13 +28,13 @@ - + 4.0.0 org.glassfish.tests web-all-embedded-test - 6.2.5-SNAPSHOT + 6.2.5 Test for glassfish-embedded-web @@ -118,7 +118,7 @@ org.glassfish.extras glassfish-embedded-all - 6.2.5-SNAPSHOT + 6.2.5 diff --git a/appserver/tests/embedded/web/web-api/pom.xml b/appserver/tests/embedded/web/web-api/pom.xml index fb7746860c7..1436205024a 100755 --- a/appserver/tests/embedded/web/web-api/pom.xml +++ b/appserver/tests/embedded/web/web-api/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded web-api-embedded-test war - 6.2.5-SNAPSHOT + 6.2.5 Test for glassfish-embedded-web @@ -72,7 +72,7 @@ org.glassfish.main.extras glassfish-embedded-web - 6.2.5-SNAPSHOT + 6.2.5 junit diff --git a/appserver/tests/embedded/web/web-war/pom.xml b/appserver/tests/embedded/web/web-war/pom.xml index 7771476516c..9bbf1512f69 100644 --- a/appserver/tests/embedded/web/web-war/pom.xml +++ b/appserver/tests/embedded/web/web-war/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/test/pom.xml b/appserver/tests/embedded/web/web-war/test/pom.xml index fceda0af580..821ddec445c 100644 --- a/appserver/tests/embedded/web/web-war/test/pom.xml +++ b/appserver/tests/embedded/web/web-war/test/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml @@ -139,7 +139,7 @@ org.glassfish.transaction jta - 6.2.5-SNAPSHOT + 6.2.5 test diff --git a/appserver/tests/embedded/web/web-war/war/pom.xml b/appserver/tests/embedded/web/web-war/war/pom.xml index 5ceef79101f..915e8538345 100644 --- a/appserver/tests/embedded/web/web-war/war/pom.xml +++ b/appserver/tests/embedded/web/web-war/war/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml b/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml index 1b1032bf0cc..8fa155c4aa7 100644 --- a/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml +++ b/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml b/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml index e7fd7b3aadd..1279bada47f 100644 --- a/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml +++ b/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml b/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml index 0442ed5b4f2..07f4cd57af8 100644 --- a/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml +++ b/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/tests/embedded/wrapper/pom.xml b/appserver/tests/embedded/wrapper/pom.xml index 4203e35c877..3f1598f006a 100644 --- a/appserver/tests/embedded/wrapper/pom.xml +++ b/appserver/tests/embedded/wrapper/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.test test-wrapper - 6.2.5-SNAPSHOT + 6.2.5 Embedded GlassFish Wrapper diff --git a/appserver/tests/hk2/cdi/basic/ejb1/pom.xml b/appserver/tests/hk2/cdi/basic/ejb1/pom.xml index 39bf940e100..94341682060 100644 --- a/appserver/tests/hk2/cdi/basic/ejb1/pom.xml +++ b/appserver/tests/hk2/cdi/basic/ejb1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi basic - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi.basic diff --git a/appserver/tests/hk2/cdi/basic/pom.xml b/appserver/tests/hk2/cdi/basic/pom.xml index f286ce14453..bf997104c3d 100755 --- a/appserver/tests/hk2/cdi/basic/pom.xml +++ b/appserver/tests/hk2/cdi/basic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2 cdi - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi diff --git a/appserver/tests/hk2/cdi/basic/runner/pom.xml b/appserver/tests/hk2/cdi/basic/runner/pom.xml index 2a1e51138cb..c9c6e31879b 100644 --- a/appserver/tests/hk2/cdi/basic/runner/pom.xml +++ b/appserver/tests/hk2/cdi/basic/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi basic - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi.basic diff --git a/appserver/tests/hk2/cdi/ear/app/pom.xml b/appserver/tests/hk2/cdi/ear/app/pom.xml index 72cd2fb49dc..ad354370b99 100644 --- a/appserver/tests/hk2/cdi/ear/app/pom.xml +++ b/appserver/tests/hk2/cdi/ear/app/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/ejb1/pom.xml b/appserver/tests/hk2/cdi/ear/ejb1/pom.xml index 77fec4d37c9..e8569abbf9f 100644 --- a/appserver/tests/hk2/cdi/ear/ejb1/pom.xml +++ b/appserver/tests/hk2/cdi/ear/ejb1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/ejb2/pom.xml b/appserver/tests/hk2/cdi/ear/ejb2/pom.xml index 7495f8e9f71..ef6a53b0e91 100644 --- a/appserver/tests/hk2/cdi/ear/ejb2/pom.xml +++ b/appserver/tests/hk2/cdi/ear/ejb2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/lib1/pom.xml b/appserver/tests/hk2/cdi/ear/lib1/pom.xml index a8e91f03973..65fe51ca9f0 100644 --- a/appserver/tests/hk2/cdi/ear/lib1/pom.xml +++ b/appserver/tests/hk2/cdi/ear/lib1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/pom.xml b/appserver/tests/hk2/cdi/ear/pom.xml index 8a70636528e..ee48a53d609 100755 --- a/appserver/tests/hk2/cdi/ear/pom.xml +++ b/appserver/tests/hk2/cdi/ear/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2 cdi - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi diff --git a/appserver/tests/hk2/cdi/ear/runner/pom.xml b/appserver/tests/hk2/cdi/ear/runner/pom.xml index 2cbe0c648c3..253ebd0f36d 100644 --- a/appserver/tests/hk2/cdi/ear/runner/pom.xml +++ b/appserver/tests/hk2/cdi/ear/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/war1/pom.xml b/appserver/tests/hk2/cdi/ear/war1/pom.xml index e1bc95fa480..c90421ab04c 100644 --- a/appserver/tests/hk2/cdi/ear/war1/pom.xml +++ b/appserver/tests/hk2/cdi/ear/war1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/war2/pom.xml b/appserver/tests/hk2/cdi/ear/war2/pom.xml index a7bf559884e..36c95920a69 100644 --- a/appserver/tests/hk2/cdi/ear/war2/pom.xml +++ b/appserver/tests/hk2/cdi/ear/war2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/jersey/pom.xml b/appserver/tests/hk2/cdi/jersey/pom.xml index f7ef2d85e80..55c28ad5dab 100755 --- a/appserver/tests/hk2/cdi/jersey/pom.xml +++ b/appserver/tests/hk2/cdi/jersey/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2 cdi - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi diff --git a/appserver/tests/hk2/cdi/jersey/runner/pom.xml b/appserver/tests/hk2/cdi/jersey/runner/pom.xml index ae7f837b598..847f3a0b094 100644 --- a/appserver/tests/hk2/cdi/jersey/runner/pom.xml +++ b/appserver/tests/hk2/cdi/jersey/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi jersey - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi.jersey diff --git a/appserver/tests/hk2/cdi/jersey/war/pom.xml b/appserver/tests/hk2/cdi/jersey/war/pom.xml index bcad03e389a..33ebb388eaf 100644 --- a/appserver/tests/hk2/cdi/jersey/war/pom.xml +++ b/appserver/tests/hk2/cdi/jersey/war/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.hk2.cdi jersey - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2.cdi.jersey diff --git a/appserver/tests/hk2/cdi/pom.xml b/appserver/tests/hk2/cdi/pom.xml index f54d09f63cc..cd521bb369d 100755 --- a/appserver/tests/hk2/cdi/pom.xml +++ b/appserver/tests/hk2/cdi/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests hk2 - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests.hk2 diff --git a/appserver/tests/hk2/isolation/pom.xml b/appserver/tests/hk2/isolation/pom.xml index 907e8c8eeb9..08802446b09 100755 --- a/appserver/tests/hk2/isolation/pom.xml +++ b/appserver/tests/hk2/isolation/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests hk2 - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.hk2 isolation pom - 6.2.5-SNAPSHOT + 6.2.5 GlassFish HK2 Isolation Tests diff --git a/appserver/tests/hk2/isolation/runner/pom.xml b/appserver/tests/hk2/isolation/runner/pom.xml index 0719df03804..58997ade8d9 100755 --- a/appserver/tests/hk2/isolation/runner/pom.xml +++ b/appserver/tests/hk2/isolation/runner/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.hk2 isolation - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.hk2.isolation runner jar - 6.2.5-SNAPSHOT + 6.2.5 GlassFish HK2 Isolation Test Runner diff --git a/appserver/tests/hk2/isolation/web/iso1/pom.xml b/appserver/tests/hk2/isolation/web/iso1/pom.xml index fc4ce50d4dd..4f22a6c032c 100644 --- a/appserver/tests/hk2/isolation/web/iso1/pom.xml +++ b/appserver/tests/hk2/isolation/web/iso1/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.hk2.isolation web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.hk2.isolation.web iso1 - 6.2.5-SNAPSHOT + 6.2.5 war Isolation servlet one diff --git a/appserver/tests/hk2/isolation/web/iso2/pom.xml b/appserver/tests/hk2/isolation/web/iso2/pom.xml index e6f36dd325e..b85f6bb5dea 100644 --- a/appserver/tests/hk2/isolation/web/iso2/pom.xml +++ b/appserver/tests/hk2/isolation/web/iso2/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.hk2.isolation web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.hk2.isolation.web iso2 - 6.2.5-SNAPSHOT + 6.2.5 war Isolation servlet two diff --git a/appserver/tests/hk2/isolation/web/pom.xml b/appserver/tests/hk2/isolation/web/pom.xml index 14d54181a8c..95cef2ec7a6 100755 --- a/appserver/tests/hk2/isolation/web/pom.xml +++ b/appserver/tests/hk2/isolation/web/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.hk2 isolation - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml org.glassfish.tests.hk2.isolation web pom - 6.2.5-SNAPSHOT + 6.2.5 GlassFish HK2 Isolation WebApps diff --git a/appserver/tests/hk2/pom.xml b/appserver/tests/hk2/pom.xml index 99dbdd3cf4d..135be4df7c5 100755 --- a/appserver/tests/hk2/pom.xml +++ b/appserver/tests/hk2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests tests - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests diff --git a/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml b/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml index ff46d8941cb..04cc4bdf266 100644 --- a/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml +++ b/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas appscoped-db-with-resources-xml - 6.2.5-SNAPSHOT + 6.2.5 Appscoped DB Service with glassfish-resources.xml sample war diff --git a/appserver/tests/paas/basic-bookstore-dns/pom.xml b/appserver/tests/paas/basic-bookstore-dns/pom.xml index e5886df4752..e588fb9a39e 100644 --- a/appserver/tests/paas/basic-bookstore-dns/pom.xml +++ b/appserver/tests/paas/basic-bookstore-dns/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-bookstore-dns - 6.2.5-SNAPSHOT + 6.2.5 Basic Bookstore DNS sample war diff --git a/appserver/tests/paas/basic-db-initsql/pom.xml b/appserver/tests/paas/basic-db-initsql/pom.xml index 0503c91afc8..31287a9e91f 100644 --- a/appserver/tests/paas/basic-db-initsql/pom.xml +++ b/appserver/tests/paas/basic-db-initsql/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db-initsql - 6.2.5-SNAPSHOT + 6.2.5 Basic InitSQL PaaS sample war diff --git a/appserver/tests/paas/basic-db-teardown-sql/pom.xml b/appserver/tests/paas/basic-db-teardown-sql/pom.xml index a1c54f88751..eb5ee41dab1 100644 --- a/appserver/tests/paas/basic-db-teardown-sql/pom.xml +++ b/appserver/tests/paas/basic-db-teardown-sql/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db-teardown-sql - 6.2.5-SNAPSHOT + 6.2.5 Basic DB Tear down SQL PaaS sample war diff --git a/appserver/tests/paas/basic-db-with-resources-xml/pom.xml b/appserver/tests/paas/basic-db-with-resources-xml/pom.xml index 3ed073e4783..6b4b06cd7bd 100644 --- a/appserver/tests/paas/basic-db-with-resources-xml/pom.xml +++ b/appserver/tests/paas/basic-db-with-resources-xml/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db-with-resources-xml - 6.2.5-SNAPSHOT + 6.2.5 Basic DB with glassfish-resources.xml sample war diff --git a/appserver/tests/paas/basic-db/pom.xml b/appserver/tests/paas/basic-db/pom.xml index 11e10c6749c..2a2cc5028f7 100644 --- a/appserver/tests/paas/basic-db/pom.xml +++ b/appserver/tests/paas/basic-db/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db - 6.2.5-SNAPSHOT + 6.2.5 Basic PaaS sample war diff --git a/appserver/tests/paas/basic-jpa/pom.xml b/appserver/tests/paas/basic-jpa/pom.xml index 552735ebeb3..b3a9a6f041e 100644 --- a/appserver/tests/paas/basic-jpa/pom.xml +++ b/appserver/tests/paas/basic-jpa/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-jpa - 6.2.5-SNAPSHOT + 6.2.5 Basic JPA PaaS sample war diff --git a/appserver/tests/paas/basic-service-discovery/pom.xml b/appserver/tests/paas/basic-service-discovery/pom.xml index fe2289765a3..33e3020d207 100644 --- a/appserver/tests/paas/basic-service-discovery/pom.xml +++ b/appserver/tests/paas/basic-service-discovery/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-sd - 6.2.5-SNAPSHOT + 6.2.5 Basic Service Discovery PaaS sample war diff --git a/appserver/tests/paas/basic-shared-service-test/pom.xml b/appserver/tests/paas/basic-shared-service-test/pom.xml index f57eaf29a90..2c014f2e2ed 100644 --- a/appserver/tests/paas/basic-shared-service-test/pom.xml +++ b/appserver/tests/paas/basic-shared-service-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-shared-service-test - 6.2.5-SNAPSHOT + 6.2.5 Basic Shared Sevice Test war diff --git a/appserver/tests/paas/basic/pom.xml b/appserver/tests/paas/basic/pom.xml index 494b1aaaf79..4a7ce54d031 100644 --- a/appserver/tests/paas/basic/pom.xml +++ b/appserver/tests/paas/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic - 6.2.5-SNAPSHOT + 6.2.5 Basic PaaS sample war diff --git a/appserver/tests/paas/bookstore/pom.xml b/appserver/tests/paas/bookstore/pom.xml index a83956b40cb..7d95043c2f1 100644 --- a/appserver/tests/paas/bookstore/pom.xml +++ b/appserver/tests/paas/bookstore/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas bookstore - 6.2.5-SNAPSHOT + 6.2.5 Bookstore PaaS sample war diff --git a/appserver/tests/paas/deployment-rollback/pom.xml b/appserver/tests/paas/deployment-rollback/pom.xml index a05067788c3..912a0d79f34 100644 --- a/appserver/tests/paas/deployment-rollback/pom.xml +++ b/appserver/tests/paas/deployment-rollback/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas rollback-test - 6.2.5-SNAPSHOT + 6.2.5 Deployment Rollback Test war diff --git a/appserver/tests/paas/enable-disable-test/pom.xml b/appserver/tests/paas/enable-disable-test/pom.xml index 84ee7c5b759..0789a141895 100644 --- a/appserver/tests/paas/enable-disable-test/pom.xml +++ b/appserver/tests/paas/enable-disable-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas enable-disable-test - 6.2.5-SNAPSHOT + 6.2.5 Enable Disable Test war diff --git a/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml b/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml index 8e4282ae650..1692853ea0a 100644 --- a/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml +++ b/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas ext-shared-service-enable-disable-test - 6.2.5-SNAPSHOT + 6.2.5 Enable Disable External and Shared Service Test war diff --git a/appserver/tests/paas/external-and-shared-service/pom.xml b/appserver/tests/paas/external-and-shared-service/pom.xml index 46bb43bd1df..7d235e0875d 100644 --- a/appserver/tests/paas/external-and-shared-service/pom.xml +++ b/appserver/tests/paas/external-and-shared-service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas external-and-shared-service-test - 6.2.5-SNAPSHOT + 6.2.5 External and Shared Service Test war diff --git a/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml b/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml index b59d6279d21..8a8874cb9e7 100644 --- a/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml +++ b/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main paas.plugins - 6.2.5-SNAPSHOT + 6.2.5 4.0.0 generatederbyvm diff --git a/appserver/tests/paas/external-db-service/pom.xml b/appserver/tests/paas/external-db-service/pom.xml index 94493e58eff..a8115908647 100644 --- a/appserver/tests/paas/external-db-service/pom.xml +++ b/appserver/tests/paas/external-db-service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas external-service-test - 6.2.5-SNAPSHOT + 6.2.5 External DB Service TesT pom diff --git a/appserver/tests/paas/external-db-service/test/pom.xml b/appserver/tests/paas/external-db-service/test/pom.xml index 575f1d5d745..e952d64b60c 100644 --- a/appserver/tests/paas/external-db-service/test/pom.xml +++ b/appserver/tests/paas/external-db-service/test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas external-db-service-test - 6.2.5-SNAPSHOT + 6.2.5 External DB Service PaaS application war diff --git a/appserver/tests/paas/helloworld/pom.xml b/appserver/tests/paas/helloworld/pom.xml index 339c2c993fa..2f89adbb1c8 100644 --- a/appserver/tests/paas/helloworld/pom.xml +++ b/appserver/tests/paas/helloworld/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas helloworld - 6.2.5-SNAPSHOT + 6.2.5 PaaS Hello World sample war diff --git a/appserver/tests/paas/javaee_shared_service/pom.xml b/appserver/tests/paas/javaee_shared_service/pom.xml index 7f8ddf5876c..86be48a2512 100644 --- a/appserver/tests/paas/javaee_shared_service/pom.xml +++ b/appserver/tests/paas/javaee_shared_service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas bookstore2 - 6.2.5-SNAPSHOT + 6.2.5 Bookstore PaaS sample running on Java EE (GlassFish) shared service. war diff --git a/appserver/tests/paas/lazy-shared-service-test/pom.xml b/appserver/tests/paas/lazy-shared-service-test/pom.xml index 46cc5d19bab..68323ebccbd 100644 --- a/appserver/tests/paas/lazy-shared-service-test/pom.xml +++ b/appserver/tests/paas/lazy-shared-service-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas lazy-shared-service-test - 6.2.5-SNAPSHOT + 6.2.5 Lazy Shared Service PaaS sample war diff --git a/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml b/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml index 2826e5b79d9..ca63c7406ac 100644 --- a/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml +++ b/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas mq-test - 6.2.5-SNAPSHOT + 6.2.5 MQ Shared Service Test jar diff --git a/appserver/tests/paas/mq-shared-service-test/pom.xml b/appserver/tests/paas/mq-shared-service-test/pom.xml index fcb0b928d6a..f07e0932eca 100644 --- a/appserver/tests/paas/mq-shared-service-test/pom.xml +++ b/appserver/tests/paas/mq-shared-service-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas mq-shared-service-test - 6.2.5-SNAPSHOT + 6.2.5 MQ Shared Service TesT pom diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml b/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml index cab6e735f92..d28a11c2502 100644 --- a/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml +++ b/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-app-scoped-service-test-advanced - 6.2.5-SNAPSHOT + 6.2.5 Multiple Application Scoped Database Services Advanced PaaS Application war diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml b/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml index 898d15357a4..dd2f75fd4e9 100644 --- a/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml +++ b/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-app-scoped-service-test-basic - 6.2.5-SNAPSHOT + 6.2.5 Multiple Application Scoped Database Services Basic PaaS Application war diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml b/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml index 45078b8c459..39a33117108 100644 --- a/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml +++ b/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-db-app-scoped-services - 6.2.5-SNAPSHOT + 6.2.5 Multiple DB App Scoped Services pom diff --git a/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml b/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml index 343c248acfe..bef625e3a3e 100644 --- a/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml +++ b/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-shared-db-service-test - 6.2.5-SNAPSHOT + 6.2.5 Multiple Shared DB service PaaS application war diff --git a/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml b/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml index f8f1615e1fb..4d8fd03974e 100644 --- a/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml +++ b/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-shared-db-service-test-basic - 6.2.5-SNAPSHOT + 6.2.5 Multiple Shared DB service Basic PaaS application war diff --git a/appserver/tests/paas/multiple-db-shared-services/pom.xml b/appserver/tests/paas/multiple-db-shared-services/pom.xml index 1a16b9e29e1..f8d0ee217c6 100644 --- a/appserver/tests/paas/multiple-db-shared-services/pom.xml +++ b/appserver/tests/paas/multiple-db-shared-services/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-db-shared-services - 6.2.5-SNAPSHOT + 6.2.5 Multiple DB Shared Services pom diff --git a/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml b/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml index 4bdde78cfb8..9fd0defe904 100644 --- a/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml +++ b/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml @@ -22,13 +22,13 @@ org.glassfish paas.plugins - 6.2.5-SNAPSHOT + 6.2.5 4.0.0 org.glassfish paas.mydbplugin - 6.2.5-SNAPSHOT + 6.2.5 MyDB Plugin diff --git a/appserver/tests/paas/multiple-spe-test/pom.xml b/appserver/tests/paas/multiple-spe-test/pom.xml index 6ec4f927b48..66460a611d7 100644 --- a/appserver/tests/paas/multiple-spe-test/pom.xml +++ b/appserver/tests/paas/multiple-spe-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-spe-test - 6.2.5-SNAPSHOT + 6.2.5 Multiple SPE TesT pom diff --git a/appserver/tests/paas/multiple-spe-test/spetest/pom.xml b/appserver/tests/paas/multiple-spe-test/spetest/pom.xml index cc09b29a5a9..22931ef79f6 100644 --- a/appserver/tests/paas/multiple-spe-test/spetest/pom.xml +++ b/appserver/tests/paas/multiple-spe-test/spetest/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-spe-test - 6.2.5-SNAPSHOT + 6.2.5 Basic SPE Test war diff --git a/appserver/tests/paas/pom.xml b/appserver/tests/paas/pom.xml index 085dc71f043..04b4cd99a55 100644 --- a/appserver/tests/paas/pom.xml +++ b/appserver/tests/paas/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests paas - 6.2.5-SNAPSHOT + 6.2.5 PaaS samples pom diff --git a/appserver/tests/paas/scale_service/pom.xml b/appserver/tests/paas/scale_service/pom.xml index 13d773f9216..5fcff339153 100644 --- a/appserver/tests/paas/scale_service/pom.xml +++ b/appserver/tests/paas/scale_service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas scale_service - 6.2.5-SNAPSHOT + 6.2.5 Scale Service PaaS sample war diff --git a/appserver/tests/paas/service_metadata/custom_db_name/pom.xml b/appserver/tests/paas/service_metadata/custom_db_name/pom.xml index 3cf621f9a66..1e83a5efa64 100644 --- a/appserver/tests/paas/service_metadata/custom_db_name/pom.xml +++ b/appserver/tests/paas/service_metadata/custom_db_name/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas custom_db_name - 6.2.5-SNAPSHOT + 6.2.5 Custom DB Name PaaS sample war diff --git a/appserver/tests/paas/service_metadata/pom.xml b/appserver/tests/paas/service_metadata/pom.xml index 2ea1af41dfe..f81b4856c02 100644 --- a/appserver/tests/paas/service_metadata/pom.xml +++ b/appserver/tests/paas/service_metadata/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas service_metadata - 6.2.5-SNAPSHOT + 6.2.5 Service Metadata PaaS samples pom diff --git a/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml b/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml index b65b5cbaaac..8f87931fabe 100644 --- a/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml +++ b/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas service_metadata.provision_using_specified_template - 6.2.5-SNAPSHOT + 6.2.5 Provision service(s) using specified template war diff --git a/appserver/tests/pom.xml b/appserver/tests/pom.xml index 86113426fe3..5e69a31ad7e 100755 --- a/appserver/tests/pom.xml +++ b/appserver/tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.tests diff --git a/appserver/tests/quicklook/admin/pom.xml b/appserver/tests/quicklook/admin/pom.xml index 108167cafc0..223653ce4a0 100644 --- a/appserver/tests/quicklook/admin/pom.xml +++ b/appserver/tests/quicklook/admin/pom.xml @@ -26,7 +26,7 @@ org.glassfish.quicklook quicklook - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml Runs the tests on admin/asadmin code diff --git a/appserver/tests/quicklook/adminconsole/pom.xml b/appserver/tests/quicklook/adminconsole/pom.xml index df94b55fba0..8c8995bea2a 100644 --- a/appserver/tests/quicklook/adminconsole/pom.xml +++ b/appserver/tests/quicklook/adminconsole/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.quicklook adminconsole - 6.2.5-SNAPSHOT + 6.2.5 Admin Console Quicklook Tests jar @@ -101,7 +101,7 @@ org.glassfish.common amx-core - 6.2.5-SNAPSHOT + 6.2.5 diff --git a/appserver/tests/quicklook/amx/pom.xml b/appserver/tests/quicklook/amx/pom.xml index 72dde0749d1..c7622d082bc 100644 --- a/appserver/tests/quicklook/amx/pom.xml +++ b/appserver/tests/quicklook/amx/pom.xml @@ -26,7 +26,7 @@ org.glassfish.quicklook quicklook - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml Runs the tests on admin/asadmin code diff --git a/appserver/tests/quicklook/ejb/cmp/pom.xml b/appserver/tests/quicklook/ejb/cmp/pom.xml index 59236b0762f..374fd09dab0 100644 --- a/appserver/tests/quicklook/ejb/cmp/pom.xml +++ b/appserver/tests/quicklook/ejb/cmp/pom.xml @@ -28,7 +28,7 @@ cmp_quicklook CMP Roster App Quicklook jar - 6.2.5-SNAPSHOT + 6.2.5 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/embedded/pom.xml b/appserver/tests/quicklook/ejb/embedded/pom.xml index 519fa4beb98..5e224baf11a 100644 --- a/appserver/tests/quicklook/ejb/embedded/pom.xml +++ b/appserver/tests/quicklook/ejb/embedded/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.5-SNAPSHOT + 6.2.5 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/remoteview/pom.xml b/appserver/tests/quicklook/ejb/remoteview/pom.xml index 519fa4beb98..5e224baf11a 100644 --- a/appserver/tests/quicklook/ejb/remoteview/pom.xml +++ b/appserver/tests/quicklook/ejb/remoteview/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.5-SNAPSHOT + 6.2.5 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/sfulnoi/pom.xml b/appserver/tests/quicklook/ejb/sfulnoi/pom.xml index 519fa4beb98..5e224baf11a 100644 --- a/appserver/tests/quicklook/ejb/sfulnoi/pom.xml +++ b/appserver/tests/quicklook/ejb/sfulnoi/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.5-SNAPSHOT + 6.2.5 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/singleton/pom.xml b/appserver/tests/quicklook/ejb/singleton/pom.xml index 519fa4beb98..5e224baf11a 100644 --- a/appserver/tests/quicklook/ejb/singleton/pom.xml +++ b/appserver/tests/quicklook/ejb/singleton/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.5-SNAPSHOT + 6.2.5 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml b/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml index 519fa4beb98..5e224baf11a 100644 --- a/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml +++ b/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.5-SNAPSHOT + 6.2.5 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/jms/injection/pom.xml b/appserver/tests/quicklook/jms/injection/pom.xml index 60d3e105fa8..e036a69c459 100644 --- a/appserver/tests/quicklook/jms/injection/pom.xml +++ b/appserver/tests/quicklook/jms/injection/pom.xml @@ -28,7 +28,7 @@ injection_quicklook Glassfish JMS Injection Quicklook jar - 6.2.5-SNAPSHOT + 6.2.5 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/pom.xml b/appserver/tests/quicklook/pom.xml index 49f99f20946..e9f7fd7cf7f 100644 --- a/appserver/tests/quicklook/pom.xml +++ b/appserver/tests/quicklook/pom.xml @@ -29,7 +29,7 @@ quicklook Glassfish Quicklook Bundle jar - 6.2.5-SNAPSHOT + 6.2.5 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/rest/pom.xml b/appserver/tests/quicklook/rest/pom.xml index 62084098c65..3727b9da7e7 100644 --- a/appserver/tests/quicklook/rest/pom.xml +++ b/appserver/tests/quicklook/rest/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.quicklook rest - 6.2.5-SNAPSHOT + 6.2.5 REST API Quicklook Tests jar diff --git a/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml b/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml index 51dc5a850a5..907f57ac6e6 100644 --- a/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml +++ b/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml @@ -28,7 +28,7 @@ wsit_quicklook Glassfish Web Services Quicklook jar - 6.2.5-SNAPSHOT + 6.2.5 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/wsit/jsr109tester/pom.xml b/appserver/tests/quicklook/wsit/jsr109tester/pom.xml index d5874890ba1..1aa8659d9e3 100644 --- a/appserver/tests/quicklook/wsit/jsr109tester/pom.xml +++ b/appserver/tests/quicklook/wsit/jsr109tester/pom.xml @@ -29,7 +29,7 @@ wsit_quicklook Glassfish Web Services Quicklook jar - 6.2.5-SNAPSHOT + 6.2.5 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/sse/basic/pom.xml b/appserver/tests/sse/basic/pom.xml index 73030f3131f..945e7dc7a41 100644 --- a/appserver/tests/sse/basic/pom.xml +++ b/appserver/tests/sse/basic/pom.xml @@ -37,7 +37,7 @@ org.glassfish.main.web web-sse - 6.2.5-SNAPSHOT + 6.2.5 provided diff --git a/appserver/tests/sse/videoplayer/pom.xml b/appserver/tests/sse/videoplayer/pom.xml index d9d0f1af510..30000521793 100644 --- a/appserver/tests/sse/videoplayer/pom.xml +++ b/appserver/tests/sse/videoplayer/pom.xml @@ -37,7 +37,7 @@ org.glassfish.main.web web-sse - 6.2.5-SNAPSHOT + 6.2.5 provided diff --git a/appserver/tests/tck/authentication/pom.xml b/appserver/tests/tck/authentication/pom.xml index 48606e8d46c..fbdf29ccd22 100644 --- a/appserver/tests/tck/authentication/pom.xml +++ b/appserver/tests/tck/authentication/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.5-SNAPSHOT + 6.2.5 glassfish-external-tck-authentication diff --git a/appserver/tests/tck/authorization/pom.xml b/appserver/tests/tck/authorization/pom.xml index d5862077754..39f5f51e52c 100644 --- a/appserver/tests/tck/authorization/pom.xml +++ b/appserver/tests/tck/authorization/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.5-SNAPSHOT + 6.2.5 glassfish-external-tck-authorization diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml index 94e2f66b552..5678616fa7e 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck embedded-ejb-smoke - 6.2.5-SNAPSHOT + 6.2.5 ejb-lite-basic diff --git a/appserver/tests/tck/embedded_ejb_smoke/pom.xml b/appserver/tests/tck/embedded_ejb_smoke/pom.xml index 407982068f4..c731b5a3fe0 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/pom.xml +++ b/appserver/tests/tck/embedded_ejb_smoke/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.5-SNAPSHOT + 6.2.5 embedded-ejb-smoke diff --git a/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml b/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml index d115e7f5cd6..c0ec0306469 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml +++ b/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck embedded-ejb-smoke - 6.2.5-SNAPSHOT + 6.2.5 embedded-ejb-smoke-runner diff --git a/appserver/tests/tck/faces/pom.xml b/appserver/tests/tck/faces/pom.xml index 7e7c2d2e5c2..cf1594e5d63 100644 --- a/appserver/tests/tck/faces/pom.xml +++ b/appserver/tests/tck/faces/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.5-SNAPSHOT + 6.2.5 glassfish-external-tck-faces diff --git a/appserver/tests/tck/pom.xml b/appserver/tests/tck/pom.xml index f4bbffd1b14..0cf8739c600 100644 --- a/appserver/tests/tck/pom.xml +++ b/appserver/tests/tck/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests tests - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.tests.tck diff --git a/appserver/tests/tck/rest/pom.xml b/appserver/tests/tck/rest/pom.xml index cadddeb4090..8521cb785be 100644 --- a/appserver/tests/tck/rest/pom.xml +++ b/appserver/tests/tck/rest/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.5-SNAPSHOT + 6.2.5 glassfish-external-tck-rest diff --git a/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml index ad95a1fcbe7..32d88e83d66 100644 --- a/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5-SNAPSHOT + 6.2.5 jakarta-authentication-tck diff --git a/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml index c9fbaf10b9e..7065160db22 100644 --- a/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5-SNAPSHOT + 6.2.5 jakarta-authorization-tck diff --git a/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml index 2d8aeda4e6c..57e8b958d41 100644 --- a/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5-SNAPSHOT + 6.2.5 jakarta-faces-tck diff --git a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml index 5b938dc7386..15deb9965ef 100644 --- a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5-SNAPSHOT + 6.2.5 jakarta-rest-tck diff --git a/appserver/tests/tck/tck-download/javatest/pom.xml b/appserver/tests/tck/tck-download/javatest/pom.xml index 363415d8fd4..7b794196826 100644 --- a/appserver/tests/tck/tck-download/javatest/pom.xml +++ b/appserver/tests/tck/tck-download/javatest/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5-SNAPSHOT + 6.2.5 javatest diff --git a/appserver/tests/tck/tck-download/pom.xml b/appserver/tests/tck/tck-download/pom.xml index 3550a122110..549727197a7 100644 --- a/appserver/tests/tck/tck-download/pom.xml +++ b/appserver/tests/tck/tck-download/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main.tests.tck tck - 6.2.5-SNAPSHOT + 6.2.5 tck-download diff --git a/appserver/tests/tck/tck-download/tsharness/pom.xml b/appserver/tests/tck/tck-download/tsharness/pom.xml index 1a7244492ce..fd70f4981e1 100644 --- a/appserver/tests/tck/tck-download/tsharness/pom.xml +++ b/appserver/tests/tck/tck-download/tsharness/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5-SNAPSHOT + 6.2.5 tsharness diff --git a/appserver/transaction/internal-api/pom.xml b/appserver/transaction/internal-api/pom.xml index d8bdff735e8..2e24f5e0a3f 100644 --- a/appserver/transaction/internal-api/pom.xml +++ b/appserver/transaction/internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.transaction transaction - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/transaction/jta/pom.xml b/appserver/transaction/jta/pom.xml index 2268a66cf48..1995bcae066 100644 --- a/appserver/transaction/jta/pom.xml +++ b/appserver/transaction/jta/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.transaction transaction - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/transaction/jts/pom.xml b/appserver/transaction/jts/pom.xml index e2cce4cdbe4..b452791c0f3 100644 --- a/appserver/transaction/jts/pom.xml +++ b/appserver/transaction/jts/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.transaction transaction - 6.2.5-SNAPSHOT + 6.2.5 jts diff --git a/appserver/transaction/pom.xml b/appserver/transaction/pom.xml index 758a3c791d0..de576741347 100644 --- a/appserver/transaction/pom.xml +++ b/appserver/transaction/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/admin/pom.xml b/appserver/web/admin/pom.xml index 2c4181596ad..5cba3d921a1 100644 --- a/appserver/web/admin/pom.xml +++ b/appserver/web/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/cdi-api-fragment/pom.xml b/appserver/web/cdi-api-fragment/pom.xml index 8fc30c8ee7d..2d6037c3b3a 100644 --- a/appserver/web/cdi-api-fragment/pom.xml +++ b/appserver/web/cdi-api-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/gf-web-connector/pom.xml b/appserver/web/gf-web-connector/pom.xml index 2299177411e..b8da43e6353 100755 --- a/appserver/web/gf-web-connector/pom.xml +++ b/appserver/web/gf-web-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/gf-weld-connector/pom.xml b/appserver/web/gf-weld-connector/pom.xml index 8a4c6d7b634..f815b2bd06f 100644 --- a/appserver/web/gf-weld-connector/pom.xml +++ b/appserver/web/gf-weld-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/gui-plugin-common/pom.xml b/appserver/web/gui-plugin-common/pom.xml index bb1a4ed68bb..e4e9a14d92f 100755 --- a/appserver/web/gui-plugin-common/pom.xml +++ b/appserver/web/gui-plugin-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/jersey-ejb-component-provider/pom.xml b/appserver/web/jersey-ejb-component-provider/pom.xml index afd7acf99c7..887ab7b71c1 100644 --- a/appserver/web/jersey-ejb-component-provider/pom.xml +++ b/appserver/web/jersey-ejb-component-provider/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 jersey-ejb-component-provider diff --git a/appserver/web/jersey-mvc-connector/pom.xml b/appserver/web/jersey-mvc-connector/pom.xml index 016cbccc755..31d03b9bc00 100644 --- a/appserver/web/jersey-mvc-connector/pom.xml +++ b/appserver/web/jersey-mvc-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/jsf-connector/pom.xml b/appserver/web/jsf-connector/pom.xml index 2c90dee9c3d..5a1f6f42114 100644 --- a/appserver/web/jsf-connector/pom.xml +++ b/appserver/web/jsf-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/jspcaching-connector/pom.xml b/appserver/web/jspcaching-connector/pom.xml index a17aaa4468a..2399ada3473 100644 --- a/appserver/web/jspcaching-connector/pom.xml +++ b/appserver/web/jspcaching-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/jstl-connector/pom.xml b/appserver/web/jstl-connector/pom.xml index 03ff6ad7d4c..155f5b51db0 100644 --- a/appserver/web/jstl-connector/pom.xml +++ b/appserver/web/jstl-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/pom.xml b/appserver/web/pom.xml index 0c7a545e047..f6b398f5db3 100755 --- a/appserver/web/pom.xml +++ b/appserver/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/war-util/pom.xml b/appserver/web/war-util/pom.xml index 86ce59df311..a9e2928a97a 100755 --- a/appserver/web/war-util/pom.xml +++ b/appserver/web/war-util/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/web-core/pom.xml b/appserver/web/web-core/pom.xml index 46a15877f5d..cdaa92fb3c9 100755 --- a/appserver/web/web-core/pom.xml +++ b/appserver/web/web-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/web-embed/api/pom.xml b/appserver/web/web-embed/api/pom.xml index 95b5260d1d9..30b72b192e9 100755 --- a/appserver/web/web-embed/api/pom.xml +++ b/appserver/web/web-embed/api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web-embed - 6.2.5-SNAPSHOT + 6.2.5 web-embed-api diff --git a/appserver/web/web-embed/pom.xml b/appserver/web/web-embed/pom.xml index ac23e7bb151..37f3f3a230b 100755 --- a/appserver/web/web-embed/pom.xml +++ b/appserver/web/web-embed/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/web-glue/pom.xml b/appserver/web/web-glue/pom.xml index e80a5e3220b..835c6bd4536 100755 --- a/appserver/web/web-glue/pom.xml +++ b/appserver/web/web-glue/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/web-ha/pom.xml b/appserver/web/web-ha/pom.xml index 3126a6b8edc..8742a0c6e8b 100755 --- a/appserver/web/web-ha/pom.xml +++ b/appserver/web/web-ha/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/web-naming/pom.xml b/appserver/web/web-naming/pom.xml index 9f0f2a38e66..00c9f1dd4a1 100755 --- a/appserver/web/web-naming/pom.xml +++ b/appserver/web/web-naming/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/web-sse/pom.xml b/appserver/web/web-sse/pom.xml index dffc60aaefb..24cb9b672ab 100755 --- a/appserver/web/web-sse/pom.xml +++ b/appserver/web/web-sse/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/webtier-all/pom.xml b/appserver/web/webtier-all/pom.xml index 3be7e0edf99..6f60cfe15b0 100755 --- a/appserver/web/webtier-all/pom.xml +++ b/appserver/web/webtier-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/weld-integration-fragment/pom.xml b/appserver/web/weld-integration-fragment/pom.xml index 33389d60635..845c44c4d17 100644 --- a/appserver/web/weld-integration-fragment/pom.xml +++ b/appserver/web/weld-integration-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 weld-integration-fragment diff --git a/appserver/web/weld-integration-test-fragment/pom.xml b/appserver/web/weld-integration-test-fragment/pom.xml index a98ae8953b5..cdb3d9ca9eb 100644 --- a/appserver/web/weld-integration-test-fragment/pom.xml +++ b/appserver/web/weld-integration-test-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml index fd388dd4923..6acbd1ebd31 100644 --- a/appserver/web/weld-integration/pom.xml +++ b/appserver/web/weld-integration/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/webservices/connector/pom.xml b/appserver/webservices/connector/pom.xml index e497ee7cc1c..810c8457fae 100755 --- a/appserver/webservices/connector/pom.xml +++ b/appserver/webservices/connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5-SNAPSHOT + 6.2.5 webservices-connector diff --git a/appserver/webservices/jsr109-impl/pom.xml b/appserver/webservices/jsr109-impl/pom.xml index e44fe6f0104..defc5d6f2d5 100755 --- a/appserver/webservices/jsr109-impl/pom.xml +++ b/appserver/webservices/jsr109-impl/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5-SNAPSHOT + 6.2.5 jsr109-impl diff --git a/appserver/webservices/metro-fragments/pom.xml b/appserver/webservices/metro-fragments/pom.xml index 1938a06ccdb..a24a2063241 100644 --- a/appserver/webservices/metro-fragments/pom.xml +++ b/appserver/webservices/metro-fragments/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5-SNAPSHOT + 6.2.5 metro-fragments diff --git a/appserver/webservices/metro-glue/pom.xml b/appserver/webservices/metro-glue/pom.xml index d9fdc2594f4..fff3b4cda43 100644 --- a/appserver/webservices/metro-glue/pom.xml +++ b/appserver/webservices/metro-glue/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/webservices/pom.xml b/appserver/webservices/pom.xml index ebfdf0bf4ad..b518ea8fa7c 100755 --- a/appserver/webservices/pom.xml +++ b/appserver/webservices/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/webservices/soap-tcp/pom.xml b/appserver/webservices/soap-tcp/pom.xml index f8f8f2434b8..d7d875ca208 100755 --- a/appserver/webservices/soap-tcp/pom.xml +++ b/appserver/webservices/soap-tcp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/appserver/webservices/webservices-scripts/pom.xml b/appserver/webservices/webservices-scripts/pom.xml index a57fe03056d..06ef6deea2c 100644 --- a/appserver/webservices/webservices-scripts/pom.xml +++ b/appserver/webservices/webservices-scripts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5-SNAPSHOT + 6.2.5 webservices-scripts diff --git a/docs/add-on-component-development-guide/pom.xml b/docs/add-on-component-development-guide/pom.xml index bb6b8683023..a7c69291a84 100644 --- a/docs/add-on-component-development-guide/pom.xml +++ b/docs/add-on-component-development-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/administration-guide/pom.xml b/docs/administration-guide/pom.xml index 5957d8f6ac7..715beaa1789 100644 --- a/docs/administration-guide/pom.xml +++ b/docs/administration-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/application-deployment-guide/pom.xml b/docs/application-deployment-guide/pom.xml index e174f2ee25e..6784e7656d2 100644 --- a/docs/application-deployment-guide/pom.xml +++ b/docs/application-deployment-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/application-development-guide/pom.xml b/docs/application-development-guide/pom.xml index e5eb06743d2..e5adc8e21b1 100644 --- a/docs/application-development-guide/pom.xml +++ b/docs/application-development-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/deployment-planning-guide/pom.xml b/docs/deployment-planning-guide/pom.xml index 4932db55d91..2eff842f273 100644 --- a/docs/deployment-planning-guide/pom.xml +++ b/docs/deployment-planning-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/distribution/pom.xml b/docs/distribution/pom.xml index fb800f05d01..76cbe7f59ec 100644 --- a/docs/distribution/pom.xml +++ b/docs/distribution/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.docs distribution diff --git a/docs/embedded-server-guide/pom.xml b/docs/embedded-server-guide/pom.xml index 0e054b7eb69..9fca9b4838d 100644 --- a/docs/embedded-server-guide/pom.xml +++ b/docs/embedded-server-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/error-messages-reference/pom.xml b/docs/error-messages-reference/pom.xml index 55d82123e36..8105d42bb12 100644 --- a/docs/error-messages-reference/pom.xml +++ b/docs/error-messages-reference/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/ha-administration-guide/pom.xml b/docs/ha-administration-guide/pom.xml index 9acc652b883..ba8edb769bc 100644 --- a/docs/ha-administration-guide/pom.xml +++ b/docs/ha-administration-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/installation-guide/pom.xml b/docs/installation-guide/pom.xml index b95cbbd68fb..314a632d093 100644 --- a/docs/installation-guide/pom.xml +++ b/docs/installation-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/parent/pom.xml b/docs/parent/pom.xml index 35201e5d4a8..57d25b04171 100644 --- a/docs/parent/pom.xml +++ b/docs/parent/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.docs parent diff --git a/docs/performance-tuning-guide/pom.xml b/docs/performance-tuning-guide/pom.xml index 9771fd51a63..a9fb66065d7 100644 --- a/docs/performance-tuning-guide/pom.xml +++ b/docs/performance-tuning-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/pom.xml b/docs/pom.xml index ea6d3230921..f0309974b65 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 ../nucleus/parent org.glassfish.docs diff --git a/docs/publish/pom.xml b/docs/publish/pom.xml index 4f0a7f5a348..019689afda9 100644 --- a/docs/publish/pom.xml +++ b/docs/publish/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.docs publish diff --git a/docs/quick-start-guide/pom.xml b/docs/quick-start-guide/pom.xml index 58117178223..975a47a40ad 100644 --- a/docs/quick-start-guide/pom.xml +++ b/docs/quick-start-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/reference-manual/pom.xml b/docs/reference-manual/pom.xml index dcb68c92c40..c81fad50b6a 100644 --- a/docs/reference-manual/pom.xml +++ b/docs/reference-manual/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/release-notes/pom.xml b/docs/release-notes/pom.xml index 3fcce1dad8a..8e0709e9d2e 100644 --- a/docs/release-notes/pom.xml +++ b/docs/release-notes/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/security-guide/pom.xml b/docs/security-guide/pom.xml index 35324861a75..141f766a793 100644 --- a/docs/security-guide/pom.xml +++ b/docs/security-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/troubleshooting-guide/pom.xml b/docs/troubleshooting-guide/pom.xml index d821276b7d5..ca22fa8f7d3 100644 --- a/docs/troubleshooting-guide/pom.xml +++ b/docs/troubleshooting-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/upgrade-guide/pom.xml b/docs/upgrade-guide/pom.xml index 879d93d9ef3..1c769271c53 100644 --- a/docs/upgrade-guide/pom.xml +++ b/docs/upgrade-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent org.glassfish.docs diff --git a/docs/website/pom.xml b/docs/website/pom.xml index 3ec623bc791..58389d46261 100644 --- a/docs/website/pom.xml +++ b/docs/website/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.docs website diff --git a/nucleus/admin/cli/pom.xml b/nucleus/admin/cli/pom.xml index e920dcf8e37..ed8d7f44f00 100755 --- a/nucleus/admin/cli/pom.xml +++ b/nucleus/admin/cli/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5-SNAPSHOT + 6.2.5 admin-cli diff --git a/nucleus/admin/config-api/pom.xml b/nucleus/admin/config-api/pom.xml index 946ac2ad257..fddfd99bf0d 100644 --- a/nucleus/admin/config-api/pom.xml +++ b/nucleus/admin/config-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5-SNAPSHOT + 6.2.5 config-api diff --git a/nucleus/admin/launcher/pom.xml b/nucleus/admin/launcher/pom.xml index 01ec0e2665e..8230cc892e5 100644 --- a/nucleus/admin/launcher/pom.xml +++ b/nucleus/admin/launcher/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5-SNAPSHOT + 6.2.5 launcher diff --git a/nucleus/admin/monitor/pom.xml b/nucleus/admin/monitor/pom.xml index c8385a37246..ac930e00037 100755 --- a/nucleus/admin/monitor/pom.xml +++ b/nucleus/admin/monitor/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5-SNAPSHOT + 6.2.5 monitoring-core diff --git a/nucleus/admin/pom.xml b/nucleus/admin/pom.xml index 5f92a2ab6da..5969eb3d52e 100755 --- a/nucleus/admin/pom.xml +++ b/nucleus/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.admin diff --git a/nucleus/admin/rest/gf-restadmin-connector/pom.xml b/nucleus/admin/rest/gf-restadmin-connector/pom.xml index f9b89437676..b58bd7abba6 100644 --- a/nucleus/admin/rest/gf-restadmin-connector/pom.xml +++ b/nucleus/admin/rest/gf-restadmin-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.5-SNAPSHOT + 6.2.5 gf-restadmin-connector diff --git a/nucleus/admin/rest/pom.xml b/nucleus/admin/rest/pom.xml index 1eb39b2540d..6ea56ca1b61 100644 --- a/nucleus/admin/rest/pom.xml +++ b/nucleus/admin/rest/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5-SNAPSHOT + 6.2.5 rest-service-parent diff --git a/nucleus/admin/rest/rest-client/pom.xml b/nucleus/admin/rest/rest-client/pom.xml index 6bd3e27674f..8ed0894bae1 100644 --- a/nucleus/admin/rest/rest-client/pom.xml +++ b/nucleus/admin/rest/rest-client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.5-SNAPSHOT + 6.2.5 rest-client diff --git a/nucleus/admin/rest/rest-service/pom.xml b/nucleus/admin/rest/rest-service/pom.xml index 8d180acda0f..90fadf69bef 100644 --- a/nucleus/admin/rest/rest-service/pom.xml +++ b/nucleus/admin/rest/rest-service/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.5-SNAPSHOT + 6.2.5 rest-service diff --git a/nucleus/admin/rest/rest-testing/pom.xml b/nucleus/admin/rest/rest-testing/pom.xml index b6b1fdb8117..ccab889cd7e 100644 --- a/nucleus/admin/rest/rest-testing/pom.xml +++ b/nucleus/admin/rest/rest-testing/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.5-SNAPSHOT + 6.2.5 rest-testing diff --git a/nucleus/admin/server-mgmt/pom.xml b/nucleus/admin/server-mgmt/pom.xml index f2844448f2b..f4f5d30bcb5 100644 --- a/nucleus/admin/server-mgmt/pom.xml +++ b/nucleus/admin/server-mgmt/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5-SNAPSHOT + 6.2.5 server-mgmt diff --git a/nucleus/admin/template/pom.xml b/nucleus/admin/template/pom.xml index 73814639e38..024936c332a 100644 --- a/nucleus/admin/template/pom.xml +++ b/nucleus/admin/template/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5-SNAPSHOT + 6.2.5 nucleus-domain diff --git a/nucleus/admin/util/pom.xml b/nucleus/admin/util/pom.xml index c772dd048fb..4dfc3a0b916 100755 --- a/nucleus/admin/util/pom.xml +++ b/nucleus/admin/util/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5-SNAPSHOT + 6.2.5 admin-util diff --git a/nucleus/cluster/admin/pom.xml b/nucleus/cluster/admin/pom.xml index 139c0bcc911..7cbfb363720 100644 --- a/nucleus/cluster/admin/pom.xml +++ b/nucleus/cluster/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5-SNAPSHOT + 6.2.5 cluster-admin diff --git a/nucleus/cluster/cli/pom.xml b/nucleus/cluster/cli/pom.xml index 28303e1e305..c5085cf7c6e 100755 --- a/nucleus/cluster/cli/pom.xml +++ b/nucleus/cluster/cli/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5-SNAPSHOT + 6.2.5 cluster-cli diff --git a/nucleus/cluster/common/pom.xml b/nucleus/cluster/common/pom.xml index 83991dd00f0..9916e61ac7a 100644 --- a/nucleus/cluster/common/pom.xml +++ b/nucleus/cluster/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5-SNAPSHOT + 6.2.5 cluster-common diff --git a/nucleus/cluster/gms-adapter/pom.xml b/nucleus/cluster/gms-adapter/pom.xml index 405bdf8f413..541d2e4715a 100644 --- a/nucleus/cluster/gms-adapter/pom.xml +++ b/nucleus/cluster/gms-adapter/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5-SNAPSHOT + 6.2.5 gms-adapter diff --git a/nucleus/cluster/gms-bootstrap/pom.xml b/nucleus/cluster/gms-bootstrap/pom.xml index 18209701ec9..86dd6bc973c 100644 --- a/nucleus/cluster/gms-bootstrap/pom.xml +++ b/nucleus/cluster/gms-bootstrap/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5-SNAPSHOT + 6.2.5 gms-bootstrap diff --git a/nucleus/cluster/pom.xml b/nucleus/cluster/pom.xml index ea7171ffaa8..5d758d6e9d0 100755 --- a/nucleus/cluster/pom.xml +++ b/nucleus/cluster/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.cluster diff --git a/nucleus/cluster/ssh/pom.xml b/nucleus/cluster/ssh/pom.xml index 3ac36f32fc2..f1fa798634b 100644 --- a/nucleus/cluster/ssh/pom.xml +++ b/nucleus/cluster/ssh/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5-SNAPSHOT + 6.2.5 cluster-ssh diff --git a/nucleus/common/amx-core/pom.xml b/nucleus/common/amx-core/pom.xml index 454b99978f8..68e94e9d9e8 100755 --- a/nucleus/common/amx-core/pom.xml +++ b/nucleus/common/amx-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5-SNAPSHOT + 6.2.5 amx-core diff --git a/nucleus/common/common-util/pom.xml b/nucleus/common/common-util/pom.xml index cb3d33c93e6..145c7f2a0fe 100755 --- a/nucleus/common/common-util/pom.xml +++ b/nucleus/common/common-util/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5-SNAPSHOT + 6.2.5 common-util diff --git a/nucleus/common/glassfish-api/pom.xml b/nucleus/common/glassfish-api/pom.xml index 8781fb09729..36876162177 100644 --- a/nucleus/common/glassfish-api/pom.xml +++ b/nucleus/common/glassfish-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/nucleus/common/internal-api/pom.xml b/nucleus/common/internal-api/pom.xml index 9cd5ded028f..7ebe1c96c62 100644 --- a/nucleus/common/internal-api/pom.xml +++ b/nucleus/common/internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5-SNAPSHOT + 6.2.5 internal-api diff --git a/nucleus/common/mbeanserver/pom.xml b/nucleus/common/mbeanserver/pom.xml index 052ae13fb4b..67bf152e3c1 100755 --- a/nucleus/common/mbeanserver/pom.xml +++ b/nucleus/common/mbeanserver/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5-SNAPSHOT + 6.2.5 glassfish-mbeanserver diff --git a/nucleus/common/pom.xml b/nucleus/common/pom.xml index d758f98a356..1c2aac443ad 100755 --- a/nucleus/common/pom.xml +++ b/nucleus/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.common diff --git a/nucleus/common/scattered-archive-api/pom.xml b/nucleus/common/scattered-archive-api/pom.xml index 9357ca7f269..a0c94977cf5 100644 --- a/nucleus/common/scattered-archive-api/pom.xml +++ b/nucleus/common/scattered-archive-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 ../../pom.xml diff --git a/nucleus/common/simple-glassfish-api/pom.xml b/nucleus/common/simple-glassfish-api/pom.xml index 81923a62675..971436658f8 100644 --- a/nucleus/common/simple-glassfish-api/pom.xml +++ b/nucleus/common/simple-glassfish-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5-SNAPSHOT + 6.2.5 simple-glassfish-api diff --git a/nucleus/core/api-exporter/pom.xml b/nucleus/core/api-exporter/pom.xml index 86fbca15421..f2ba27d533c 100755 --- a/nucleus/core/api-exporter/pom.xml +++ b/nucleus/core/api-exporter/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5-SNAPSHOT + 6.2.5 api-exporter diff --git a/nucleus/core/bootstrap/pom.xml b/nucleus/core/bootstrap/pom.xml index d47adb1cb3e..949912f4a9d 100755 --- a/nucleus/core/bootstrap/pom.xml +++ b/nucleus/core/bootstrap/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5-SNAPSHOT + 6.2.5 glassfish diff --git a/nucleus/core/context-propagation/pom.xml b/nucleus/core/context-propagation/pom.xml index aa28d99d20f..9185cc3f468 100644 --- a/nucleus/core/context-propagation/pom.xml +++ b/nucleus/core/context-propagation/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5-SNAPSHOT + 6.2.5 context-propagation diff --git a/nucleus/core/extra-jre-packages/pom.xml b/nucleus/core/extra-jre-packages/pom.xml index 0a80e362f29..080848b9f53 100755 --- a/nucleus/core/extra-jre-packages/pom.xml +++ b/nucleus/core/extra-jre-packages/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5-SNAPSHOT + 6.2.5 glassfish-extra-jre-packages diff --git a/nucleus/core/kernel/pom.xml b/nucleus/core/kernel/pom.xml index affc583728e..9ce5fc83817 100755 --- a/nucleus/core/kernel/pom.xml +++ b/nucleus/core/kernel/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5-SNAPSHOT + 6.2.5 kernel diff --git a/nucleus/core/logging/pom.xml b/nucleus/core/logging/pom.xml index 4506a74bdb3..2e6aad7dde9 100755 --- a/nucleus/core/logging/pom.xml +++ b/nucleus/core/logging/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5-SNAPSHOT + 6.2.5 logging diff --git a/nucleus/core/pom.xml b/nucleus/core/pom.xml index 1c2782a26f2..3370f54645c 100644 --- a/nucleus/core/pom.xml +++ b/nucleus/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.core diff --git a/nucleus/deployment/admin/pom.xml b/nucleus/deployment/admin/pom.xml index 8983d7dc439..6b016f039e3 100755 --- a/nucleus/deployment/admin/pom.xml +++ b/nucleus/deployment/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.5-SNAPSHOT + 6.2.5 deployment-admin diff --git a/nucleus/deployment/autodeploy/pom.xml b/nucleus/deployment/autodeploy/pom.xml index edbecbc0e0a..83d38f25a40 100755 --- a/nucleus/deployment/autodeploy/pom.xml +++ b/nucleus/deployment/autodeploy/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.5-SNAPSHOT + 6.2.5 deployment-autodeploy diff --git a/nucleus/deployment/common/pom.xml b/nucleus/deployment/common/pom.xml index bc6e313005b..5a9547bb4aa 100755 --- a/nucleus/deployment/common/pom.xml +++ b/nucleus/deployment/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.5-SNAPSHOT + 6.2.5 deployment-common diff --git a/nucleus/deployment/dtds/pom.xml b/nucleus/deployment/dtds/pom.xml index ed2e1678def..991acac4ffc 100644 --- a/nucleus/deployment/dtds/pom.xml +++ b/nucleus/deployment/dtds/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.5-SNAPSHOT + 6.2.5 nucleus-dtds diff --git a/nucleus/deployment/pom.xml b/nucleus/deployment/pom.xml index 3d5efd97677..56774ad6937 100755 --- a/nucleus/deployment/pom.xml +++ b/nucleus/deployment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.deployment diff --git a/nucleus/deployment/schemas/pom.xml b/nucleus/deployment/schemas/pom.xml index d58ab0bb57f..a51e40779a1 100644 --- a/nucleus/deployment/schemas/pom.xml +++ b/nucleus/deployment/schemas/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.5-SNAPSHOT + 6.2.5 nucleus-schemas diff --git a/nucleus/diagnostics/context/pom.xml b/nucleus/diagnostics/context/pom.xml index 0101230dd6e..07d45ea115a 100644 --- a/nucleus/diagnostics/context/pom.xml +++ b/nucleus/diagnostics/context/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.diagnostics nucleus-diagnostics - 6.2.5-SNAPSHOT + 6.2.5 diagnostics-context diff --git a/nucleus/diagnostics/diagnostics-api/pom.xml b/nucleus/diagnostics/diagnostics-api/pom.xml index 72696a3fba7..455b3629080 100755 --- a/nucleus/diagnostics/diagnostics-api/pom.xml +++ b/nucleus/diagnostics/diagnostics-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.diagnostics nucleus-diagnostics - 6.2.5-SNAPSHOT + 6.2.5 diagnostics-api diff --git a/nucleus/diagnostics/pom.xml b/nucleus/diagnostics/pom.xml index b728035b1c9..f16feb950db 100755 --- a/nucleus/diagnostics/pom.xml +++ b/nucleus/diagnostics/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.diagnostics diff --git a/nucleus/distributions/atomic/pom.xml b/nucleus/distributions/atomic/pom.xml index f6f8f105a8a..be8ead1b617 100644 --- a/nucleus/distributions/atomic/pom.xml +++ b/nucleus/distributions/atomic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions nucleus-distributions - 6.2.5-SNAPSHOT + 6.2.5 atomic diff --git a/nucleus/distributions/nucleus-common/pom.xml b/nucleus/distributions/nucleus-common/pom.xml index 431abaf2009..ed43d833fe9 100644 --- a/nucleus/distributions/nucleus-common/pom.xml +++ b/nucleus/distributions/nucleus-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions nucleus-distributions - 6.2.5-SNAPSHOT + 6.2.5 nucleus-common diff --git a/nucleus/distributions/nucleus/pom.xml b/nucleus/distributions/nucleus/pom.xml index 575b2e848fc..1973679f7cc 100644 --- a/nucleus/distributions/nucleus/pom.xml +++ b/nucleus/distributions/nucleus/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions nucleus-distributions - 6.2.5-SNAPSHOT + 6.2.5 nucleus-new diff --git a/nucleus/distributions/pom.xml b/nucleus/distributions/pom.xml index 49b095eea17..37690a5dd0d 100644 --- a/nucleus/distributions/pom.xml +++ b/nucleus/distributions/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.distributions diff --git a/nucleus/featuresets/atomic/pom.xml b/nucleus/featuresets/atomic/pom.xml index 659257b6b18..4789f3ffb31 100644 --- a/nucleus/featuresets/atomic/pom.xml +++ b/nucleus/featuresets/atomic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets nucleus-featuresets - 6.2.5-SNAPSHOT + 6.2.5 atomic diff --git a/nucleus/featuresets/nucleus/pom.xml b/nucleus/featuresets/nucleus/pom.xml index fa5c6e6b5ae..cf09d738f72 100644 --- a/nucleus/featuresets/nucleus/pom.xml +++ b/nucleus/featuresets/nucleus/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets nucleus-featuresets - 6.2.5-SNAPSHOT + 6.2.5 nucleus diff --git a/nucleus/featuresets/pom.xml b/nucleus/featuresets/pom.xml index 13df461c7a3..3eaf3ad8cf6 100644 --- a/nucleus/featuresets/pom.xml +++ b/nucleus/featuresets/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.featuresets diff --git a/nucleus/flashlight/agent/pom.xml b/nucleus/flashlight/agent/pom.xml index ad40cb0de4d..4e72c247643 100755 --- a/nucleus/flashlight/agent/pom.xml +++ b/nucleus/flashlight/agent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5-SNAPSHOT + 6.2.5 ../../common/pom.xml diff --git a/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml b/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml index 90cdd284af6..eeed7561306 100755 --- a/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml +++ b/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5-SNAPSHOT + 6.2.5 ../../common/pom.xml diff --git a/nucleus/flashlight/framework/pom.xml b/nucleus/flashlight/framework/pom.xml index d6cd10c0ca1..7ba5d05f7f4 100755 --- a/nucleus/flashlight/framework/pom.xml +++ b/nucleus/flashlight/framework/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5-SNAPSHOT + 6.2.5 ../../common/pom.xml diff --git a/nucleus/flashlight/pom.xml b/nucleus/flashlight/pom.xml index 13fbf564523..9d526d1beec 100755 --- a/nucleus/flashlight/pom.xml +++ b/nucleus/flashlight/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.flashlight diff --git a/nucleus/grizzly/config/pom.xml b/nucleus/grizzly/config/pom.xml index e7e76b2557e..19f803f20be 100644 --- a/nucleus/grizzly/config/pom.xml +++ b/nucleus/grizzly/config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly nucleus-grizzly - 6.2.5-SNAPSHOT + 6.2.5 grizzly-config diff --git a/nucleus/grizzly/nucleus-grizzly-all/pom.xml b/nucleus/grizzly/nucleus-grizzly-all/pom.xml index 8115926c810..41d3b9456b9 100644 --- a/nucleus/grizzly/nucleus-grizzly-all/pom.xml +++ b/nucleus/grizzly/nucleus-grizzly-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly nucleus-grizzly - 6.2.5-SNAPSHOT + 6.2.5 nucleus-grizzly-all diff --git a/nucleus/grizzly/pom.xml b/nucleus/grizzly/pom.xml index e4a0da66a2a..86eda9de9a8 100644 --- a/nucleus/grizzly/pom.xml +++ b/nucleus/grizzly/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.grizzly diff --git a/nucleus/hk2/config-generator/pom.xml b/nucleus/hk2/config-generator/pom.xml index a29a34f4a15..9d3f28504e9 100644 --- a/nucleus/hk2/config-generator/pom.xml +++ b/nucleus/hk2/config-generator/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.5-SNAPSHOT + 6.2.5 config-generator maven-plugin diff --git a/nucleus/hk2/config-types/pom.xml b/nucleus/hk2/config-types/pom.xml index 116b204f232..6172d3a0a3c 100644 --- a/nucleus/hk2/config-types/pom.xml +++ b/nucleus/hk2/config-types/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.5-SNAPSHOT + 6.2.5 config-types diff --git a/nucleus/hk2/hk2-config/pom.xml b/nucleus/hk2/hk2-config/pom.xml index 5340baddde2..07b9b4ebaaf 100644 --- a/nucleus/hk2/hk2-config/pom.xml +++ b/nucleus/hk2/hk2-config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.5-SNAPSHOT + 6.2.5 hk2-config diff --git a/nucleus/hk2/pom.xml b/nucleus/hk2/pom.xml index 47074042555..f9f509e87fb 100755 --- a/nucleus/hk2/pom.xml +++ b/nucleus/hk2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 ../parent/pom.xml diff --git a/nucleus/hk2/tiger-types/pom.xml b/nucleus/hk2/tiger-types/pom.xml index d55299a11b9..1e342dea17e 100644 --- a/nucleus/hk2/tiger-types/pom.xml +++ b/nucleus/hk2/tiger-types/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.5-SNAPSHOT + 6.2.5 tiger-types diff --git a/nucleus/osgi-platforms/felix/pom.xml b/nucleus/osgi-platforms/felix/pom.xml index 4f168a8c5e7..9b36c4e18fb 100644 --- a/nucleus/osgi-platforms/felix/pom.xml +++ b/nucleus/osgi-platforms/felix/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.5-SNAPSHOT + 6.2.5 felix diff --git a/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml b/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml index 29984b13bfa..84a32a5271f 100644 --- a/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml +++ b/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.5-SNAPSHOT + 6.2.5 osgi-cli-interactive diff --git a/nucleus/osgi-platforms/osgi-cli-remote/pom.xml b/nucleus/osgi-platforms/osgi-cli-remote/pom.xml index dec3290ffbd..3ba3f2b2aaf 100644 --- a/nucleus/osgi-platforms/osgi-cli-remote/pom.xml +++ b/nucleus/osgi-platforms/osgi-cli-remote/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.5-SNAPSHOT + 6.2.5 osgi-cli-remote diff --git a/nucleus/osgi-platforms/osgi-container/pom.xml b/nucleus/osgi-platforms/osgi-container/pom.xml index a4eb2546626..fa594120ef5 100755 --- a/nucleus/osgi-platforms/osgi-container/pom.xml +++ b/nucleus/osgi-platforms/osgi-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.5-SNAPSHOT + 6.2.5 osgi-container diff --git a/nucleus/osgi-platforms/pom.xml b/nucleus/osgi-platforms/pom.xml index efa46e42d64..c7ee04ff302 100644 --- a/nucleus/osgi-platforms/pom.xml +++ b/nucleus/osgi-platforms/pom.xml @@ -28,7 +28,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 ../pom.xml diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index abe4d915049..082af703bc9 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -30,7 +30,7 @@ org.glassfish.main nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 pom GlassFish Nucleus Parent Project diff --git a/nucleus/pom.xml b/nucleus/pom.xml index 545e299e213..1b681e6144c 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 parent/pom.xml diff --git a/nucleus/resources/pom.xml b/nucleus/resources/pom.xml index 616df1387d3..8f56860698f 100755 --- a/nucleus/resources/pom.xml +++ b/nucleus/resources/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.resourcebase.resources diff --git a/nucleus/security/core/pom.xml b/nucleus/security/core/pom.xml index a3df30a9b49..d22a9cdc659 100644 --- a/nucleus/security/core/pom.xml +++ b/nucleus/security/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security nucleus-security - 6.2.5-SNAPSHOT + 6.2.5 security diff --git a/nucleus/security/pom.xml b/nucleus/security/pom.xml index 54a76a1fffd..5306e379c53 100644 --- a/nucleus/security/pom.xml +++ b/nucleus/security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.security diff --git a/nucleus/security/services/pom.xml b/nucleus/security/services/pom.xml index b451460557e..9f79ba8e248 100644 --- a/nucleus/security/services/pom.xml +++ b/nucleus/security/services/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security nucleus-security - 6.2.5-SNAPSHOT + 6.2.5 security-services diff --git a/nucleus/security/ssl-impl/pom.xml b/nucleus/security/ssl-impl/pom.xml index f19389d3328..bab8b9906f1 100644 --- a/nucleus/security/ssl-impl/pom.xml +++ b/nucleus/security/ssl-impl/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security nucleus-security - 6.2.5-SNAPSHOT + 6.2.5 ssl-impl diff --git a/nucleus/test-utils/pom.xml b/nucleus/test-utils/pom.xml index 253f2e4e4e5..ac9fade1f5d 100755 --- a/nucleus/test-utils/pom.xml +++ b/nucleus/test-utils/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 test-utils diff --git a/nucleus/tests/admin/pom.xml b/nucleus/tests/admin/pom.xml index 5f56b85c075..3986eafd4ee 100644 --- a/nucleus/tests/admin/pom.xml +++ b/nucleus/tests/admin/pom.xml @@ -56,7 +56,7 @@ of COPY_LIB map constant.) org.glassfish.main.tests nucleus-tests - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.tests diff --git a/nucleus/tests/pom.xml b/nucleus/tests/pom.xml index 6c2f0dc1710..550f7f89e4b 100755 --- a/nucleus/tests/pom.xml +++ b/nucleus/tests/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5-SNAPSHOT + 6.2.5 org.glassfish.main.tests diff --git a/pom.xml b/pom.xml index 83c897f2949..84cd53303b9 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.glassfish.main glassfish-main-aggregator - 6.2.5-SNAPSHOT + 6.2.5 pom GlassFish Project diff --git a/qa/pom.xml b/qa/pom.xml index faa91dac653..6209af2ee83 100644 --- a/qa/pom.xml +++ b/qa/pom.xml @@ -5,7 +5,7 @@ org.glassfish.main glassfish-main-aggregator - 6.2.5-SNAPSHOT + 6.2.5 glassfish-qa-config From 53bf67c76943e4d6053e82532291c1b651d4134f Mon Sep 17 00:00:00 2001 From: Eclipse Glassfish Bot Date: Sat, 12 Feb 2022 17:45:53 +0000 Subject: [PATCH 02/33] Prepare next development cycle for 6.2.6 --- appserver/admin/admin-core/pom.xml | 2 +- appserver/admin/backup/pom.xml | 2 +- appserver/admin/cli-optional/pom.xml | 2 +- appserver/admin/cli/pom.xml | 2 +- appserver/admin/pom.xml | 2 +- appserver/admin/template/pom.xml | 2 +- appserver/admingui/cluster/pom.xml | 2 +- appserver/admingui/common/pom.xml | 2 +- appserver/admingui/community-theme/pom.xml | 2 +- appserver/admingui/concurrent/pom.xml | 2 +- appserver/admingui/corba/pom.xml | 2 +- appserver/admingui/core/pom.xml | 2 +- appserver/admingui/dataprovider/pom.xml | 2 +- appserver/admingui/dist-fragment/pom.xml | 2 +- appserver/admingui/ejb-lite/pom.xml | 2 +- appserver/admingui/ejb/pom.xml | 2 +- appserver/admingui/full/pom.xml | 2 +- appserver/admingui/gf-admingui-connector/pom.xml | 2 +- appserver/admingui/jackson-jaxb/pom.xml | 2 +- appserver/admingui/jca/pom.xml | 2 +- appserver/admingui/jdbc/pom.xml | 2 +- appserver/admingui/jms-plugin/pom.xml | 2 +- appserver/admingui/jts/pom.xml | 2 +- appserver/admingui/plugin-service/pom.xml | 2 +- appserver/admingui/pom.xml | 2 +- appserver/admingui/war/pom.xml | 2 +- appserver/admingui/web/pom.xml | 2 +- appserver/ant-tasks/pom.xml | 2 +- appserver/appclient/client/acc-config/pom.xml | 2 +- appserver/appclient/client/acc-standalone/pom.xml | 2 +- appserver/appclient/client/acc/pom.xml | 2 +- appserver/appclient/client/appclient-scripts/pom.xml | 2 +- appserver/appclient/client/pom.xml | 2 +- appserver/appclient/pom.xml | 2 +- appserver/appclient/server/connector/pom.xml | 2 +- appserver/appclient/server/core/pom.xml | 2 +- appserver/appclient/server/pom.xml | 2 +- appserver/batch/batch-database/pom.xml | 2 +- appserver/batch/glassfish-batch-commands/pom.xml | 2 +- appserver/batch/glassfish-batch-connector/pom.xml | 2 +- appserver/batch/pom.xml | 2 +- appserver/common/amx-javaee/pom.xml | 2 +- appserver/common/annotation-framework/pom.xml | 2 +- appserver/common/container-common/pom.xml | 2 +- appserver/common/glassfish-ee-api/pom.xml | 2 +- appserver/common/glassfish-naming/pom.xml | 2 +- appserver/common/pom.xml | 2 +- appserver/common/stats77/pom.xml | 2 +- appserver/concurrent/concurrent-connector/pom.xml | 2 +- appserver/concurrent/concurrent-impl/pom.xml | 2 +- appserver/concurrent/pom.xml | 2 +- appserver/connectors/admin/pom.xml | 2 +- appserver/connectors/connectors-connector/pom.xml | 2 +- appserver/connectors/connectors-inbound-runtime/pom.xml | 2 +- appserver/connectors/connectors-internal-api/pom.xml | 2 +- appserver/connectors/connectors-runtime/pom.xml | 2 +- appserver/connectors/descriptors/pom.xml | 2 +- appserver/connectors/pom.xml | 2 +- appserver/connectors/work-management/pom.xml | 2 +- appserver/core/api-exporter-fragment/pom.xml | 2 +- appserver/core/javaee-kernel/pom.xml | 2 +- appserver/core/pom.xml | 2 +- appserver/deployment/dol/pom.xml | 2 +- appserver/deployment/dtds/pom.xml | 2 +- appserver/deployment/javaee-core/pom.xml | 2 +- appserver/deployment/javaee-full/pom.xml | 2 +- appserver/deployment/pom.xml | 2 +- appserver/deployment/schemas/pom.xml | 2 +- appserver/distributions/glassfish-common/pom.xml | 2 +- appserver/distributions/glassfish/pom.xml | 2 +- appserver/distributions/pom.xml | 2 +- appserver/distributions/web/pom.xml | 2 +- appserver/ejb/ejb-all/pom.xml | 2 +- appserver/ejb/ejb-client/pom.xml | 2 +- appserver/ejb/ejb-connector/pom.xml | 2 +- appserver/ejb/ejb-container/pom.xml | 2 +- appserver/ejb/ejb-full-container/pom.xml | 2 +- appserver/ejb/ejb-internal-api/pom.xml | 2 +- appserver/ejb/ejb-timer-databases/pom.xml | 2 +- appserver/ejb/ejb-timer-service-app/pom.xml | 2 +- appserver/ejb/pom.xml | 2 +- appserver/extras/appserv-rt/dist-frag/pom.xml | 2 +- appserver/extras/appserv-rt/manifest-jar/pom.xml | 2 +- appserver/extras/appserv-rt/pom.xml | 2 +- appserver/extras/embedded/all/pom.xml | 2 +- appserver/extras/embedded/common/bootstrap/pom.xml | 2 +- .../extras/embedded/common/installroot-builder/pom.xml | 2 +- .../extras/embedded/common/instanceroot-builder/pom.xml | 2 +- appserver/extras/embedded/common/osgi-main/pom.xml | 2 +- .../extras/embedded/common/osgi-modules-uninstaller/pom.xml | 2 +- appserver/extras/embedded/common/pom.xml | 2 +- appserver/extras/embedded/nucleus/pom.xml | 2 +- appserver/extras/embedded/pom.xml | 2 +- .../embedded/shell/glassfish-embedded-shell-frag/pom.xml | 2 +- .../extras/embedded/shell/glassfish-embedded-shell/pom.xml | 2 +- .../shell/glassfish-embedded-static-shell-frag/pom.xml | 2 +- .../embedded/shell/glassfish-embedded-static-shell/pom.xml | 2 +- appserver/extras/embedded/shell/pom.xml | 2 +- appserver/extras/embedded/tests/pom.xml | 2 +- appserver/extras/embedded/web/pom.xml | 2 +- appserver/extras/javaee/dist-frag/pom.xml | 2 +- appserver/extras/javaee/manifest-jar/pom.xml | 2 +- appserver/extras/javaee/pom.xml | 2 +- appserver/extras/pom.xml | 2 +- appserver/featuresets/debug/pom.xml | 2 +- appserver/featuresets/glassfish/pom.xml | 2 +- appserver/featuresets/pom.xml | 2 +- appserver/featuresets/web/pom.xml | 2 +- appserver/flashlight/client/pom.xml | 2 +- appserver/flashlight/pom.xml | 2 +- appserver/grizzly/glassfish-grizzly-extra-all/pom.xml | 2 +- appserver/grizzly/grizzly-container/pom.xml | 2 +- appserver/grizzly/pom.xml | 2 +- appserver/ha/ha-file-store/pom.xml | 2 +- appserver/ha/ha-shoal-cache-bootstrap/pom.xml | 2 +- appserver/ha/ha-shoal-store/pom.xml | 2 +- appserver/ha/pom.xml | 2 +- appserver/jdbc/admin/pom.xml | 2 +- appserver/jdbc/jdbc-config/pom.xml | 2 +- appserver/jdbc/jdbc-ra/jdbc-core/pom.xml | 2 +- appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml | 2 +- appserver/jdbc/jdbc-ra/jdbc40/pom.xml | 2 +- appserver/jdbc/jdbc-ra/pom.xml | 2 +- appserver/jdbc/jdbc-runtime/pom.xml | 2 +- appserver/jdbc/pom.xml | 2 +- appserver/jdbc/templates/pom.xml | 2 +- appserver/jms/admin/pom.xml | 2 +- appserver/jms/gf-jms-connector/pom.xml | 2 +- appserver/jms/gf-jms-injection/pom.xml | 2 +- appserver/jms/jms-core/pom.xml | 2 +- appserver/jms/jmsra/pom.xml | 2 +- appserver/jms/pom.xml | 2 +- appserver/ldapbp/pom.xml | 2 +- appserver/libpam4j/pom.xml | 2 +- appserver/load-balancer/admin/pom.xml | 2 +- appserver/load-balancer/gf-load-balancer-connector/pom.xml | 2 +- appserver/load-balancer/pom.xml | 2 +- appserver/orb/orb-connector/pom.xml | 2 +- appserver/orb/orb-enabler/pom.xml | 2 +- appserver/orb/orb-iiop/pom.xml | 2 +- appserver/orb/pom.xml | 2 +- appserver/osgi-platforms/felix-webconsole-extension/pom.xml | 2 +- .../osgi-platforms/glassfish-osgi-console-plugin/pom.xml | 2 +- appserver/osgi-platforms/pom.xml | 2 +- appserver/persistence/cmp/cmp-all/pom.xml | 2 +- appserver/persistence/cmp/cmp-scripts/pom.xml | 2 +- appserver/persistence/cmp/ejb-mapping/pom.xml | 2 +- appserver/persistence/cmp/enhancer/pom.xml | 2 +- appserver/persistence/cmp/generator-database/pom.xml | 2 +- appserver/persistence/cmp/internal-api/pom.xml | 2 +- appserver/persistence/cmp/model/pom.xml | 2 +- appserver/persistence/cmp/pom.xml | 2 +- appserver/persistence/cmp/support-ejb/pom.xml | 2 +- appserver/persistence/cmp/support-sqlstore/pom.xml | 2 +- appserver/persistence/cmp/utility/pom.xml | 2 +- appserver/persistence/common/pom.xml | 2 +- appserver/persistence/eclipselink-wrapper/pom.xml | 2 +- appserver/persistence/entitybean-container/pom.xml | 2 +- appserver/persistence/gf-jpa-connector/pom.xml | 2 +- appserver/persistence/jpa-container/pom.xml | 2 +- appserver/persistence/oracle-jdbc-driver-packages/pom.xml | 2 +- appserver/persistence/pom.xml | 2 +- appserver/pom.xml | 2 +- appserver/resources/mail/mail-connector/pom.xml | 2 +- appserver/resources/mail/mail-runtime/pom.xml | 2 +- appserver/resources/mail/pom.xml | 2 +- appserver/resources/pom.xml | 2 +- appserver/resources/resources-connector/pom.xml | 2 +- appserver/resources/resources-runtime/pom.xml | 2 +- appserver/security/appclient.security/pom.xml | 2 +- appserver/security/core-ee/pom.xml | 2 +- appserver/security/ejb.security/pom.xml | 2 +- appserver/security/jaspic-provider-framework/pom.xml | 2 +- appserver/security/pom.xml | 2 +- appserver/security/security-all/pom.xml | 2 +- appserver/security/webintegration/pom.xml | 2 +- appserver/security/webservices.security/pom.xml | 2 +- appserver/tests/admingui/auto-test/pom.xml | 2 +- appserver/tests/admingui/pom.xml | 2 +- appserver/tests/amx/pom.xml | 2 +- appserver/tests/appserv-tests/cciblackbox-tx/pom.xml | 2 +- .../tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml | 2 +- .../tests/appserv-tests/connectors-ra-redeploy/pom.xml | 2 +- .../appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml | 2 +- .../tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml | 2 +- .../batch/batch-dev-tests/batch-commands-tests/pom.xml | 2 +- .../batch/batch-dev-tests/batch-tests-utils/pom.xml | 2 +- .../appserv-tests/devtests/batch/batch-dev-tests/pom.xml | 2 +- appserver/tests/appserv-tests/devtests/cdi/pom.xml | 2 +- appserver/tests/appserv-tests/devtests/ejb/pom.xml | 2 +- .../security/ejb-auth-async/scheduler-service/pom.xml | 2 +- .../devtests/security/jaccApi/prog-auth/common/pom.xml | 2 +- .../devtests/security/jaccApi/prog-auth/pom.xml | 2 +- .../jaccApi/prog-auth/programmatic-authentication/pom.xml | 2 +- .../soteria/app-bundled-ham-basic-login-config-form/pom.xml | 2 +- .../devtests/security/soteria/app-caller-principal/pom.xml | 2 +- .../soteria/app-custom-identity-store-handler/pom.xml | 2 +- .../devtests/security/soteria/app-custom-rememberme/pom.xml | 2 +- .../devtests/security/soteria/app-custom-session/pom.xml | 2 +- .../devtests/security/soteria/app-custom/pom.xml | 2 +- .../appserv-tests/devtests/security/soteria/app-db/pom.xml | 4 ++-- .../devtests/security/soteria/app-double-ham/pom.xml | 4 ++-- .../devtests/security/soteria/app-ham-ordering/pom.xml | 4 ++-- .../devtests/security/soteria/app-mem-basic/pom.xml | 4 ++-- .../devtests/security/soteria/app-mem-form/pom.xml | 4 ++-- .../security/soteria/app-multiple-store-backup/pom.xml | 4 ++-- .../devtests/security/soteria/app-multiple-store/pom.xml | 4 ++-- .../soteria/app-no-application-caller-principal/pom.xml | 4 ++-- .../devtests/security/soteria/app-no-role-mapping/pom.xml | 4 ++-- .../security/soteria/app-securitycontext-auth-ejb/pom.xml | 4 ++-- .../security/soteria/app-securitycontext-auth/pom.xml | 4 ++-- .../appserv-tests/devtests/security/soteria/common/pom.xml | 2 +- .../tests/appserv-tests/devtests/security/soteria/pom.xml | 2 +- appserver/tests/appserv-tests/pom.xml | 2 +- appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml | 4 ++-- appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml | 4 ++-- .../tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml | 2 +- appserver/tests/cdi/cases/multiBeansXml/pom.xml | 4 ++-- appserver/tests/cdi/cases/pom.xml | 4 ++-- appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml | 2 +- appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml | 4 ++-- appserver/tests/cdi/cases/preDestroyScoping/pom.xml | 4 ++-- appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml | 2 +- appserver/tests/cdi/cases/runner/pom.xml | 2 +- appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml | 4 ++-- appserver/tests/cdi/negative/pom.xml | 4 ++-- appserver/tests/cdi/negative/runner/pom.xml | 2 +- appserver/tests/cdi/pom.xml | 2 +- appserver/tests/community/pom.xml | 2 +- appserver/tests/embedded/basic/lifecycle/pom.xml | 2 +- appserver/tests/embedded/basic/pom.xml | 2 +- appserver/tests/embedded/cdi_basic/pom.xml | 4 ++-- appserver/tests/embedded/cdi_ejb_jpa/pom.xml | 2 +- appserver/tests/embedded/ejb/basic/pom.xml | 4 ++-- appserver/tests/embedded/ejb/ejb-api/pom.xml | 4 ++-- appserver/tests/embedded/ejb/ejb-main/pom.xml | 2 +- appserver/tests/embedded/ejb/pom.xml | 2 +- appserver/tests/embedded/ejb/remoteejb/pom.xml | 4 ++-- appserver/tests/embedded/glassfish_resources_xml/pom.xml | 2 +- appserver/tests/embedded/inplanted/pom.xml | 4 ++-- .../embedded/maven-plugin/applicationDispatcher/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/dirListing/pom.xml | 2 +- .../tests/embedded/maven-plugin/filterURIMapping/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/index/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/init/pom.xml | 2 +- .../tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/jsftest/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/jsptest/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/localejbs/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/mdb/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/multipleApps/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/queryString/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/scattered/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml | 2 +- .../tests/embedded/maven-plugin/sessionDestroyed/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/simple/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/standalonewar/pom.xml | 2 +- .../tests/embedded/maven-plugin/static-shell-init/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/webservice/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/websockets/pom.xml | 2 +- appserver/tests/embedded/mysql/pom.xml | 4 ++-- appserver/tests/embedded/pom.xml | 2 +- appserver/tests/embedded/scatteredarchive/pom.xml | 4 ++-- appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml | 2 +- appserver/tests/embedded/static/ejb/pom.xml | 2 +- appserver/tests/embedded/static/ejb/simple/pom.xml | 4 ++-- appserver/tests/embedded/static/pom.xml | 2 +- appserver/tests/embedded/static/web/pom.xml | 2 +- appserver/tests/embedded/utils/pom.xml | 4 ++-- appserver/tests/embedded/web/autodelete/pom.xml | 2 +- appserver/tests/embedded/web/pom.xml | 2 +- appserver/tests/embedded/web/servlet/pom.xml | 2 +- appserver/tests/embedded/web/web-all/pom.xml | 6 +++--- appserver/tests/embedded/web/web-api/pom.xml | 4 ++-- appserver/tests/embedded/web/web-war/pom.xml | 2 +- appserver/tests/embedded/web/web-war/test/pom.xml | 4 ++-- appserver/tests/embedded/web/web-war/war/pom.xml | 2 +- appserver/tests/embedded/web/web-war/web-fragment1/pom.xml | 2 +- appserver/tests/embedded/web/web-war/web-fragment2/pom.xml | 2 +- appserver/tests/embedded/web/web-war/web-fragment3/pom.xml | 2 +- appserver/tests/embedded/wrapper/pom.xml | 2 +- appserver/tests/hk2/cdi/basic/ejb1/pom.xml | 2 +- appserver/tests/hk2/cdi/basic/pom.xml | 2 +- appserver/tests/hk2/cdi/basic/runner/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/app/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/ejb1/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/ejb2/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/lib1/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/runner/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/war1/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/war2/pom.xml | 2 +- appserver/tests/hk2/cdi/jersey/pom.xml | 2 +- appserver/tests/hk2/cdi/jersey/runner/pom.xml | 2 +- appserver/tests/hk2/cdi/jersey/war/pom.xml | 2 +- appserver/tests/hk2/cdi/pom.xml | 2 +- appserver/tests/hk2/isolation/pom.xml | 4 ++-- appserver/tests/hk2/isolation/runner/pom.xml | 4 ++-- appserver/tests/hk2/isolation/web/iso1/pom.xml | 4 ++-- appserver/tests/hk2/isolation/web/iso2/pom.xml | 4 ++-- appserver/tests/hk2/isolation/web/pom.xml | 4 ++-- appserver/tests/hk2/pom.xml | 2 +- .../tests/paas/appscoped-db-with-resources-xml/pom.xml | 2 +- appserver/tests/paas/basic-bookstore-dns/pom.xml | 2 +- appserver/tests/paas/basic-db-initsql/pom.xml | 2 +- appserver/tests/paas/basic-db-teardown-sql/pom.xml | 2 +- appserver/tests/paas/basic-db-with-resources-xml/pom.xml | 2 +- appserver/tests/paas/basic-db/pom.xml | 2 +- appserver/tests/paas/basic-jpa/pom.xml | 2 +- appserver/tests/paas/basic-service-discovery/pom.xml | 2 +- appserver/tests/paas/basic-shared-service-test/pom.xml | 2 +- appserver/tests/paas/basic/pom.xml | 2 +- appserver/tests/paas/bookstore/pom.xml | 2 +- appserver/tests/paas/deployment-rollback/pom.xml | 2 +- appserver/tests/paas/enable-disable-test/pom.xml | 2 +- .../paas/ext-shared-service-enable-disable-test/pom.xml | 2 +- appserver/tests/paas/external-and-shared-service/pom.xml | 2 +- .../tests/paas/external-db-service/generatederbyvm/pom.xml | 2 +- appserver/tests/paas/external-db-service/pom.xml | 2 +- appserver/tests/paas/external-db-service/test/pom.xml | 2 +- appserver/tests/paas/helloworld/pom.xml | 2 +- appserver/tests/paas/javaee_shared_service/pom.xml | 2 +- appserver/tests/paas/lazy-shared-service-test/pom.xml | 2 +- appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml | 2 +- appserver/tests/paas/mq-shared-service-test/pom.xml | 2 +- .../paas/multiple-db-app-scoped-services/advanced/pom.xml | 2 +- .../paas/multiple-db-app-scoped-services/basic/pom.xml | 2 +- .../tests/paas/multiple-db-app-scoped-services/pom.xml | 2 +- .../tests/paas/multiple-db-shared-services/advanced/pom.xml | 2 +- .../tests/paas/multiple-db-shared-services/basic/pom.xml | 2 +- appserver/tests/paas/multiple-db-shared-services/pom.xml | 2 +- appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml | 4 ++-- appserver/tests/paas/multiple-spe-test/pom.xml | 2 +- appserver/tests/paas/multiple-spe-test/spetest/pom.xml | 2 +- appserver/tests/paas/pom.xml | 2 +- appserver/tests/paas/scale_service/pom.xml | 2 +- .../tests/paas/service_metadata/custom_db_name/pom.xml | 2 +- appserver/tests/paas/service_metadata/pom.xml | 2 +- .../provision_using_specified_template/pom.xml | 2 +- appserver/tests/pom.xml | 2 +- appserver/tests/quicklook/admin/pom.xml | 2 +- appserver/tests/quicklook/adminconsole/pom.xml | 4 ++-- appserver/tests/quicklook/amx/pom.xml | 2 +- appserver/tests/quicklook/ejb/cmp/pom.xml | 2 +- appserver/tests/quicklook/ejb/embedded/pom.xml | 2 +- appserver/tests/quicklook/ejb/remoteview/pom.xml | 2 +- appserver/tests/quicklook/ejb/sfulnoi/pom.xml | 2 +- appserver/tests/quicklook/ejb/singleton/pom.xml | 2 +- appserver/tests/quicklook/ejb/slsbnicmt/pom.xml | 2 +- appserver/tests/quicklook/jms/injection/pom.xml | 2 +- appserver/tests/quicklook/pom.xml | 2 +- appserver/tests/quicklook/rest/pom.xml | 2 +- appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml | 2 +- appserver/tests/quicklook/wsit/jsr109tester/pom.xml | 2 +- appserver/tests/sse/basic/pom.xml | 2 +- appserver/tests/sse/videoplayer/pom.xml | 2 +- appserver/tests/tck/authentication/pom.xml | 2 +- appserver/tests/tck/authorization/pom.xml | 2 +- .../tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml | 2 +- appserver/tests/tck/embedded_ejb_smoke/pom.xml | 2 +- appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml | 2 +- appserver/tests/tck/faces/pom.xml | 2 +- appserver/tests/tck/pom.xml | 2 +- appserver/tests/tck/rest/pom.xml | 2 +- .../tck/tck-download/jakarta-authentication-tck/pom.xml | 2 +- .../tck/tck-download/jakarta-authorization-tck/pom.xml | 2 +- appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml | 2 +- appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml | 2 +- appserver/tests/tck/tck-download/javatest/pom.xml | 2 +- appserver/tests/tck/tck-download/pom.xml | 2 +- appserver/tests/tck/tck-download/tsharness/pom.xml | 2 +- appserver/transaction/internal-api/pom.xml | 2 +- appserver/transaction/jta/pom.xml | 2 +- appserver/transaction/jts/pom.xml | 2 +- appserver/transaction/pom.xml | 2 +- appserver/web/admin/pom.xml | 2 +- appserver/web/cdi-api-fragment/pom.xml | 2 +- appserver/web/gf-web-connector/pom.xml | 2 +- appserver/web/gf-weld-connector/pom.xml | 2 +- appserver/web/gui-plugin-common/pom.xml | 2 +- appserver/web/jersey-ejb-component-provider/pom.xml | 2 +- appserver/web/jersey-mvc-connector/pom.xml | 2 +- appserver/web/jsf-connector/pom.xml | 2 +- appserver/web/jspcaching-connector/pom.xml | 2 +- appserver/web/jstl-connector/pom.xml | 2 +- appserver/web/pom.xml | 2 +- appserver/web/war-util/pom.xml | 2 +- appserver/web/web-core/pom.xml | 2 +- appserver/web/web-embed/api/pom.xml | 2 +- appserver/web/web-embed/pom.xml | 2 +- appserver/web/web-glue/pom.xml | 2 +- appserver/web/web-ha/pom.xml | 2 +- appserver/web/web-naming/pom.xml | 2 +- appserver/web/web-sse/pom.xml | 2 +- appserver/web/webtier-all/pom.xml | 2 +- appserver/web/weld-integration-fragment/pom.xml | 2 +- appserver/web/weld-integration-test-fragment/pom.xml | 2 +- appserver/web/weld-integration/pom.xml | 2 +- appserver/webservices/connector/pom.xml | 2 +- appserver/webservices/jsr109-impl/pom.xml | 2 +- appserver/webservices/metro-fragments/pom.xml | 2 +- appserver/webservices/metro-glue/pom.xml | 2 +- appserver/webservices/pom.xml | 2 +- appserver/webservices/soap-tcp/pom.xml | 2 +- appserver/webservices/webservices-scripts/pom.xml | 2 +- docs/add-on-component-development-guide/pom.xml | 2 +- docs/administration-guide/pom.xml | 2 +- docs/application-deployment-guide/pom.xml | 2 +- docs/application-development-guide/pom.xml | 2 +- docs/deployment-planning-guide/pom.xml | 2 +- docs/distribution/pom.xml | 2 +- docs/embedded-server-guide/pom.xml | 2 +- docs/error-messages-reference/pom.xml | 2 +- docs/ha-administration-guide/pom.xml | 2 +- docs/installation-guide/pom.xml | 2 +- docs/parent/pom.xml | 2 +- docs/performance-tuning-guide/pom.xml | 2 +- docs/pom.xml | 2 +- docs/publish/pom.xml | 2 +- docs/quick-start-guide/pom.xml | 2 +- docs/reference-manual/pom.xml | 2 +- docs/release-notes/pom.xml | 2 +- docs/security-guide/pom.xml | 2 +- docs/troubleshooting-guide/pom.xml | 2 +- docs/upgrade-guide/pom.xml | 2 +- docs/website/pom.xml | 2 +- nucleus/admin/cli/pom.xml | 2 +- nucleus/admin/config-api/pom.xml | 2 +- nucleus/admin/launcher/pom.xml | 2 +- nucleus/admin/monitor/pom.xml | 2 +- nucleus/admin/pom.xml | 2 +- nucleus/admin/rest/gf-restadmin-connector/pom.xml | 2 +- nucleus/admin/rest/pom.xml | 2 +- nucleus/admin/rest/rest-client/pom.xml | 2 +- nucleus/admin/rest/rest-service/pom.xml | 2 +- nucleus/admin/rest/rest-testing/pom.xml | 2 +- nucleus/admin/server-mgmt/pom.xml | 2 +- nucleus/admin/template/pom.xml | 2 +- nucleus/admin/util/pom.xml | 2 +- nucleus/cluster/admin/pom.xml | 2 +- nucleus/cluster/cli/pom.xml | 2 +- nucleus/cluster/common/pom.xml | 2 +- nucleus/cluster/gms-adapter/pom.xml | 2 +- nucleus/cluster/gms-bootstrap/pom.xml | 2 +- nucleus/cluster/pom.xml | 2 +- nucleus/cluster/ssh/pom.xml | 2 +- nucleus/common/amx-core/pom.xml | 2 +- nucleus/common/common-util/pom.xml | 2 +- nucleus/common/glassfish-api/pom.xml | 2 +- nucleus/common/internal-api/pom.xml | 2 +- nucleus/common/mbeanserver/pom.xml | 2 +- nucleus/common/pom.xml | 2 +- nucleus/common/scattered-archive-api/pom.xml | 2 +- nucleus/common/simple-glassfish-api/pom.xml | 2 +- nucleus/core/api-exporter/pom.xml | 2 +- nucleus/core/bootstrap/pom.xml | 2 +- nucleus/core/context-propagation/pom.xml | 2 +- nucleus/core/extra-jre-packages/pom.xml | 2 +- nucleus/core/kernel/pom.xml | 2 +- nucleus/core/logging/pom.xml | 2 +- nucleus/core/pom.xml | 2 +- nucleus/deployment/admin/pom.xml | 2 +- nucleus/deployment/autodeploy/pom.xml | 2 +- nucleus/deployment/common/pom.xml | 2 +- nucleus/deployment/dtds/pom.xml | 2 +- nucleus/deployment/pom.xml | 2 +- nucleus/deployment/schemas/pom.xml | 2 +- nucleus/diagnostics/context/pom.xml | 2 +- nucleus/diagnostics/diagnostics-api/pom.xml | 2 +- nucleus/diagnostics/pom.xml | 2 +- nucleus/distributions/atomic/pom.xml | 2 +- nucleus/distributions/nucleus-common/pom.xml | 2 +- nucleus/distributions/nucleus/pom.xml | 2 +- nucleus/distributions/pom.xml | 2 +- nucleus/featuresets/atomic/pom.xml | 2 +- nucleus/featuresets/nucleus/pom.xml | 2 +- nucleus/featuresets/pom.xml | 2 +- nucleus/flashlight/agent/pom.xml | 2 +- nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml | 2 +- nucleus/flashlight/framework/pom.xml | 2 +- nucleus/flashlight/pom.xml | 2 +- nucleus/grizzly/config/pom.xml | 2 +- nucleus/grizzly/nucleus-grizzly-all/pom.xml | 2 +- nucleus/grizzly/pom.xml | 2 +- nucleus/hk2/config-generator/pom.xml | 2 +- nucleus/hk2/config-types/pom.xml | 2 +- nucleus/hk2/hk2-config/pom.xml | 2 +- nucleus/hk2/pom.xml | 2 +- nucleus/hk2/tiger-types/pom.xml | 2 +- nucleus/osgi-platforms/felix/pom.xml | 2 +- nucleus/osgi-platforms/osgi-cli-interactive/pom.xml | 2 +- nucleus/osgi-platforms/osgi-cli-remote/pom.xml | 2 +- nucleus/osgi-platforms/osgi-container/pom.xml | 2 +- nucleus/osgi-platforms/pom.xml | 2 +- nucleus/parent/pom.xml | 2 +- nucleus/pom.xml | 2 +- nucleus/resources/pom.xml | 2 +- nucleus/security/core/pom.xml | 2 +- nucleus/security/pom.xml | 2 +- nucleus/security/services/pom.xml | 2 +- nucleus/security/ssl-impl/pom.xml | 2 +- nucleus/test-utils/pom.xml | 2 +- nucleus/tests/admin/pom.xml | 2 +- nucleus/tests/pom.xml | 2 +- pom.xml | 2 +- qa/pom.xml | 2 +- 509 files changed, 548 insertions(+), 548 deletions(-) diff --git a/appserver/admin/admin-core/pom.xml b/appserver/admin/admin-core/pom.xml index 5324b04950b..6c0b7b3b392 100755 --- a/appserver/admin/admin-core/pom.xml +++ b/appserver/admin/admin-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.5 + 6.2.6 admin-core diff --git a/appserver/admin/backup/pom.xml b/appserver/admin/backup/pom.xml index 1d57b714816..8e24eb87782 100644 --- a/appserver/admin/backup/pom.xml +++ b/appserver/admin/backup/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.5 + 6.2.6 backup diff --git a/appserver/admin/cli-optional/pom.xml b/appserver/admin/cli-optional/pom.xml index 6f4efa84b41..b4cce600408 100755 --- a/appserver/admin/cli-optional/pom.xml +++ b/appserver/admin/cli-optional/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.5 + 6.2.6 cli-optional diff --git a/appserver/admin/cli/pom.xml b/appserver/admin/cli/pom.xml index 63b61d998ae..ce606068a74 100755 --- a/appserver/admin/cli/pom.xml +++ b/appserver/admin/cli/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.5 + 6.2.6 appserver-cli diff --git a/appserver/admin/pom.xml b/appserver/admin/pom.xml index 90b12f2ab46..ec23f8cf1f2 100755 --- a/appserver/admin/pom.xml +++ b/appserver/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admin/template/pom.xml b/appserver/admin/template/pom.xml index 2b12043f8a2..33d859893c8 100644 --- a/appserver/admin/template/pom.xml +++ b/appserver/admin/template/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.5 + 6.2.6 appserver-domain diff --git a/appserver/admingui/cluster/pom.xml b/appserver/admingui/cluster/pom.xml index 8a399ee7b16..d3454ef64e4 100644 --- a/appserver/admingui/cluster/pom.xml +++ b/appserver/admingui/cluster/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml index 6a3705c13d7..c92a04c5cce 100644 --- a/appserver/admingui/common/pom.xml +++ b/appserver/admingui/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/community-theme/pom.xml b/appserver/admingui/community-theme/pom.xml index 0c2eaa9a89f..da902a197cf 100644 --- a/appserver/admingui/community-theme/pom.xml +++ b/appserver/admingui/community-theme/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/concurrent/pom.xml b/appserver/admingui/concurrent/pom.xml index a3a72f70f34..518236afca8 100644 --- a/appserver/admingui/concurrent/pom.xml +++ b/appserver/admingui/concurrent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/corba/pom.xml b/appserver/admingui/corba/pom.xml index 5b12371495a..67add0acd74 100644 --- a/appserver/admingui/corba/pom.xml +++ b/appserver/admingui/corba/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/core/pom.xml b/appserver/admingui/core/pom.xml index 5c291f3d18c..dec9e6676ab 100644 --- a/appserver/admingui/core/pom.xml +++ b/appserver/admingui/core/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/dataprovider/pom.xml b/appserver/admingui/dataprovider/pom.xml index 038cf6216bf..23e8e3f9e3e 100644 --- a/appserver/admingui/dataprovider/pom.xml +++ b/appserver/admingui/dataprovider/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/admingui/dist-fragment/pom.xml b/appserver/admingui/dist-fragment/pom.xml index d72881010fd..ceaa7ee88f9 100644 --- a/appserver/admingui/dist-fragment/pom.xml +++ b/appserver/admingui/dist-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 dist-fragment diff --git a/appserver/admingui/ejb-lite/pom.xml b/appserver/admingui/ejb-lite/pom.xml index 2b34d17bcd3..de91d28cc9d 100644 --- a/appserver/admingui/ejb-lite/pom.xml +++ b/appserver/admingui/ejb-lite/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/ejb/pom.xml b/appserver/admingui/ejb/pom.xml index 73d65b65f1f..05420dbd094 100644 --- a/appserver/admingui/ejb/pom.xml +++ b/appserver/admingui/ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/full/pom.xml b/appserver/admingui/full/pom.xml index 32e32b1c28e..739c976084a 100644 --- a/appserver/admingui/full/pom.xml +++ b/appserver/admingui/full/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/gf-admingui-connector/pom.xml b/appserver/admingui/gf-admingui-connector/pom.xml index 35fbb7b5ac6..085774f72aa 100755 --- a/appserver/admingui/gf-admingui-connector/pom.xml +++ b/appserver/admingui/gf-admingui-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/admingui/jackson-jaxb/pom.xml b/appserver/admingui/jackson-jaxb/pom.xml index 69738f062a9..0055fa3ebcc 100644 --- a/appserver/admingui/jackson-jaxb/pom.xml +++ b/appserver/admingui/jackson-jaxb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/admingui/jca/pom.xml b/appserver/admingui/jca/pom.xml index d6dd71b163d..059ce31d09d 100644 --- a/appserver/admingui/jca/pom.xml +++ b/appserver/admingui/jca/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/jdbc/pom.xml b/appserver/admingui/jdbc/pom.xml index ca4ef98175a..23e382eb7bd 100644 --- a/appserver/admingui/jdbc/pom.xml +++ b/appserver/admingui/jdbc/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/jms-plugin/pom.xml b/appserver/admingui/jms-plugin/pom.xml index 1cac9ea828f..22eb22840f5 100644 --- a/appserver/admingui/jms-plugin/pom.xml +++ b/appserver/admingui/jms-plugin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/jts/pom.xml b/appserver/admingui/jts/pom.xml index 82963dbd744..c9f4d9ee58f 100644 --- a/appserver/admingui/jts/pom.xml +++ b/appserver/admingui/jts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/plugin-service/pom.xml b/appserver/admingui/plugin-service/pom.xml index cef0abb0fc0..6425e7bc2d5 100644 --- a/appserver/admingui/plugin-service/pom.xml +++ b/appserver/admingui/plugin-service/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/admingui/pom.xml b/appserver/admingui/pom.xml index b3988836a16..d1bf0f53bf7 100644 --- a/appserver/admingui/pom.xml +++ b/appserver/admingui/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/admingui/war/pom.xml b/appserver/admingui/war/pom.xml index 505f6741bb9..e0dce0b639a 100644 --- a/appserver/admingui/war/pom.xml +++ b/appserver/admingui/war/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/admingui/web/pom.xml b/appserver/admingui/web/pom.xml index 76248af355c..44439d042bc 100644 --- a/appserver/admingui/web/pom.xml +++ b/appserver/admingui/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 console-web-plugin diff --git a/appserver/ant-tasks/pom.xml b/appserver/ant-tasks/pom.xml index 9b677f62899..01319fa6058 100644 --- a/appserver/ant-tasks/pom.xml +++ b/appserver/ant-tasks/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/appclient/client/acc-config/pom.xml b/appserver/appclient/client/acc-config/pom.xml index 24fed3be409..e6277dfb34c 100755 --- a/appserver/appclient/client/acc-config/pom.xml +++ b/appserver/appclient/client/acc-config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.5 + 6.2.6 acc-config diff --git a/appserver/appclient/client/acc-standalone/pom.xml b/appserver/appclient/client/acc-standalone/pom.xml index 5d8a4e4f2df..7313c74b07a 100755 --- a/appserver/appclient/client/acc-standalone/pom.xml +++ b/appserver/appclient/client/acc-standalone/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/appclient/client/acc/pom.xml b/appserver/appclient/client/acc/pom.xml index c1781a8f836..4436ec876ee 100755 --- a/appserver/appclient/client/acc/pom.xml +++ b/appserver/appclient/client/acc/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.5 + 6.2.6 gf-client-module diff --git a/appserver/appclient/client/appclient-scripts/pom.xml b/appserver/appclient/client/appclient-scripts/pom.xml index 46d30676b75..68c28947d38 100644 --- a/appserver/appclient/client/appclient-scripts/pom.xml +++ b/appserver/appclient/client/appclient-scripts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.5 + 6.2.6 appclient-scripts diff --git a/appserver/appclient/client/pom.xml b/appserver/appclient/client/pom.xml index e3d52f06a31..b3716bed56c 100755 --- a/appserver/appclient/client/pom.xml +++ b/appserver/appclient/client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main appclient - 6.2.5 + 6.2.6 org.glassfish.main.appclient diff --git a/appserver/appclient/pom.xml b/appserver/appclient/pom.xml index 3950635dd27..ecee8623b32 100755 --- a/appserver/appclient/pom.xml +++ b/appserver/appclient/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 appclient diff --git a/appserver/appclient/server/connector/pom.xml b/appserver/appclient/server/connector/pom.xml index bcf00fd8a60..fa0eb2297bf 100644 --- a/appserver/appclient/server/connector/pom.xml +++ b/appserver/appclient/server/connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient server - 6.2.5 + 6.2.6 org.glassfish.main.appclient.server diff --git a/appserver/appclient/server/core/pom.xml b/appserver/appclient/server/core/pom.xml index a991d48afee..4f45653703a 100644 --- a/appserver/appclient/server/core/pom.xml +++ b/appserver/appclient/server/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient server - 6.2.5 + 6.2.6 org.glassfish.main.appclient.server diff --git a/appserver/appclient/server/pom.xml b/appserver/appclient/server/pom.xml index 020643cb2a3..b9b14f91732 100755 --- a/appserver/appclient/server/pom.xml +++ b/appserver/appclient/server/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main appclient - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/batch/batch-database/pom.xml b/appserver/batch/batch-database/pom.xml index c4c799ed00d..e32903b11a8 100644 --- a/appserver/batch/batch-database/pom.xml +++ b/appserver/batch/batch-database/pom.xml @@ -26,7 +26,7 @@ org.glassfish.main.batch batch - 6.2.5 + 6.2.6 batch-databases diff --git a/appserver/batch/glassfish-batch-commands/pom.xml b/appserver/batch/glassfish-batch-commands/pom.xml index d7e1734571a..9763374b43e 100755 --- a/appserver/batch/glassfish-batch-commands/pom.xml +++ b/appserver/batch/glassfish-batch-commands/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.batch batch - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/batch/glassfish-batch-connector/pom.xml b/appserver/batch/glassfish-batch-connector/pom.xml index 270b34b3f4a..e4d17800926 100755 --- a/appserver/batch/glassfish-batch-connector/pom.xml +++ b/appserver/batch/glassfish-batch-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.batch batch - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/batch/pom.xml b/appserver/batch/pom.xml index 2abd3c6627f..37410c0b228 100755 --- a/appserver/batch/pom.xml +++ b/appserver/batch/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/common/amx-javaee/pom.xml b/appserver/common/amx-javaee/pom.xml index 8a334879c8c..154428cdabe 100755 --- a/appserver/common/amx-javaee/pom.xml +++ b/appserver/common/amx-javaee/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5 + 6.2.6 amx-javaee diff --git a/appserver/common/annotation-framework/pom.xml b/appserver/common/annotation-framework/pom.xml index dc7ab88f728..db9a9cc3622 100755 --- a/appserver/common/annotation-framework/pom.xml +++ b/appserver/common/annotation-framework/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5 + 6.2.6 annotation-framework diff --git a/appserver/common/container-common/pom.xml b/appserver/common/container-common/pom.xml index 0b7095fa0ee..0b5f4a0971c 100755 --- a/appserver/common/container-common/pom.xml +++ b/appserver/common/container-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/common/glassfish-ee-api/pom.xml b/appserver/common/glassfish-ee-api/pom.xml index f999c5daac6..b17c0969bd7 100644 --- a/appserver/common/glassfish-ee-api/pom.xml +++ b/appserver/common/glassfish-ee-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5 + 6.2.6 glassfish-ee-api diff --git a/appserver/common/glassfish-naming/pom.xml b/appserver/common/glassfish-naming/pom.xml index 0e032255eeb..447b1470388 100755 --- a/appserver/common/glassfish-naming/pom.xml +++ b/appserver/common/glassfish-naming/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5 + 6.2.6 glassfish-naming diff --git a/appserver/common/pom.xml b/appserver/common/pom.xml index af230689e52..2f6cd2d4706 100755 --- a/appserver/common/pom.xml +++ b/appserver/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/common/stats77/pom.xml b/appserver/common/stats77/pom.xml index 8a4503da595..7337481d5da 100755 --- a/appserver/common/stats77/pom.xml +++ b/appserver/common/stats77/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5 + 6.2.6 stats77 diff --git a/appserver/concurrent/concurrent-connector/pom.xml b/appserver/concurrent/concurrent-connector/pom.xml index 66048ab2464..df2324ab391 100644 --- a/appserver/concurrent/concurrent-connector/pom.xml +++ b/appserver/concurrent/concurrent-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.concurrent concurrent - 6.2.5 + 6.2.6 concurrent-connector diff --git a/appserver/concurrent/concurrent-impl/pom.xml b/appserver/concurrent/concurrent-impl/pom.xml index e48f976c0cf..98664e04c3f 100644 --- a/appserver/concurrent/concurrent-impl/pom.xml +++ b/appserver/concurrent/concurrent-impl/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.concurrent concurrent - 6.2.5 + 6.2.6 concurrent-impl diff --git a/appserver/concurrent/pom.xml b/appserver/concurrent/pom.xml index 7dcd50f6342..3995ff804d5 100755 --- a/appserver/concurrent/pom.xml +++ b/appserver/concurrent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.concurrent diff --git a/appserver/connectors/admin/pom.xml b/appserver/connectors/admin/pom.xml index 4e9f62100ba..19d4c1220ea 100644 --- a/appserver/connectors/admin/pom.xml +++ b/appserver/connectors/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5 + 6.2.6 connectors-admin diff --git a/appserver/connectors/connectors-connector/pom.xml b/appserver/connectors/connectors-connector/pom.xml index e47e5eb3317..b8a904d32a9 100644 --- a/appserver/connectors/connectors-connector/pom.xml +++ b/appserver/connectors/connectors-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5 + 6.2.6 gf-connectors-connector diff --git a/appserver/connectors/connectors-inbound-runtime/pom.xml b/appserver/connectors/connectors-inbound-runtime/pom.xml index 755bb1493f2..b609763e3d6 100644 --- a/appserver/connectors/connectors-inbound-runtime/pom.xml +++ b/appserver/connectors/connectors-inbound-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/connectors/connectors-internal-api/pom.xml b/appserver/connectors/connectors-internal-api/pom.xml index 56f27430449..cabd7df96bc 100755 --- a/appserver/connectors/connectors-internal-api/pom.xml +++ b/appserver/connectors/connectors-internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/connectors/connectors-runtime/pom.xml b/appserver/connectors/connectors-runtime/pom.xml index fd5aae51257..cd66b2f8ac9 100644 --- a/appserver/connectors/connectors-runtime/pom.xml +++ b/appserver/connectors/connectors-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/connectors/descriptors/pom.xml b/appserver/connectors/descriptors/pom.xml index 201959cca6f..15224345b78 100644 --- a/appserver/connectors/descriptors/pom.xml +++ b/appserver/connectors/descriptors/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5 + 6.2.6 descriptors diff --git a/appserver/connectors/pom.xml b/appserver/connectors/pom.xml index 68fe945f88f..e922934e348 100644 --- a/appserver/connectors/pom.xml +++ b/appserver/connectors/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.connectors diff --git a/appserver/connectors/work-management/pom.xml b/appserver/connectors/work-management/pom.xml index dbc7789da3d..58e6313a7c4 100644 --- a/appserver/connectors/work-management/pom.xml +++ b/appserver/connectors/work-management/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.5 + 6.2.6 work-management diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml index 9585938eeb6..7e648eca7a8 100755 --- a/appserver/core/api-exporter-fragment/pom.xml +++ b/appserver/core/api-exporter-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core core - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/core/javaee-kernel/pom.xml b/appserver/core/javaee-kernel/pom.xml index ed02f1fa883..530f67a6e36 100755 --- a/appserver/core/javaee-kernel/pom.xml +++ b/appserver/core/javaee-kernel/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core core - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/core/pom.xml b/appserver/core/pom.xml index ce153fd5d5c..52ab8b18014 100644 --- a/appserver/core/pom.xml +++ b/appserver/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/deployment/dol/pom.xml b/appserver/deployment/dol/pom.xml index 7333ccd4a80..ecc82b338d1 100755 --- a/appserver/deployment/dol/pom.xml +++ b/appserver/deployment/dol/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.5 + 6.2.6 dol diff --git a/appserver/deployment/dtds/pom.xml b/appserver/deployment/dtds/pom.xml index 913154eef5a..bbf9dca9323 100644 --- a/appserver/deployment/dtds/pom.xml +++ b/appserver/deployment/dtds/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.5 + 6.2.6 appserver-dtds diff --git a/appserver/deployment/javaee-core/pom.xml b/appserver/deployment/javaee-core/pom.xml index 4773a50c5c6..b1c81beff19 100755 --- a/appserver/deployment/javaee-core/pom.xml +++ b/appserver/deployment/javaee-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/deployment/javaee-full/pom.xml b/appserver/deployment/javaee-full/pom.xml index 4a1b6df9cba..c9dc15407bc 100755 --- a/appserver/deployment/javaee-full/pom.xml +++ b/appserver/deployment/javaee-full/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/deployment/pom.xml b/appserver/deployment/pom.xml index 0915f1d93d3..852c500e61f 100755 --- a/appserver/deployment/pom.xml +++ b/appserver/deployment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/deployment/schemas/pom.xml b/appserver/deployment/schemas/pom.xml index d65b61888ca..3b36d599b15 100644 --- a/appserver/deployment/schemas/pom.xml +++ b/appserver/deployment/schemas/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.5 + 6.2.6 appserver-schemas diff --git a/appserver/distributions/glassfish-common/pom.xml b/appserver/distributions/glassfish-common/pom.xml index 1cde38d061c..0e2130be043 100644 --- a/appserver/distributions/glassfish-common/pom.xml +++ b/appserver/distributions/glassfish-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions distributions - 6.2.5 + 6.2.6 glassfish-common diff --git a/appserver/distributions/glassfish/pom.xml b/appserver/distributions/glassfish/pom.xml index a342b65b662..d2a2041125f 100644 --- a/appserver/distributions/glassfish/pom.xml +++ b/appserver/distributions/glassfish/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions distributions - 6.2.5 + 6.2.6 glassfish diff --git a/appserver/distributions/pom.xml b/appserver/distributions/pom.xml index e0bda072898..cd28db12013 100644 --- a/appserver/distributions/pom.xml +++ b/appserver/distributions/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.distributions diff --git a/appserver/distributions/web/pom.xml b/appserver/distributions/web/pom.xml index 5e6c9e33848..2215bf7e5da 100644 --- a/appserver/distributions/web/pom.xml +++ b/appserver/distributions/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions distributions - 6.2.5 + 6.2.6 web diff --git a/appserver/ejb/ejb-all/pom.xml b/appserver/ejb/ejb-all/pom.xml index d80f2deb9b1..6245eea2b37 100755 --- a/appserver/ejb/ejb-all/pom.xml +++ b/appserver/ejb/ejb-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/ejb/ejb-client/pom.xml b/appserver/ejb/ejb-client/pom.xml index 58aced2aa5d..d58b2e0215b 100755 --- a/appserver/ejb/ejb-client/pom.xml +++ b/appserver/ejb/ejb-client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5 + 6.2.6 ejb-client diff --git a/appserver/ejb/ejb-connector/pom.xml b/appserver/ejb/ejb-connector/pom.xml index 126550218af..87d0ece1a27 100755 --- a/appserver/ejb/ejb-connector/pom.xml +++ b/appserver/ejb/ejb-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/ejb/ejb-container/pom.xml b/appserver/ejb/ejb-container/pom.xml index 5e40e8ea740..0b93c7e5ff1 100755 --- a/appserver/ejb/ejb-container/pom.xml +++ b/appserver/ejb/ejb-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/ejb/ejb-full-container/pom.xml b/appserver/ejb/ejb-full-container/pom.xml index 3f820d69fe2..34be82c4104 100644 --- a/appserver/ejb/ejb-full-container/pom.xml +++ b/appserver/ejb/ejb-full-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/ejb/ejb-internal-api/pom.xml b/appserver/ejb/ejb-internal-api/pom.xml index 9be441200bb..bc9b77495fd 100755 --- a/appserver/ejb/ejb-internal-api/pom.xml +++ b/appserver/ejb/ejb-internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/ejb/ejb-timer-databases/pom.xml b/appserver/ejb/ejb-timer-databases/pom.xml index 3e29f8a2756..0ebf80e78cf 100644 --- a/appserver/ejb/ejb-timer-databases/pom.xml +++ b/appserver/ejb/ejb-timer-databases/pom.xml @@ -26,7 +26,7 @@ org.glassfish.main.ejb ejb - 6.2.5 + 6.2.6 ejb-timer-databases diff --git a/appserver/ejb/ejb-timer-service-app/pom.xml b/appserver/ejb/ejb-timer-service-app/pom.xml index 5eb9c302aa1..5d6f7aaf2a3 100644 --- a/appserver/ejb/ejb-timer-service-app/pom.xml +++ b/appserver/ejb/ejb-timer-service-app/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/ejb/pom.xml b/appserver/ejb/pom.xml index dc53ec26caf..8b9d4d9eb8a 100755 --- a/appserver/ejb/pom.xml +++ b/appserver/ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.ejb diff --git a/appserver/extras/appserv-rt/dist-frag/pom.xml b/appserver/extras/appserv-rt/dist-frag/pom.xml index bc2b75839ec..c7c3186330c 100644 --- a/appserver/extras/appserv-rt/dist-frag/pom.xml +++ b/appserver/extras/appserv-rt/dist-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras appserv-rt-pom - 6.2.5 + 6.2.6 appserv-rt-frag diff --git a/appserver/extras/appserv-rt/manifest-jar/pom.xml b/appserver/extras/appserv-rt/manifest-jar/pom.xml index 5ed49c299ba..a74f6d36f7b 100644 --- a/appserver/extras/appserv-rt/manifest-jar/pom.xml +++ b/appserver/extras/appserv-rt/manifest-jar/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras appserv-rt-pom - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/extras/appserv-rt/pom.xml b/appserver/extras/appserv-rt/pom.xml index 3c685a9730e..b75dd797862 100644 --- a/appserver/extras/appserv-rt/pom.xml +++ b/appserver/extras/appserv-rt/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml index 42a540d5639..e4f365c4708 100644 --- a/appserver/extras/embedded/all/pom.xml +++ b/appserver/extras/embedded/all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/extras/embedded/common/bootstrap/pom.xml b/appserver/extras/embedded/common/bootstrap/pom.xml index 010099763aa..5fe1c62f223 100644 --- a/appserver/extras/embedded/common/bootstrap/pom.xml +++ b/appserver/extras/embedded/common/bootstrap/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/extras/embedded/common/installroot-builder/pom.xml b/appserver/extras/embedded/common/installroot-builder/pom.xml index fac9f48bc36..d5a0357989a 100644 --- a/appserver/extras/embedded/common/installroot-builder/pom.xml +++ b/appserver/extras/embedded/common/installroot-builder/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/extras/embedded/common/instanceroot-builder/pom.xml b/appserver/extras/embedded/common/instanceroot-builder/pom.xml index faa7e7cc7b6..7d670160d06 100644 --- a/appserver/extras/embedded/common/instanceroot-builder/pom.xml +++ b/appserver/extras/embedded/common/instanceroot-builder/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/extras/embedded/common/osgi-main/pom.xml b/appserver/extras/embedded/common/osgi-main/pom.xml index 1d8b9f669f7..c1d956a9d15 100644 --- a/appserver/extras/embedded/common/osgi-main/pom.xml +++ b/appserver/extras/embedded/common/osgi-main/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml b/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml index 625c57f9996..57da56dae1d 100644 --- a/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml +++ b/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/extras/embedded/common/pom.xml b/appserver/extras/embedded/common/pom.xml index 212933e439f..15eaa23a246 100644 --- a/appserver/extras/embedded/common/pom.xml +++ b/appserver/extras/embedded/common/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/extras/embedded/nucleus/pom.xml b/appserver/extras/embedded/nucleus/pom.xml index c8203ebeb17..f103af91c8f 100644 --- a/appserver/extras/embedded/nucleus/pom.xml +++ b/appserver/extras/embedded/nucleus/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/extras/embedded/pom.xml b/appserver/extras/embedded/pom.xml index 295b3141f34..c1ccf3dc53e 100644 --- a/appserver/extras/embedded/pom.xml +++ b/appserver/extras/embedded/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 embedded diff --git a/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml index 8946fee8415..7a4e9cb13cc 100644 --- a/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 ../../../pom.xml diff --git a/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml index 004d490e7cb..1f500110617 100755 --- a/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 ../../../pom.xml diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml index dca26b6f374..79924c28886 100644 --- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 ../../../pom.xml diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml index f95c3b4a45a..63711fcf298 100755 --- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 ../../../pom.xml diff --git a/appserver/extras/embedded/shell/pom.xml b/appserver/extras/embedded/shell/pom.xml index 2743b208471..bc0c62c180f 100755 --- a/appserver/extras/embedded/shell/pom.xml +++ b/appserver/extras/embedded/shell/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/extras/embedded/tests/pom.xml b/appserver/extras/embedded/tests/pom.xml index 66e5be25b7f..3e3dbfdb661 100644 --- a/appserver/extras/embedded/tests/pom.xml +++ b/appserver/extras/embedded/tests/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras embedded - 6.2.5 + 6.2.6 tests-embedded diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml index 55b7487bb11..28d14261b4c 100644 --- a/appserver/extras/embedded/web/pom.xml +++ b/appserver/extras/embedded/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/extras/javaee/dist-frag/pom.xml b/appserver/extras/javaee/dist-frag/pom.xml index 9b2b14b4a18..5231b534e9a 100644 --- a/appserver/extras/javaee/dist-frag/pom.xml +++ b/appserver/extras/javaee/dist-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras javaee-pom - 6.2.5 + 6.2.6 javaee-frag diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/javaee/manifest-jar/pom.xml index 655b0b2747d..908506cafed 100644 --- a/appserver/extras/javaee/manifest-jar/pom.xml +++ b/appserver/extras/javaee/manifest-jar/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras javaee-pom - 6.2.5 + 6.2.6 javaee diff --git a/appserver/extras/javaee/pom.xml b/appserver/extras/javaee/pom.xml index f22db9a00d9..5f9e34714db 100644 --- a/appserver/extras/javaee/pom.xml +++ b/appserver/extras/javaee/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/extras/pom.xml b/appserver/extras/pom.xml index 87cf11291d6..5e725d31dae 100755 --- a/appserver/extras/pom.xml +++ b/appserver/extras/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.extras diff --git a/appserver/featuresets/debug/pom.xml b/appserver/featuresets/debug/pom.xml index 6aeb58adac9..7208be4862a 100644 --- a/appserver/featuresets/debug/pom.xml +++ b/appserver/featuresets/debug/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets featuresets - 6.2.5 + 6.2.6 debug diff --git a/appserver/featuresets/glassfish/pom.xml b/appserver/featuresets/glassfish/pom.xml index 5629a472385..d7ed03bd833 100644 --- a/appserver/featuresets/glassfish/pom.xml +++ b/appserver/featuresets/glassfish/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets featuresets - 6.2.5 + 6.2.6 glassfish diff --git a/appserver/featuresets/pom.xml b/appserver/featuresets/pom.xml index bcbd1cddd87..b9ca4945848 100644 --- a/appserver/featuresets/pom.xml +++ b/appserver/featuresets/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.featuresets diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml index f83660860bc..dd8359b3d83 100644 --- a/appserver/featuresets/web/pom.xml +++ b/appserver/featuresets/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets featuresets - 6.2.5 + 6.2.6 web diff --git a/appserver/flashlight/client/pom.xml b/appserver/flashlight/client/pom.xml index 2bb25ef6e9e..d8082c3303b 100755 --- a/appserver/flashlight/client/pom.xml +++ b/appserver/flashlight/client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.5 + 6.2.6 ../../common/pom.xml diff --git a/appserver/flashlight/pom.xml b/appserver/flashlight/pom.xml index 8d837a9a9bf..53ab1ad6c82 100755 --- a/appserver/flashlight/pom.xml +++ b/appserver/flashlight/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml b/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml index d399320285f..e0f9f008eb5 100644 --- a/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml +++ b/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly glassfish-grizzly - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/grizzly/grizzly-container/pom.xml b/appserver/grizzly/grizzly-container/pom.xml index c46a9dc9190..32f632149e0 100755 --- a/appserver/grizzly/grizzly-container/pom.xml +++ b/appserver/grizzly/grizzly-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly glassfish-grizzly - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/grizzly/pom.xml b/appserver/grizzly/pom.xml index b8311cf2196..198315cce19 100755 --- a/appserver/grizzly/pom.xml +++ b/appserver/grizzly/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/ha/ha-file-store/pom.xml b/appserver/ha/ha-file-store/pom.xml index d815001022b..4cc65adb207 100644 --- a/appserver/ha/ha-file-store/pom.xml +++ b/appserver/ha/ha-file-store/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ha ha - 6.2.5 + 6.2.6 ha-file-store diff --git a/appserver/ha/ha-shoal-cache-bootstrap/pom.xml b/appserver/ha/ha-shoal-cache-bootstrap/pom.xml index 7ebee0aefd0..ad81f443c5e 100644 --- a/appserver/ha/ha-shoal-cache-bootstrap/pom.xml +++ b/appserver/ha/ha-shoal-cache-bootstrap/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ha ha - 6.2.5 + 6.2.6 ha-shoal-cache-bootstrap diff --git a/appserver/ha/ha-shoal-store/pom.xml b/appserver/ha/ha-shoal-store/pom.xml index 925467845ae..cd639702140 100644 --- a/appserver/ha/ha-shoal-store/pom.xml +++ b/appserver/ha/ha-shoal-store/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ha ha - 6.2.5 + 6.2.6 ha-shoal-cache-store diff --git a/appserver/ha/pom.xml b/appserver/ha/pom.xml index b82c95a539a..7917288282d 100755 --- a/appserver/ha/pom.xml +++ b/appserver/ha/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/jdbc/admin/pom.xml b/appserver/jdbc/admin/pom.xml index 36998e41102..079e2f28707 100644 --- a/appserver/jdbc/admin/pom.xml +++ b/appserver/jdbc/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc jdbc - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/jdbc/jdbc-config/pom.xml b/appserver/jdbc/jdbc-config/pom.xml index e186d16eef1..ba7f92a9a67 100644 --- a/appserver/jdbc/jdbc-config/pom.xml +++ b/appserver/jdbc/jdbc-config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc jdbc - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml b/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml index 0788f93eaae..8d474ccf40b 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml +++ b/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc.jdbc-ra jdbc-ra - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml b/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml index 98efbf89170..10ce81d9409 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml +++ b/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc.jdbc-ra jdbc-ra - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/jdbc40/pom.xml b/appserver/jdbc/jdbc-ra/jdbc40/pom.xml index 41adaeff957..e2a99736448 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/pom.xml +++ b/appserver/jdbc/jdbc-ra/jdbc40/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc.jdbc-ra jdbc-ra - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/pom.xml b/appserver/jdbc/jdbc-ra/pom.xml index 03588245b03..f61e86946d8 100644 --- a/appserver/jdbc/jdbc-ra/pom.xml +++ b/appserver/jdbc/jdbc-ra/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/jdbc/jdbc-runtime/pom.xml b/appserver/jdbc/jdbc-runtime/pom.xml index 79c3ca4b93d..976717a8fee 100644 --- a/appserver/jdbc/jdbc-runtime/pom.xml +++ b/appserver/jdbc/jdbc-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc jdbc - 6.2.5 + 6.2.6 jdbc-runtime diff --git a/appserver/jdbc/pom.xml b/appserver/jdbc/pom.xml index f92122657bf..590421d8ed7 100755 --- a/appserver/jdbc/pom.xml +++ b/appserver/jdbc/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.jdbc diff --git a/appserver/jdbc/templates/pom.xml b/appserver/jdbc/templates/pom.xml index de53b9d7f0f..cb416430dd3 100644 --- a/appserver/jdbc/templates/pom.xml +++ b/appserver/jdbc/templates/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main.jdbc jdbc - 6.2.5 + 6.2.6 templates JDBC Templates diff --git a/appserver/jms/admin/pom.xml b/appserver/jms/admin/pom.xml index da995f6761e..83253f6e26f 100644 --- a/appserver/jms/admin/pom.xml +++ b/appserver/jms/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/jms/gf-jms-connector/pom.xml b/appserver/jms/gf-jms-connector/pom.xml index ddb6513dba1..8a0fc8f59cd 100644 --- a/appserver/jms/gf-jms-connector/pom.xml +++ b/appserver/jms/gf-jms-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/jms/gf-jms-injection/pom.xml b/appserver/jms/gf-jms-injection/pom.xml index 11a34a5d567..f3302ccdb51 100644 --- a/appserver/jms/gf-jms-injection/pom.xml +++ b/appserver/jms/gf-jms-injection/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/jms/jms-core/pom.xml b/appserver/jms/jms-core/pom.xml index 479ebd48e31..78b62ce8896 100644 --- a/appserver/jms/jms-core/pom.xml +++ b/appserver/jms/jms-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/jms/jmsra/pom.xml b/appserver/jms/jmsra/pom.xml index 94ca7559869..3645656b13f 100644 --- a/appserver/jms/jmsra/pom.xml +++ b/appserver/jms/jmsra/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/jms/pom.xml b/appserver/jms/pom.xml index 9f6c42a09a3..914b38c2902 100644 --- a/appserver/jms/pom.xml +++ b/appserver/jms/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/ldapbp/pom.xml b/appserver/ldapbp/pom.xml index 6450528a2e5..1f2d2fb86a1 100644 --- a/appserver/ldapbp/pom.xml +++ b/appserver/ldapbp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.ldapbp diff --git a/appserver/libpam4j/pom.xml b/appserver/libpam4j/pom.xml index 008fb87f2cc..e115dd77c4e 100644 --- a/appserver/libpam4j/pom.xml +++ b/appserver/libpam4j/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.libpam4j diff --git a/appserver/load-balancer/admin/pom.xml b/appserver/load-balancer/admin/pom.xml index e45a7839ad6..b8b3dd15e64 100644 --- a/appserver/load-balancer/admin/pom.xml +++ b/appserver/load-balancer/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.loadbalancer load-balancer - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/load-balancer/gf-load-balancer-connector/pom.xml b/appserver/load-balancer/gf-load-balancer-connector/pom.xml index c0d58ffd4f5..ec23c4b6f9a 100644 --- a/appserver/load-balancer/gf-load-balancer-connector/pom.xml +++ b/appserver/load-balancer/gf-load-balancer-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.loadbalancer load-balancer - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/load-balancer/pom.xml b/appserver/load-balancer/pom.xml index 31675ac1836..cf19d6bc387 100644 --- a/appserver/load-balancer/pom.xml +++ b/appserver/load-balancer/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/orb/orb-connector/pom.xml b/appserver/orb/orb-connector/pom.xml index 725e913b654..0deec188655 100755 --- a/appserver/orb/orb-connector/pom.xml +++ b/appserver/orb/orb-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.orb orb - 6.2.5 + 6.2.6 orb-connector diff --git a/appserver/orb/orb-enabler/pom.xml b/appserver/orb/orb-enabler/pom.xml index fdedccaabce..9fbe86b82eb 100755 --- a/appserver/orb/orb-enabler/pom.xml +++ b/appserver/orb/orb-enabler/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.orb orb - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/orb/orb-iiop/pom.xml b/appserver/orb/orb-iiop/pom.xml index 133edc48d34..ef4d3a52b2e 100755 --- a/appserver/orb/orb-iiop/pom.xml +++ b/appserver/orb/orb-iiop/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.orb orb - 6.2.5 + 6.2.6 orb-iiop diff --git a/appserver/orb/pom.xml b/appserver/orb/pom.xml index 038c14a6ac5..c826fc6f33f 100755 --- a/appserver/orb/pom.xml +++ b/appserver/orb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/osgi-platforms/felix-webconsole-extension/pom.xml b/appserver/osgi-platforms/felix-webconsole-extension/pom.xml index 29bbcb321e0..d8b013c6422 100644 --- a/appserver/osgi-platforms/felix-webconsole-extension/pom.xml +++ b/appserver/osgi-platforms/felix-webconsole-extension/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-console-extensions - 6.2.5 + 6.2.6 felix-webconsole-extension diff --git a/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml b/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml index 90eb7b3bbb5..bd5a8eddf50 100644 --- a/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml +++ b/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.5 + 6.2.6 ../../admingui/pom.xml diff --git a/appserver/osgi-platforms/pom.xml b/appserver/osgi-platforms/pom.xml index 31c54f28586..144bc9ae823 100644 --- a/appserver/osgi-platforms/pom.xml +++ b/appserver/osgi-platforms/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/cmp/cmp-all/pom.xml b/appserver/persistence/cmp/cmp-all/pom.xml index d446b18d701..57a4ea1bdcc 100755 --- a/appserver/persistence/cmp/cmp-all/pom.xml +++ b/appserver/persistence/cmp/cmp-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/cmp/cmp-scripts/pom.xml b/appserver/persistence/cmp/cmp-scripts/pom.xml index 01ec655c77b..2ba8794cf72 100755 --- a/appserver/persistence/cmp/cmp-scripts/pom.xml +++ b/appserver/persistence/cmp/cmp-scripts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5 + 6.2.6 cmp-scripts diff --git a/appserver/persistence/cmp/ejb-mapping/pom.xml b/appserver/persistence/cmp/ejb-mapping/pom.xml index 7e926b6c3c1..7a18f42ec08 100644 --- a/appserver/persistence/cmp/ejb-mapping/pom.xml +++ b/appserver/persistence/cmp/ejb-mapping/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/cmp/enhancer/pom.xml b/appserver/persistence/cmp/enhancer/pom.xml index 45fd74cf7a2..5d96caf0c93 100644 --- a/appserver/persistence/cmp/enhancer/pom.xml +++ b/appserver/persistence/cmp/enhancer/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/cmp/generator-database/pom.xml b/appserver/persistence/cmp/generator-database/pom.xml index 48111fc8c26..105dfd6d7f3 100644 --- a/appserver/persistence/cmp/generator-database/pom.xml +++ b/appserver/persistence/cmp/generator-database/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/cmp/internal-api/pom.xml b/appserver/persistence/cmp/internal-api/pom.xml index 8dfdc34371a..80b5aa7c788 100644 --- a/appserver/persistence/cmp/internal-api/pom.xml +++ b/appserver/persistence/cmp/internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/cmp/model/pom.xml b/appserver/persistence/cmp/model/pom.xml index aeeaefb905e..cfd703dea4c 100644 --- a/appserver/persistence/cmp/model/pom.xml +++ b/appserver/persistence/cmp/model/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/cmp/pom.xml b/appserver/persistence/cmp/pom.xml index 43cba724ed6..d0cc73c5325 100644 --- a/appserver/persistence/cmp/pom.xml +++ b/appserver/persistence/cmp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5 + 6.2.6 org.glassfish.main.persistence.cmp diff --git a/appserver/persistence/cmp/support-ejb/pom.xml b/appserver/persistence/cmp/support-ejb/pom.xml index dfcb0084d9d..875ea1b8a03 100644 --- a/appserver/persistence/cmp/support-ejb/pom.xml +++ b/appserver/persistence/cmp/support-ejb/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5 + 6.2.6 cmp-support-ejb diff --git a/appserver/persistence/cmp/support-sqlstore/pom.xml b/appserver/persistence/cmp/support-sqlstore/pom.xml index 65ed8009bfc..071690cd812 100644 --- a/appserver/persistence/cmp/support-sqlstore/pom.xml +++ b/appserver/persistence/cmp/support-sqlstore/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5 + 6.2.6 cmp-support-sqlstore diff --git a/appserver/persistence/cmp/utility/pom.xml b/appserver/persistence/cmp/utility/pom.xml index 69e0b57b204..0cc518fdbe6 100644 --- a/appserver/persistence/cmp/utility/pom.xml +++ b/appserver/persistence/cmp/utility/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/common/pom.xml b/appserver/persistence/common/pom.xml index ba33d336e1d..66a6573d777 100644 --- a/appserver/persistence/common/pom.xml +++ b/appserver/persistence/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/eclipselink-wrapper/pom.xml b/appserver/persistence/eclipselink-wrapper/pom.xml index e192520a852..470a381481c 100644 --- a/appserver/persistence/eclipselink-wrapper/pom.xml +++ b/appserver/persistence/eclipselink-wrapper/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/entitybean-container/pom.xml b/appserver/persistence/entitybean-container/pom.xml index fe22e7189db..9870861272c 100644 --- a/appserver/persistence/entitybean-container/pom.xml +++ b/appserver/persistence/entitybean-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/gf-jpa-connector/pom.xml b/appserver/persistence/gf-jpa-connector/pom.xml index cc9e9990863..79f3cb09b54 100644 --- a/appserver/persistence/gf-jpa-connector/pom.xml +++ b/appserver/persistence/gf-jpa-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/jpa-container/pom.xml b/appserver/persistence/jpa-container/pom.xml index 2612756e583..1cf04a5cb6b 100644 --- a/appserver/persistence/jpa-container/pom.xml +++ b/appserver/persistence/jpa-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/persistence/oracle-jdbc-driver-packages/pom.xml b/appserver/persistence/oracle-jdbc-driver-packages/pom.xml index b22921c08e3..a7f2d6d26bb 100755 --- a/appserver/persistence/oracle-jdbc-driver-packages/pom.xml +++ b/appserver/persistence/oracle-jdbc-driver-packages/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.5 + 6.2.6 glassfish-oracle-jdbc-driver-packages diff --git a/appserver/persistence/pom.xml b/appserver/persistence/pom.xml index ea3b60a1a19..e7367676824 100644 --- a/appserver/persistence/pom.xml +++ b/appserver/persistence/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.persistence diff --git a/appserver/pom.xml b/appserver/pom.xml index 1b65f7ffa9f..e61e7417b89 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 ../nucleus/pom.xml diff --git a/appserver/resources/mail/mail-connector/pom.xml b/appserver/resources/mail/mail-connector/pom.xml index 364712cf0cd..1a6dd53e686 100644 --- a/appserver/resources/mail/mail-connector/pom.xml +++ b/appserver/resources/mail/mail-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources mail - 6.2.5 + 6.2.6 mail-connector diff --git a/appserver/resources/mail/mail-runtime/pom.xml b/appserver/resources/mail/mail-runtime/pom.xml index 205d1e6e19c..6c4fcaef85f 100644 --- a/appserver/resources/mail/mail-runtime/pom.xml +++ b/appserver/resources/mail/mail-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources mail - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/resources/mail/pom.xml b/appserver/resources/mail/pom.xml index e99286640a5..9a347a13220 100644 --- a/appserver/resources/mail/pom.xml +++ b/appserver/resources/mail/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources resources - 6.2.5 + 6.2.6 mail diff --git a/appserver/resources/pom.xml b/appserver/resources/pom.xml index 3dffb7cf42d..1bf2a092964 100644 --- a/appserver/resources/pom.xml +++ b/appserver/resources/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/resources/resources-connector/pom.xml b/appserver/resources/resources-connector/pom.xml index 2394b2017b4..8d96e0bcc59 100755 --- a/appserver/resources/resources-connector/pom.xml +++ b/appserver/resources/resources-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources resources - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/resources/resources-runtime/pom.xml b/appserver/resources/resources-runtime/pom.xml index 808e51c7056..9e25379ab20 100755 --- a/appserver/resources/resources-runtime/pom.xml +++ b/appserver/resources/resources-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources resources - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/security/appclient.security/pom.xml b/appserver/security/appclient.security/pom.xml index f3d3ff4607d..eda71eec116 100644 --- a/appserver/security/appclient.security/pom.xml +++ b/appserver/security/appclient.security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5 + 6.2.6 appclient.security diff --git a/appserver/security/core-ee/pom.xml b/appserver/security/core-ee/pom.xml index 1396c4d41b6..5db5c3f083b 100644 --- a/appserver/security/core-ee/pom.xml +++ b/appserver/security/core-ee/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5 + 6.2.6 security-ee diff --git a/appserver/security/ejb.security/pom.xml b/appserver/security/ejb.security/pom.xml index 9bf7625ee73..3ca6c0873df 100644 --- a/appserver/security/ejb.security/pom.xml +++ b/appserver/security/ejb.security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/security/jaspic-provider-framework/pom.xml b/appserver/security/jaspic-provider-framework/pom.xml index ec422a4ce1f..817b77756e2 100644 --- a/appserver/security/jaspic-provider-framework/pom.xml +++ b/appserver/security/jaspic-provider-framework/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/security/pom.xml b/appserver/security/pom.xml index 0d78491c2fa..8f127440f4f 100644 --- a/appserver/security/pom.xml +++ b/appserver/security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/security/security-all/pom.xml b/appserver/security/security-all/pom.xml index 4c7fcfb0977..4a110cffce9 100644 --- a/appserver/security/security-all/pom.xml +++ b/appserver/security/security-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/security/webintegration/pom.xml b/appserver/security/webintegration/pom.xml index 9b833cde648..9de55572c17 100644 --- a/appserver/security/webintegration/pom.xml +++ b/appserver/security/webintegration/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/security/webservices.security/pom.xml b/appserver/security/webservices.security/pom.xml index 87e9a9a7a50..3c41d966539 100644 --- a/appserver/security/webservices.security/pom.xml +++ b/appserver/security/webservices.security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.5 + 6.2.6 webservices.security diff --git a/appserver/tests/admingui/auto-test/pom.xml b/appserver/tests/admingui/auto-test/pom.xml index bc4e107e578..9c301c0bfc4 100644 --- a/appserver/tests/admingui/auto-test/pom.xml +++ b/appserver/tests/admingui/auto-test/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.admingui admingui - 6.2.5 + 6.2.6 ../pom.xml console-auto-tests diff --git a/appserver/tests/admingui/pom.xml b/appserver/tests/admingui/pom.xml index 7287a95c640..eb51a255b6f 100644 --- a/appserver/tests/admingui/pom.xml +++ b/appserver/tests/admingui/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.admingui admingui - 6.2.5 + 6.2.6 pom GlassFish admingui Tests diff --git a/appserver/tests/amx/pom.xml b/appserver/tests/amx/pom.xml index 504c446adb2..f3075395af4 100755 --- a/appserver/tests/amx/pom.xml +++ b/appserver/tests/amx/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests tests - 6.2.5 + 6.2.6 4.0.0 amx-tests diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml b/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml index 2ba2f525ab5..4ab0b523ede 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml +++ b/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests ant-tests - 6.2.5 + 6.2.6 org.glassfish.main.tests.connectors diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml index b97ae24c9c9..0f15060e7aa 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests.connectors connectors-ra-redeploy - 6.2.5 + 6.2.6 connectors-ra-redeploy-jars diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml index f146e745cce..769c8eabd98 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests ant-tests - 6.2.5 + 6.2.6 org.glassfish.main.tests.connectors connectors-ra-redeploy diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml index 47e0c4f84f2..8fd3365c1e4 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests.connectors connectors-ra-redeploy - 6.2.5 + 6.2.6 connectors-ra-redeploy-rars-xa rar diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml index 29fc70c023e..df821d17ca2 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests.connectors connectors-ra-redeploy - 6.2.5 + 6.2.6 connectors-ra-redeploy-rars rar diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml index 2052bd6915f..6bd093c22b3 100644 --- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml +++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main batch-dev-tests - 6.2.5 + 6.2.6 batch-commands-tests jar diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml index 61758cc902b..655cca452ee 100644 --- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml +++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main batch-dev-tests - 6.2.5 + 6.2.6 batch-tests-utils jar diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml index 6b6a1c6430b..41d1ba16064 100644 --- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml +++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 batch-dev-tests diff --git a/appserver/tests/appserv-tests/devtests/cdi/pom.xml b/appserver/tests/appserv-tests/devtests/cdi/pom.xml index 6e6bf93f6d2..3f3be935123 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/pom.xml +++ b/appserver/tests/appserv-tests/devtests/cdi/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.tests tests diff --git a/appserver/tests/appserv-tests/devtests/ejb/pom.xml b/appserver/tests/appserv-tests/devtests/ejb/pom.xml index 5f81d8976ee..c8d0d0229a0 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/pom.xml +++ b/appserver/tests/appserv-tests/devtests/ejb/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.tests tests diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml index 4fef1caff0b..30d6fe55e3f 100644 --- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml @@ -21,7 +21,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 4.0.0 diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml index 93c3d2d75d9..63dab3be125 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.jaccApi.test prog-auth - 6.2.5 + 6.2.6 jaccApi-common diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml index 1ec97e3c01f..0c79fdf0da9 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.jaccApi.test prog-auth - 6.2.5 + 6.2.6 pom Programmatic authentication with Jakarta Authorization api diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml index 1cbcc9df070..77edfc1f68a 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml @@ -23,7 +23,7 @@ org.glassfish.jaccApi.test prog-auth - 6.2.5 + 6.2.6 programmatic-authentication-jacc-api diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml index d1119bf7e20..bd1a24dab96 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-bundled-ham-basic-login-config-form diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml index 338689ce523..d55902ba301 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-caller-principal diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml index 45d4ccda854..c45722f8a84 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-custom-identity-store-handler diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml index f51739fc00b..4245febd91d 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-custom-rememberme diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml index 462e704e24a..d5a6b20f502 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-custom-session diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml index 9096e3ff28b..2cb5132a3ec 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-custom diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml index b8b7dc3772e..4b6912f9206 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-db @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml index deab4b271ab..a773056a3e7 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-double-ham @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml index 31148dcbd81..37aab333626 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-ham-ordering @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml index dc45a6a7c7a..5bfa234dd3e 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-mem-basic @@ -41,7 +41,7 @@ org.glassfish.soteria.test common - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml index 480fc5dadb7..689cf923790 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-mem-form @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml index 8975df4ff53..f05f52b8bfd 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-multiple-store-backup @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml index 06938f815b0..28003a41c17 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-multiple-store @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml index c4786f8fe80..ab40989ab80 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-no-application-caller-principal @@ -39,7 +39,7 @@ org.glassfish.soteria.test common - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml index 323012c58ea..4fa2018b39b 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml @@ -24,7 +24,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-no-role-mapping @@ -42,7 +42,7 @@ org.glassfish.soteria.test common - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml index 94cad07b8d7..e2c0414f860 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-securitycontext-auth-ejb @@ -41,7 +41,7 @@ org.glassfish.soteria.test common - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml index bd2713c9020..42ce48ced7d 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 app-securitycontext-auth @@ -41,7 +41,7 @@ org.glassfish.soteria.test common - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml index b7e3e5e0faf..a275362fab6 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 common diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml index 07a6ad6632f..c069d048256 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.soteria.test soteria - 6.2.5 + 6.2.6 pom Soteria ${project.version} Integration tests and examples diff --git a/appserver/tests/appserv-tests/pom.xml b/appserver/tests/appserv-tests/pom.xml index 98a1b493c7c..5afe55c6726 100644 --- a/appserver/tests/appserv-tests/pom.xml +++ b/appserver/tests/appserv-tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main.tests tests - 6.2.5 + 6.2.6 ant-tests diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml index 868e89a7350..42a1598a808 100755 --- a/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi.cases multiBeansXml - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.cdi.cases.multiBeansXml ejb1 - 6.2.5 + 6.2.6 GlassFish Ejb1 With Specific beans.xml diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml index 066e5c5c3a6..270d3122a11 100755 --- a/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi.cases multiBeansXml - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.cdi.cases.multiBeansXml ejb2 - 6.2.5 + 6.2.6 GlassFish Ejb2 With Specific beans.xml diff --git a/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml index 3b8709107ac..2493ad72947 100644 --- a/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi.cases multiBeansXml - 6.2.5 + 6.2.6 org.glassfish.tests.cdi.cases.multiBeansXml diff --git a/appserver/tests/cdi/cases/multiBeansXml/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/pom.xml index 2162638ceb3..c237e18550d 100755 --- a/appserver/tests/cdi/cases/multiBeansXml/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.cdi cases - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.cdi.cases multiBeansXml pom - 6.2.5 + 6.2.6 GlassFish CDI MultiBeanXml Test diff --git a/appserver/tests/cdi/cases/pom.xml b/appserver/tests/cdi/cases/pom.xml index 33472413f8c..cc22a478b74 100755 --- a/appserver/tests/cdi/cases/pom.xml +++ b/appserver/tests/cdi/cases/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests cdi - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.cdi cases pom - 6.2.5 + 6.2.6 GlassFish CDI Test Cases diff --git a/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml index d6f620e6ff2..4b7eee5c5ff 100644 --- a/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi.cases preDestroyScoping - 6.2.5 + 6.2.6 org.glassfish.tests.cdi.cases.preDestroyScoping diff --git a/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml index 41c054d0cc7..720a49b72df 100755 --- a/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi.cases preDestroyScoping - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.cdi.cases.preDestroyScoping lib - 6.2.5 + 6.2.6 GlassFish library for PreDestroyScoping test diff --git a/appserver/tests/cdi/cases/preDestroyScoping/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/pom.xml index 3faea5cd8e1..ee339f790c7 100755 --- a/appserver/tests/cdi/cases/preDestroyScoping/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.cdi cases - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.cdi.cases preDestroyScoping pom - 6.2.5 + 6.2.6 GlassFish CDI PreDestroyScoping Test diff --git a/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml index 56caf55968a..4e35240a971 100644 --- a/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi.cases preDestroyScoping - 6.2.5 + 6.2.6 org.glassfish.tests.cdi.cases.preDestroyScoping diff --git a/appserver/tests/cdi/cases/runner/pom.xml b/appserver/tests/cdi/cases/runner/pom.xml index c60f43a1ac7..9bbfa2391d9 100644 --- a/appserver/tests/cdi/cases/runner/pom.xml +++ b/appserver/tests/cdi/cases/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi cases - 6.2.5 + 6.2.6 org.glassfish.tests.cdi.cases diff --git a/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml b/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml index 5c9243e800c..ff59aeb3a1a 100755 --- a/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml +++ b/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi negative - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.cdi.negative normalScopeWithFinal - 6.2.5 + 6.2.6 GlassFish Normal Scoped Bean With Final Methods diff --git a/appserver/tests/cdi/negative/pom.xml b/appserver/tests/cdi/negative/pom.xml index e5a24bad181..504fe5cab9f 100755 --- a/appserver/tests/cdi/negative/pom.xml +++ b/appserver/tests/cdi/negative/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests cdi - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.cdi negative pom - 6.2.5 + 6.2.6 GlassFish CDI Negative Tests diff --git a/appserver/tests/cdi/negative/runner/pom.xml b/appserver/tests/cdi/negative/runner/pom.xml index 7342b5b0e88..9a2a70eb85f 100644 --- a/appserver/tests/cdi/negative/runner/pom.xml +++ b/appserver/tests/cdi/negative/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi negative - 6.2.5 + 6.2.6 org.glassfish.tests.cdi.negative diff --git a/appserver/tests/cdi/pom.xml b/appserver/tests/cdi/pom.xml index dcc81493239..4a662673fd4 100755 --- a/appserver/tests/cdi/pom.xml +++ b/appserver/tests/cdi/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests tests - 6.2.5 + 6.2.6 org.glassfish.tests diff --git a/appserver/tests/community/pom.xml b/appserver/tests/community/pom.xml index 33e3fdf2670..37a8cf91f8b 100644 --- a/appserver/tests/community/pom.xml +++ b/appserver/tests/community/pom.xml @@ -28,7 +28,7 @@ quicklook Glassfish Quicklook Bundle jar - 6.2.5 + 6.2.6 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/embedded/basic/lifecycle/pom.xml b/appserver/tests/embedded/basic/lifecycle/pom.xml index 8e42796adf1..4e560ead049 100644 --- a/appserver/tests/embedded/basic/lifecycle/pom.xml +++ b/appserver/tests/embedded/basic/lifecycle/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic lifecycle - 6.2.5 + 6.2.6 Test newGlassFish(), start(), stop(), dispose() lifecyle operations diff --git a/appserver/tests/embedded/basic/pom.xml b/appserver/tests/embedded/basic/pom.xml index a700cf67586..e39a76d2791 100755 --- a/appserver/tests/embedded/basic/pom.xml +++ b/appserver/tests/embedded/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded basic - 6.2.5 + 6.2.6 pom Basic tests for testing org.glassfish.embeddable APIs diff --git a/appserver/tests/embedded/cdi_basic/pom.xml b/appserver/tests/embedded/cdi_basic/pom.xml index 0fbb2559861..8cb7007ddd4 100644 --- a/appserver/tests/embedded/cdi_basic/pom.xml +++ b/appserver/tests/embedded/cdi_basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic cdi_basic - 6.2.5 + 6.2.6 Basic CDI Test cdi_basic @@ -57,7 +57,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5 + 6.2.6 junit diff --git a/appserver/tests/embedded/cdi_ejb_jpa/pom.xml b/appserver/tests/embedded/cdi_ejb_jpa/pom.xml index 522ca6f0514..fbe92f50152 100644 --- a/appserver/tests/embedded/cdi_ejb_jpa/pom.xml +++ b/appserver/tests/embedded/cdi_ejb_jpa/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic cdi_ejb_jpa - 6.2.5 + 6.2.6 CDI, EJB, JPA integration test cdi_ejb_jpa diff --git a/appserver/tests/embedded/ejb/basic/pom.xml b/appserver/tests/embedded/ejb/basic/pom.xml index 1a4c7a7a1c8..4d4ffcca336 100644 --- a/appserver/tests/embedded/ejb/basic/pom.xml +++ b/appserver/tests/embedded/ejb/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.ejb basic - 6.2.5 + 6.2.6 Test HelloWorld and Timer EJB deployed with org.glassfish.embeddable APIs @@ -53,7 +53,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5 + 6.2.6 diff --git a/appserver/tests/embedded/ejb/ejb-api/pom.xml b/appserver/tests/embedded/ejb/ejb-api/pom.xml index cb4ba54115e..358cd24f8a6 100644 --- a/appserver/tests/embedded/ejb/ejb-api/pom.xml +++ b/appserver/tests/embedded/ejb/ejb-api/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.ejb ejb-api-test - 6.2.5 + 6.2.6 EJB Embedded API test @@ -57,7 +57,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5 + 6.2.6 diff --git a/appserver/tests/embedded/ejb/ejb-main/pom.xml b/appserver/tests/embedded/ejb/ejb-main/pom.xml index 65111278531..c0b7d0f5900 100644 --- a/appserver/tests/embedded/ejb/ejb-main/pom.xml +++ b/appserver/tests/embedded/ejb/ejb-main/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded ejb - 6.2.5 + 6.2.6 4.0.0 org.glassfish.tests.embedded.ejb diff --git a/appserver/tests/embedded/ejb/pom.xml b/appserver/tests/embedded/ejb/pom.xml index 7dcee0ea63d..f9d67dae9cc 100755 --- a/appserver/tests/embedded/ejb/pom.xml +++ b/appserver/tests/embedded/ejb/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded ejb - 6.2.5 + 6.2.6 pom EJB related Embedded Tests diff --git a/appserver/tests/embedded/ejb/remoteejb/pom.xml b/appserver/tests/embedded/ejb/remoteejb/pom.xml index 31dc20ee100..688a2b7b48a 100644 --- a/appserver/tests/embedded/ejb/remoteejb/pom.xml +++ b/appserver/tests/embedded/ejb/remoteejb/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.ejb remoteejb - 6.2.5 + 6.2.6 Test remote EJB deployment with org.glassfish.embeddable APIs remoteejb @@ -65,7 +65,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5 + 6.2.6 diff --git a/appserver/tests/embedded/glassfish_resources_xml/pom.xml b/appserver/tests/embedded/glassfish_resources_xml/pom.xml index 16e1bfd3ab0..6da2efd1d55 100644 --- a/appserver/tests/embedded/glassfish_resources_xml/pom.xml +++ b/appserver/tests/embedded/glassfish_resources_xml/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic glassfish_resources_xml - 6.2.5 + 6.2.6 CDI, EJB, JPA integration test which has glassfish-resources.xml glassfish_resources_xml diff --git a/appserver/tests/embedded/inplanted/pom.xml b/appserver/tests/embedded/inplanted/pom.xml index e545f9985db..12a28436304 100755 --- a/appserver/tests/embedded/inplanted/pom.xml +++ b/appserver/tests/embedded/inplanted/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 4.0.0 @@ -74,7 +74,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5 + 6.2.6 diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml index 74e0229fd82..f9b53acb970 100644 --- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml +++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin applicationDispatcher diff --git a/appserver/tests/embedded/maven-plugin/dirListing/pom.xml b/appserver/tests/embedded/maven-plugin/dirListing/pom.xml index 7ad3d71402a..bf33d6b65ff 100644 --- a/appserver/tests/embedded/maven-plugin/dirListing/pom.xml +++ b/appserver/tests/embedded/maven-plugin/dirListing/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin dirListing diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml b/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml index 7241a188724..5f6e8b04dc8 100644 --- a/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml +++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin filterURIMapping diff --git a/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml b/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml index 80fe7ae1fd6..a543c41fd1f 100644 --- a/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml +++ b/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin getRequestURI diff --git a/appserver/tests/embedded/maven-plugin/index/pom.xml b/appserver/tests/embedded/maven-plugin/index/pom.xml index 898a2a97485..ca346e81a88 100644 --- a/appserver/tests/embedded/maven-plugin/index/pom.xml +++ b/appserver/tests/embedded/maven-plugin/index/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin index diff --git a/appserver/tests/embedded/maven-plugin/init/pom.xml b/appserver/tests/embedded/maven-plugin/init/pom.xml index cbc52083718..4ae812f7825 100644 --- a/appserver/tests/embedded/maven-plugin/init/pom.xml +++ b/appserver/tests/embedded/maven-plugin/init/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin init diff --git a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml index db924152839..f37d99938e4 100644 --- a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin jmxUndeployEvent diff --git a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml index fd99e9b27b7..be40b3c8c39 100644 --- a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin jsftest diff --git a/appserver/tests/embedded/maven-plugin/jsptest/pom.xml b/appserver/tests/embedded/maven-plugin/jsptest/pom.xml index 0a8da4e437e..c1cabb028b4 100644 --- a/appserver/tests/embedded/maven-plugin/jsptest/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jsptest/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin jsptest diff --git a/appserver/tests/embedded/maven-plugin/localejbs/pom.xml b/appserver/tests/embedded/maven-plugin/localejbs/pom.xml index 2be545b620b..b809b6b670c 100644 --- a/appserver/tests/embedded/maven-plugin/localejbs/pom.xml +++ b/appserver/tests/embedded/maven-plugin/localejbs/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin localejbs diff --git a/appserver/tests/embedded/maven-plugin/mdb/pom.xml b/appserver/tests/embedded/maven-plugin/mdb/pom.xml index ff9446f0fee..297a00623ae 100644 --- a/appserver/tests/embedded/maven-plugin/mdb/pom.xml +++ b/appserver/tests/embedded/maven-plugin/mdb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin mdb diff --git a/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml b/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml index ef546eb72db..a134a241eb2 100644 --- a/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml +++ b/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin multipleApps diff --git a/appserver/tests/embedded/maven-plugin/pom.xml b/appserver/tests/embedded/maven-plugin/pom.xml index 7437f6134ec..90cd2c03dca 100644 --- a/appserver/tests/embedded/maven-plugin/pom.xml +++ b/appserver/tests/embedded/maven-plugin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 pom GlassFish Embedded Maven Plugin Tests diff --git a/appserver/tests/embedded/maven-plugin/queryString/pom.xml b/appserver/tests/embedded/maven-plugin/queryString/pom.xml index fa9b170598a..bf0052e16bd 100644 --- a/appserver/tests/embedded/maven-plugin/queryString/pom.xml +++ b/appserver/tests/embedded/maven-plugin/queryString/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin queryString diff --git a/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml b/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml index 14c903d80ee..a7dd3164762 100644 --- a/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml +++ b/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin remoteejbs diff --git a/appserver/tests/embedded/maven-plugin/scattered/pom.xml b/appserver/tests/embedded/maven-plugin/scattered/pom.xml index 810ac0a40a5..921e77a864e 100644 --- a/appserver/tests/embedded/maven-plugin/scattered/pom.xml +++ b/appserver/tests/embedded/maven-plugin/scattered/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish scattered diff --git a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml index 1ff2667adee..f456f86a44d 100644 --- a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml +++ b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin securewebapp diff --git a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml index 8a2acc57d50..6abc4a60ae3 100644 --- a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml +++ b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin sessionDestroyed diff --git a/appserver/tests/embedded/maven-plugin/simple/pom.xml b/appserver/tests/embedded/maven-plugin/simple/pom.xml index 267158ea79e..e41c8eea2db 100644 --- a/appserver/tests/embedded/maven-plugin/simple/pom.xml +++ b/appserver/tests/embedded/maven-plugin/simple/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish maven-glassfish-plugin-tester-deploy diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml b/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml index d442f6598b3..f9d4ed8316f 100644 --- a/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml +++ b/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin standalonewar diff --git a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml index ced65c8cc79..fc17161c550 100644 --- a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml +++ b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin init diff --git a/appserver/tests/embedded/maven-plugin/webservice/pom.xml b/appserver/tests/embedded/maven-plugin/webservice/pom.xml index a878de5b830..9afe59c034a 100644 --- a/appserver/tests/embedded/maven-plugin/webservice/pom.xml +++ b/appserver/tests/embedded/maven-plugin/webservice/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin webservice diff --git a/appserver/tests/embedded/maven-plugin/websockets/pom.xml b/appserver/tests/embedded/maven-plugin/websockets/pom.xml index 0a09be8850b..3cfc1ce1658 100644 --- a/appserver/tests/embedded/maven-plugin/websockets/pom.xml +++ b/appserver/tests/embedded/maven-plugin/websockets/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.5 + 6.2.6 org.glassfish.tests.embedded.maven-plugin websockets diff --git a/appserver/tests/embedded/mysql/pom.xml b/appserver/tests/embedded/mysql/pom.xml index 080a3d17afe..13cb24459af 100644 --- a/appserver/tests/embedded/mysql/pom.xml +++ b/appserver/tests/embedded/mysql/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded mysql - 6.2.5 + 6.2.6 war Simple web application which uses mysql as database @@ -65,7 +65,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5 + 6.2.6 mysql diff --git a/appserver/tests/embedded/pom.xml b/appserver/tests/embedded/pom.xml index b6d18e9a2ce..c43365f19a4 100755 --- a/appserver/tests/embedded/pom.xml +++ b/appserver/tests/embedded/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests embedded - 6.2.5 + 6.2.6 pom GlassFish Embedded Tests diff --git a/appserver/tests/embedded/scatteredarchive/pom.xml b/appserver/tests/embedded/scatteredarchive/pom.xml index 1c3573c66fd..31acf9e6efd 100644 --- a/appserver/tests/embedded/scatteredarchive/pom.xml +++ b/appserver/tests/embedded/scatteredarchive/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic scatteredarchive - 6.2.5 + 6.2.6 Scattered Archive Test scatteredarchive @@ -57,7 +57,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.5 + 6.2.6 diff --git a/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml b/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml index 99fd09ad56d..07fb8219662 100644 --- a/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml +++ b/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic servlet_runs_admin_cmds - 6.2.5 + 6.2.6 Servlet Running Admin Commands using org.glassfish.embeddable.CommandRunner war diff --git a/appserver/tests/embedded/static/ejb/pom.xml b/appserver/tests/embedded/static/ejb/pom.xml index 07664cc4b14..101d4f0b9c1 100755 --- a/appserver/tests/embedded/static/ejb/pom.xml +++ b/appserver/tests/embedded/static/ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded static - 6.2.5 + 6.2.6 ../../pom.xml org.glassfish.tests.embedded.static diff --git a/appserver/tests/embedded/static/ejb/simple/pom.xml b/appserver/tests/embedded/static/ejb/simple/pom.xml index 5421f13392c..d6e0841da89 100644 --- a/appserver/tests/embedded/static/ejb/simple/pom.xml +++ b/appserver/tests/embedded/static/ejb/simple/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded.static ejb - 6.2.5 + 6.2.6 ../pom.xml 4.0.0 @@ -44,7 +44,7 @@ org.glassfish.extras glassfish-embedded-web - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/embedded/static/pom.xml b/appserver/tests/embedded/static/pom.xml index b78a052709b..90192b93f51 100755 --- a/appserver/tests/embedded/static/pom.xml +++ b/appserver/tests/embedded/static/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded - 6.2.5 + 6.2.6 ../../pom.xml org.glassfish.tests.embedded diff --git a/appserver/tests/embedded/static/web/pom.xml b/appserver/tests/embedded/static/web/pom.xml index 9e87a8efc4a..e389d644f60 100755 --- a/appserver/tests/embedded/static/web/pom.xml +++ b/appserver/tests/embedded/static/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish glassfish-parent - 6.2.5 + 6.2.6 4.0.0 diff --git a/appserver/tests/embedded/utils/pom.xml b/appserver/tests/embedded/utils/pom.xml index 6133ad51bd6..e44527724d7 100644 --- a/appserver/tests/embedded/utils/pom.xml +++ b/appserver/tests/embedded/utils/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.embedded @@ -33,7 +33,7 @@ org.glassfish.main.extras glassfish-embedded-shell - 6.2.5 + 6.2.6 junit diff --git a/appserver/tests/embedded/web/autodelete/pom.xml b/appserver/tests/embedded/web/autodelete/pom.xml index d7e7709d66e..4d4eeac9cf0 100644 --- a/appserver/tests/embedded/web/autodelete/pom.xml +++ b/appserver/tests/embedded/web/autodelete/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded web - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/tests/embedded/web/pom.xml b/appserver/tests/embedded/web/pom.xml index 084d0b0dc02..ba3e167d92f 100755 --- a/appserver/tests/embedded/web/pom.xml +++ b/appserver/tests/embedded/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded web pom - 6.2.5 + 6.2.6 GlassFish Web Embedded Tests web-api diff --git a/appserver/tests/embedded/web/servlet/pom.xml b/appserver/tests/embedded/web/servlet/pom.xml index e92dbba38bd..c39a7f33388 100644 --- a/appserver/tests/embedded/web/servlet/pom.xml +++ b/appserver/tests/embedded/web/servlet/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded web - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/appserver/tests/embedded/web/web-all/pom.xml b/appserver/tests/embedded/web/web-all/pom.xml index 16fe056f582..3110969322d 100644 --- a/appserver/tests/embedded/web/web-all/pom.xml +++ b/appserver/tests/embedded/web/web-all/pom.xml @@ -28,13 +28,13 @@ - + 4.0.0 org.glassfish.tests web-all-embedded-test - 6.2.5 + 6.2.6 Test for glassfish-embedded-web @@ -118,7 +118,7 @@ org.glassfish.extras glassfish-embedded-all - 6.2.5 + 6.2.6 diff --git a/appserver/tests/embedded/web/web-api/pom.xml b/appserver/tests/embedded/web/web-api/pom.xml index 1436205024a..66e5af3e1ba 100755 --- a/appserver/tests/embedded/web/web-api/pom.xml +++ b/appserver/tests/embedded/web/web-api/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded web-api-embedded-test war - 6.2.5 + 6.2.6 Test for glassfish-embedded-web @@ -72,7 +72,7 @@ org.glassfish.main.extras glassfish-embedded-web - 6.2.5 + 6.2.6 junit diff --git a/appserver/tests/embedded/web/web-war/pom.xml b/appserver/tests/embedded/web/web-war/pom.xml index 9bbf1512f69..3f3a66d6c6f 100644 --- a/appserver/tests/embedded/web/web-war/pom.xml +++ b/appserver/tests/embedded/web/web-war/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/test/pom.xml b/appserver/tests/embedded/web/web-war/test/pom.xml index 821ddec445c..a10a5737a8b 100644 --- a/appserver/tests/embedded/web/web-war/test/pom.xml +++ b/appserver/tests/embedded/web/web-war/test/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.5 + 6.2.6 ../pom.xml @@ -139,7 +139,7 @@ org.glassfish.transaction jta - 6.2.5 + 6.2.6 test diff --git a/appserver/tests/embedded/web/web-war/war/pom.xml b/appserver/tests/embedded/web/web-war/war/pom.xml index 915e8538345..92a4434163a 100644 --- a/appserver/tests/embedded/web/web-war/war/pom.xml +++ b/appserver/tests/embedded/web/web-war/war/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml b/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml index 8fa155c4aa7..1050ac68131 100644 --- a/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml +++ b/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml b/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml index 1279bada47f..226b4494259 100644 --- a/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml +++ b/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml b/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml index 07f4cd57af8..7f596b9d7c0 100644 --- a/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml +++ b/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/tests/embedded/wrapper/pom.xml b/appserver/tests/embedded/wrapper/pom.xml index 3f1598f006a..3b42cf05c9f 100644 --- a/appserver/tests/embedded/wrapper/pom.xml +++ b/appserver/tests/embedded/wrapper/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.test test-wrapper - 6.2.5 + 6.2.6 Embedded GlassFish Wrapper diff --git a/appserver/tests/hk2/cdi/basic/ejb1/pom.xml b/appserver/tests/hk2/cdi/basic/ejb1/pom.xml index 94341682060..d0987298415 100644 --- a/appserver/tests/hk2/cdi/basic/ejb1/pom.xml +++ b/appserver/tests/hk2/cdi/basic/ejb1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi basic - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi.basic diff --git a/appserver/tests/hk2/cdi/basic/pom.xml b/appserver/tests/hk2/cdi/basic/pom.xml index bf997104c3d..a46d36f72f1 100755 --- a/appserver/tests/hk2/cdi/basic/pom.xml +++ b/appserver/tests/hk2/cdi/basic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2 cdi - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi diff --git a/appserver/tests/hk2/cdi/basic/runner/pom.xml b/appserver/tests/hk2/cdi/basic/runner/pom.xml index c9c6e31879b..c6ccf60cc4c 100644 --- a/appserver/tests/hk2/cdi/basic/runner/pom.xml +++ b/appserver/tests/hk2/cdi/basic/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi basic - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi.basic diff --git a/appserver/tests/hk2/cdi/ear/app/pom.xml b/appserver/tests/hk2/cdi/ear/app/pom.xml index ad354370b99..00a23f64f46 100644 --- a/appserver/tests/hk2/cdi/ear/app/pom.xml +++ b/appserver/tests/hk2/cdi/ear/app/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/ejb1/pom.xml b/appserver/tests/hk2/cdi/ear/ejb1/pom.xml index e8569abbf9f..011952ef6c8 100644 --- a/appserver/tests/hk2/cdi/ear/ejb1/pom.xml +++ b/appserver/tests/hk2/cdi/ear/ejb1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/ejb2/pom.xml b/appserver/tests/hk2/cdi/ear/ejb2/pom.xml index ef6a53b0e91..4f80bafa067 100644 --- a/appserver/tests/hk2/cdi/ear/ejb2/pom.xml +++ b/appserver/tests/hk2/cdi/ear/ejb2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/lib1/pom.xml b/appserver/tests/hk2/cdi/ear/lib1/pom.xml index 65fe51ca9f0..49325bc71a1 100644 --- a/appserver/tests/hk2/cdi/ear/lib1/pom.xml +++ b/appserver/tests/hk2/cdi/ear/lib1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/pom.xml b/appserver/tests/hk2/cdi/ear/pom.xml index ee48a53d609..7db32bac331 100755 --- a/appserver/tests/hk2/cdi/ear/pom.xml +++ b/appserver/tests/hk2/cdi/ear/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2 cdi - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi diff --git a/appserver/tests/hk2/cdi/ear/runner/pom.xml b/appserver/tests/hk2/cdi/ear/runner/pom.xml index 253ebd0f36d..13209fea94a 100644 --- a/appserver/tests/hk2/cdi/ear/runner/pom.xml +++ b/appserver/tests/hk2/cdi/ear/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/war1/pom.xml b/appserver/tests/hk2/cdi/ear/war1/pom.xml index c90421ab04c..d5c896670e8 100644 --- a/appserver/tests/hk2/cdi/ear/war1/pom.xml +++ b/appserver/tests/hk2/cdi/ear/war1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/war2/pom.xml b/appserver/tests/hk2/cdi/ear/war2/pom.xml index 36c95920a69..a53ef1423ad 100644 --- a/appserver/tests/hk2/cdi/ear/war2/pom.xml +++ b/appserver/tests/hk2/cdi/ear/war2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/jersey/pom.xml b/appserver/tests/hk2/cdi/jersey/pom.xml index 55c28ad5dab..7748d3ea1ad 100755 --- a/appserver/tests/hk2/cdi/jersey/pom.xml +++ b/appserver/tests/hk2/cdi/jersey/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2 cdi - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi diff --git a/appserver/tests/hk2/cdi/jersey/runner/pom.xml b/appserver/tests/hk2/cdi/jersey/runner/pom.xml index 847f3a0b094..19b434f9f48 100644 --- a/appserver/tests/hk2/cdi/jersey/runner/pom.xml +++ b/appserver/tests/hk2/cdi/jersey/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi jersey - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi.jersey diff --git a/appserver/tests/hk2/cdi/jersey/war/pom.xml b/appserver/tests/hk2/cdi/jersey/war/pom.xml index 33ebb388eaf..93c78b4475e 100644 --- a/appserver/tests/hk2/cdi/jersey/war/pom.xml +++ b/appserver/tests/hk2/cdi/jersey/war/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.hk2.cdi jersey - 6.2.5 + 6.2.6 org.glassfish.tests.hk2.cdi.jersey diff --git a/appserver/tests/hk2/cdi/pom.xml b/appserver/tests/hk2/cdi/pom.xml index cd521bb369d..29f6daacaa3 100755 --- a/appserver/tests/hk2/cdi/pom.xml +++ b/appserver/tests/hk2/cdi/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests hk2 - 6.2.5 + 6.2.6 org.glassfish.tests.hk2 diff --git a/appserver/tests/hk2/isolation/pom.xml b/appserver/tests/hk2/isolation/pom.xml index 08802446b09..4ac77491321 100755 --- a/appserver/tests/hk2/isolation/pom.xml +++ b/appserver/tests/hk2/isolation/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests hk2 - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.hk2 isolation pom - 6.2.5 + 6.2.6 GlassFish HK2 Isolation Tests diff --git a/appserver/tests/hk2/isolation/runner/pom.xml b/appserver/tests/hk2/isolation/runner/pom.xml index 58997ade8d9..f8aa8b96026 100755 --- a/appserver/tests/hk2/isolation/runner/pom.xml +++ b/appserver/tests/hk2/isolation/runner/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.hk2 isolation - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.hk2.isolation runner jar - 6.2.5 + 6.2.6 GlassFish HK2 Isolation Test Runner diff --git a/appserver/tests/hk2/isolation/web/iso1/pom.xml b/appserver/tests/hk2/isolation/web/iso1/pom.xml index 4f22a6c032c..c76c7ce9380 100644 --- a/appserver/tests/hk2/isolation/web/iso1/pom.xml +++ b/appserver/tests/hk2/isolation/web/iso1/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.hk2.isolation web - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.hk2.isolation.web iso1 - 6.2.5 + 6.2.6 war Isolation servlet one diff --git a/appserver/tests/hk2/isolation/web/iso2/pom.xml b/appserver/tests/hk2/isolation/web/iso2/pom.xml index b85f6bb5dea..9634cc9fa90 100644 --- a/appserver/tests/hk2/isolation/web/iso2/pom.xml +++ b/appserver/tests/hk2/isolation/web/iso2/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.hk2.isolation web - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.hk2.isolation.web iso2 - 6.2.5 + 6.2.6 war Isolation servlet two diff --git a/appserver/tests/hk2/isolation/web/pom.xml b/appserver/tests/hk2/isolation/web/pom.xml index 95cef2ec7a6..e03da756b89 100755 --- a/appserver/tests/hk2/isolation/web/pom.xml +++ b/appserver/tests/hk2/isolation/web/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.hk2 isolation - 6.2.5 + 6.2.6 ../pom.xml org.glassfish.tests.hk2.isolation web pom - 6.2.5 + 6.2.6 GlassFish HK2 Isolation WebApps diff --git a/appserver/tests/hk2/pom.xml b/appserver/tests/hk2/pom.xml index 135be4df7c5..213f264aaab 100755 --- a/appserver/tests/hk2/pom.xml +++ b/appserver/tests/hk2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests tests - 6.2.5 + 6.2.6 org.glassfish.tests diff --git a/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml b/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml index 04cc4bdf266..d2635421f22 100644 --- a/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml +++ b/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas appscoped-db-with-resources-xml - 6.2.5 + 6.2.6 Appscoped DB Service with glassfish-resources.xml sample war diff --git a/appserver/tests/paas/basic-bookstore-dns/pom.xml b/appserver/tests/paas/basic-bookstore-dns/pom.xml index e588fb9a39e..1888274b08e 100644 --- a/appserver/tests/paas/basic-bookstore-dns/pom.xml +++ b/appserver/tests/paas/basic-bookstore-dns/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-bookstore-dns - 6.2.5 + 6.2.6 Basic Bookstore DNS sample war diff --git a/appserver/tests/paas/basic-db-initsql/pom.xml b/appserver/tests/paas/basic-db-initsql/pom.xml index 31287a9e91f..bbbd5f7cb39 100644 --- a/appserver/tests/paas/basic-db-initsql/pom.xml +++ b/appserver/tests/paas/basic-db-initsql/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db-initsql - 6.2.5 + 6.2.6 Basic InitSQL PaaS sample war diff --git a/appserver/tests/paas/basic-db-teardown-sql/pom.xml b/appserver/tests/paas/basic-db-teardown-sql/pom.xml index eb5ee41dab1..aaa77adbdf8 100644 --- a/appserver/tests/paas/basic-db-teardown-sql/pom.xml +++ b/appserver/tests/paas/basic-db-teardown-sql/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db-teardown-sql - 6.2.5 + 6.2.6 Basic DB Tear down SQL PaaS sample war diff --git a/appserver/tests/paas/basic-db-with-resources-xml/pom.xml b/appserver/tests/paas/basic-db-with-resources-xml/pom.xml index 6b4b06cd7bd..b84d4e026b4 100644 --- a/appserver/tests/paas/basic-db-with-resources-xml/pom.xml +++ b/appserver/tests/paas/basic-db-with-resources-xml/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db-with-resources-xml - 6.2.5 + 6.2.6 Basic DB with glassfish-resources.xml sample war diff --git a/appserver/tests/paas/basic-db/pom.xml b/appserver/tests/paas/basic-db/pom.xml index 2a2cc5028f7..f221d03d4f0 100644 --- a/appserver/tests/paas/basic-db/pom.xml +++ b/appserver/tests/paas/basic-db/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db - 6.2.5 + 6.2.6 Basic PaaS sample war diff --git a/appserver/tests/paas/basic-jpa/pom.xml b/appserver/tests/paas/basic-jpa/pom.xml index b3a9a6f041e..fa3b14f3f69 100644 --- a/appserver/tests/paas/basic-jpa/pom.xml +++ b/appserver/tests/paas/basic-jpa/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-jpa - 6.2.5 + 6.2.6 Basic JPA PaaS sample war diff --git a/appserver/tests/paas/basic-service-discovery/pom.xml b/appserver/tests/paas/basic-service-discovery/pom.xml index 33e3020d207..b5912e1c4f9 100644 --- a/appserver/tests/paas/basic-service-discovery/pom.xml +++ b/appserver/tests/paas/basic-service-discovery/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-sd - 6.2.5 + 6.2.6 Basic Service Discovery PaaS sample war diff --git a/appserver/tests/paas/basic-shared-service-test/pom.xml b/appserver/tests/paas/basic-shared-service-test/pom.xml index 2c014f2e2ed..9b2c4d84cb6 100644 --- a/appserver/tests/paas/basic-shared-service-test/pom.xml +++ b/appserver/tests/paas/basic-shared-service-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-shared-service-test - 6.2.5 + 6.2.6 Basic Shared Sevice Test war diff --git a/appserver/tests/paas/basic/pom.xml b/appserver/tests/paas/basic/pom.xml index 4a7ce54d031..323280817ae 100644 --- a/appserver/tests/paas/basic/pom.xml +++ b/appserver/tests/paas/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic - 6.2.5 + 6.2.6 Basic PaaS sample war diff --git a/appserver/tests/paas/bookstore/pom.xml b/appserver/tests/paas/bookstore/pom.xml index 7d95043c2f1..756438b1361 100644 --- a/appserver/tests/paas/bookstore/pom.xml +++ b/appserver/tests/paas/bookstore/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas bookstore - 6.2.5 + 6.2.6 Bookstore PaaS sample war diff --git a/appserver/tests/paas/deployment-rollback/pom.xml b/appserver/tests/paas/deployment-rollback/pom.xml index 912a0d79f34..c2ab5b985de 100644 --- a/appserver/tests/paas/deployment-rollback/pom.xml +++ b/appserver/tests/paas/deployment-rollback/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas rollback-test - 6.2.5 + 6.2.6 Deployment Rollback Test war diff --git a/appserver/tests/paas/enable-disable-test/pom.xml b/appserver/tests/paas/enable-disable-test/pom.xml index 0789a141895..6148ac9daba 100644 --- a/appserver/tests/paas/enable-disable-test/pom.xml +++ b/appserver/tests/paas/enable-disable-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas enable-disable-test - 6.2.5 + 6.2.6 Enable Disable Test war diff --git a/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml b/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml index 1692853ea0a..4fa168e848f 100644 --- a/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml +++ b/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas ext-shared-service-enable-disable-test - 6.2.5 + 6.2.6 Enable Disable External and Shared Service Test war diff --git a/appserver/tests/paas/external-and-shared-service/pom.xml b/appserver/tests/paas/external-and-shared-service/pom.xml index 7d235e0875d..6906312fd8c 100644 --- a/appserver/tests/paas/external-and-shared-service/pom.xml +++ b/appserver/tests/paas/external-and-shared-service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas external-and-shared-service-test - 6.2.5 + 6.2.6 External and Shared Service Test war diff --git a/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml b/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml index 8a8874cb9e7..2bae373d00a 100644 --- a/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml +++ b/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main paas.plugins - 6.2.5 + 6.2.6 4.0.0 generatederbyvm diff --git a/appserver/tests/paas/external-db-service/pom.xml b/appserver/tests/paas/external-db-service/pom.xml index a8115908647..3c6a5cf353d 100644 --- a/appserver/tests/paas/external-db-service/pom.xml +++ b/appserver/tests/paas/external-db-service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas external-service-test - 6.2.5 + 6.2.6 External DB Service TesT pom diff --git a/appserver/tests/paas/external-db-service/test/pom.xml b/appserver/tests/paas/external-db-service/test/pom.xml index e952d64b60c..bd656bbc1ef 100644 --- a/appserver/tests/paas/external-db-service/test/pom.xml +++ b/appserver/tests/paas/external-db-service/test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas external-db-service-test - 6.2.5 + 6.2.6 External DB Service PaaS application war diff --git a/appserver/tests/paas/helloworld/pom.xml b/appserver/tests/paas/helloworld/pom.xml index 2f89adbb1c8..d401dd315b9 100644 --- a/appserver/tests/paas/helloworld/pom.xml +++ b/appserver/tests/paas/helloworld/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas helloworld - 6.2.5 + 6.2.6 PaaS Hello World sample war diff --git a/appserver/tests/paas/javaee_shared_service/pom.xml b/appserver/tests/paas/javaee_shared_service/pom.xml index 86be48a2512..bb0cc70f705 100644 --- a/appserver/tests/paas/javaee_shared_service/pom.xml +++ b/appserver/tests/paas/javaee_shared_service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas bookstore2 - 6.2.5 + 6.2.6 Bookstore PaaS sample running on Java EE (GlassFish) shared service. war diff --git a/appserver/tests/paas/lazy-shared-service-test/pom.xml b/appserver/tests/paas/lazy-shared-service-test/pom.xml index 68323ebccbd..6d4068da210 100644 --- a/appserver/tests/paas/lazy-shared-service-test/pom.xml +++ b/appserver/tests/paas/lazy-shared-service-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas lazy-shared-service-test - 6.2.5 + 6.2.6 Lazy Shared Service PaaS sample war diff --git a/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml b/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml index ca63c7406ac..99faa57affb 100644 --- a/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml +++ b/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas mq-test - 6.2.5 + 6.2.6 MQ Shared Service Test jar diff --git a/appserver/tests/paas/mq-shared-service-test/pom.xml b/appserver/tests/paas/mq-shared-service-test/pom.xml index f07e0932eca..02829c74ed7 100644 --- a/appserver/tests/paas/mq-shared-service-test/pom.xml +++ b/appserver/tests/paas/mq-shared-service-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas mq-shared-service-test - 6.2.5 + 6.2.6 MQ Shared Service TesT pom diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml b/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml index d28a11c2502..b011b668c95 100644 --- a/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml +++ b/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-app-scoped-service-test-advanced - 6.2.5 + 6.2.6 Multiple Application Scoped Database Services Advanced PaaS Application war diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml b/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml index dd2f75fd4e9..3bf036b5028 100644 --- a/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml +++ b/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-app-scoped-service-test-basic - 6.2.5 + 6.2.6 Multiple Application Scoped Database Services Basic PaaS Application war diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml b/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml index 39a33117108..dbf588bb0cc 100644 --- a/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml +++ b/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-db-app-scoped-services - 6.2.5 + 6.2.6 Multiple DB App Scoped Services pom diff --git a/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml b/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml index bef625e3a3e..00a6cc2f248 100644 --- a/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml +++ b/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-shared-db-service-test - 6.2.5 + 6.2.6 Multiple Shared DB service PaaS application war diff --git a/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml b/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml index 4d8fd03974e..ca7e8a56c59 100644 --- a/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml +++ b/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-shared-db-service-test-basic - 6.2.5 + 6.2.6 Multiple Shared DB service Basic PaaS application war diff --git a/appserver/tests/paas/multiple-db-shared-services/pom.xml b/appserver/tests/paas/multiple-db-shared-services/pom.xml index f8d0ee217c6..e3a9136b2b0 100644 --- a/appserver/tests/paas/multiple-db-shared-services/pom.xml +++ b/appserver/tests/paas/multiple-db-shared-services/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-db-shared-services - 6.2.5 + 6.2.6 Multiple DB Shared Services pom diff --git a/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml b/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml index 9fd0defe904..b0afa89dc76 100644 --- a/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml +++ b/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml @@ -22,13 +22,13 @@ org.glassfish paas.plugins - 6.2.5 + 6.2.6 4.0.0 org.glassfish paas.mydbplugin - 6.2.5 + 6.2.6 MyDB Plugin diff --git a/appserver/tests/paas/multiple-spe-test/pom.xml b/appserver/tests/paas/multiple-spe-test/pom.xml index 66460a611d7..57baffeeb14 100644 --- a/appserver/tests/paas/multiple-spe-test/pom.xml +++ b/appserver/tests/paas/multiple-spe-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-spe-test - 6.2.5 + 6.2.6 Multiple SPE TesT pom diff --git a/appserver/tests/paas/multiple-spe-test/spetest/pom.xml b/appserver/tests/paas/multiple-spe-test/spetest/pom.xml index 22931ef79f6..11424c1806c 100644 --- a/appserver/tests/paas/multiple-spe-test/spetest/pom.xml +++ b/appserver/tests/paas/multiple-spe-test/spetest/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-spe-test - 6.2.5 + 6.2.6 Basic SPE Test war diff --git a/appserver/tests/paas/pom.xml b/appserver/tests/paas/pom.xml index 04b4cd99a55..8b5199f9777 100644 --- a/appserver/tests/paas/pom.xml +++ b/appserver/tests/paas/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests paas - 6.2.5 + 6.2.6 PaaS samples pom diff --git a/appserver/tests/paas/scale_service/pom.xml b/appserver/tests/paas/scale_service/pom.xml index 5fcff339153..d8ba032969f 100644 --- a/appserver/tests/paas/scale_service/pom.xml +++ b/appserver/tests/paas/scale_service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas scale_service - 6.2.5 + 6.2.6 Scale Service PaaS sample war diff --git a/appserver/tests/paas/service_metadata/custom_db_name/pom.xml b/appserver/tests/paas/service_metadata/custom_db_name/pom.xml index 1e83a5efa64..1c88ff5cd35 100644 --- a/appserver/tests/paas/service_metadata/custom_db_name/pom.xml +++ b/appserver/tests/paas/service_metadata/custom_db_name/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas custom_db_name - 6.2.5 + 6.2.6 Custom DB Name PaaS sample war diff --git a/appserver/tests/paas/service_metadata/pom.xml b/appserver/tests/paas/service_metadata/pom.xml index f81b4856c02..f8de3c289ca 100644 --- a/appserver/tests/paas/service_metadata/pom.xml +++ b/appserver/tests/paas/service_metadata/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas service_metadata - 6.2.5 + 6.2.6 Service Metadata PaaS samples pom diff --git a/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml b/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml index 8f87931fabe..5257c0d0450 100644 --- a/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml +++ b/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas service_metadata.provision_using_specified_template - 6.2.5 + 6.2.6 Provision service(s) using specified template war diff --git a/appserver/tests/pom.xml b/appserver/tests/pom.xml index 5e69a31ad7e..3e0304fe2ad 100755 --- a/appserver/tests/pom.xml +++ b/appserver/tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 org.glassfish.main.tests diff --git a/appserver/tests/quicklook/admin/pom.xml b/appserver/tests/quicklook/admin/pom.xml index 223653ce4a0..87c7b06d033 100644 --- a/appserver/tests/quicklook/admin/pom.xml +++ b/appserver/tests/quicklook/admin/pom.xml @@ -26,7 +26,7 @@ org.glassfish.quicklook quicklook - 6.2.5 + 6.2.6 ../pom.xml Runs the tests on admin/asadmin code diff --git a/appserver/tests/quicklook/adminconsole/pom.xml b/appserver/tests/quicklook/adminconsole/pom.xml index 8c8995bea2a..afc19623be5 100644 --- a/appserver/tests/quicklook/adminconsole/pom.xml +++ b/appserver/tests/quicklook/adminconsole/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.quicklook adminconsole - 6.2.5 + 6.2.6 Admin Console Quicklook Tests jar @@ -101,7 +101,7 @@ org.glassfish.common amx-core - 6.2.5 + 6.2.6 diff --git a/appserver/tests/quicklook/amx/pom.xml b/appserver/tests/quicklook/amx/pom.xml index c7622d082bc..ecea889e9bc 100644 --- a/appserver/tests/quicklook/amx/pom.xml +++ b/appserver/tests/quicklook/amx/pom.xml @@ -26,7 +26,7 @@ org.glassfish.quicklook quicklook - 6.2.5 + 6.2.6 ../pom.xml Runs the tests on admin/asadmin code diff --git a/appserver/tests/quicklook/ejb/cmp/pom.xml b/appserver/tests/quicklook/ejb/cmp/pom.xml index 374fd09dab0..69e4ff32a21 100644 --- a/appserver/tests/quicklook/ejb/cmp/pom.xml +++ b/appserver/tests/quicklook/ejb/cmp/pom.xml @@ -28,7 +28,7 @@ cmp_quicklook CMP Roster App Quicklook jar - 6.2.5 + 6.2.6 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/embedded/pom.xml b/appserver/tests/quicklook/ejb/embedded/pom.xml index 5e224baf11a..85ef3fb9e34 100644 --- a/appserver/tests/quicklook/ejb/embedded/pom.xml +++ b/appserver/tests/quicklook/ejb/embedded/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.5 + 6.2.6 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/remoteview/pom.xml b/appserver/tests/quicklook/ejb/remoteview/pom.xml index 5e224baf11a..85ef3fb9e34 100644 --- a/appserver/tests/quicklook/ejb/remoteview/pom.xml +++ b/appserver/tests/quicklook/ejb/remoteview/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.5 + 6.2.6 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/sfulnoi/pom.xml b/appserver/tests/quicklook/ejb/sfulnoi/pom.xml index 5e224baf11a..85ef3fb9e34 100644 --- a/appserver/tests/quicklook/ejb/sfulnoi/pom.xml +++ b/appserver/tests/quicklook/ejb/sfulnoi/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.5 + 6.2.6 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/singleton/pom.xml b/appserver/tests/quicklook/ejb/singleton/pom.xml index 5e224baf11a..85ef3fb9e34 100644 --- a/appserver/tests/quicklook/ejb/singleton/pom.xml +++ b/appserver/tests/quicklook/ejb/singleton/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.5 + 6.2.6 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml b/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml index 5e224baf11a..85ef3fb9e34 100644 --- a/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml +++ b/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.5 + 6.2.6 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/jms/injection/pom.xml b/appserver/tests/quicklook/jms/injection/pom.xml index e036a69c459..93cbbf0324d 100644 --- a/appserver/tests/quicklook/jms/injection/pom.xml +++ b/appserver/tests/quicklook/jms/injection/pom.xml @@ -28,7 +28,7 @@ injection_quicklook Glassfish JMS Injection Quicklook jar - 6.2.5 + 6.2.6 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/pom.xml b/appserver/tests/quicklook/pom.xml index e9f7fd7cf7f..b45f53a87c0 100644 --- a/appserver/tests/quicklook/pom.xml +++ b/appserver/tests/quicklook/pom.xml @@ -29,7 +29,7 @@ quicklook Glassfish Quicklook Bundle jar - 6.2.5 + 6.2.6 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/rest/pom.xml b/appserver/tests/quicklook/rest/pom.xml index 3727b9da7e7..8da6f03af35 100644 --- a/appserver/tests/quicklook/rest/pom.xml +++ b/appserver/tests/quicklook/rest/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.quicklook rest - 6.2.5 + 6.2.6 REST API Quicklook Tests jar diff --git a/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml b/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml index 907f57ac6e6..88e1798f71e 100644 --- a/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml +++ b/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml @@ -28,7 +28,7 @@ wsit_quicklook Glassfish Web Services Quicklook jar - 6.2.5 + 6.2.6 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/wsit/jsr109tester/pom.xml b/appserver/tests/quicklook/wsit/jsr109tester/pom.xml index 1aa8659d9e3..12f7a3e2516 100644 --- a/appserver/tests/quicklook/wsit/jsr109tester/pom.xml +++ b/appserver/tests/quicklook/wsit/jsr109tester/pom.xml @@ -29,7 +29,7 @@ wsit_quicklook Glassfish Web Services Quicklook jar - 6.2.5 + 6.2.6 This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/sse/basic/pom.xml b/appserver/tests/sse/basic/pom.xml index 945e7dc7a41..43b6fd68b18 100644 --- a/appserver/tests/sse/basic/pom.xml +++ b/appserver/tests/sse/basic/pom.xml @@ -37,7 +37,7 @@ org.glassfish.main.web web-sse - 6.2.5 + 6.2.6 provided diff --git a/appserver/tests/sse/videoplayer/pom.xml b/appserver/tests/sse/videoplayer/pom.xml index 30000521793..98bae196c41 100644 --- a/appserver/tests/sse/videoplayer/pom.xml +++ b/appserver/tests/sse/videoplayer/pom.xml @@ -37,7 +37,7 @@ org.glassfish.main.web web-sse - 6.2.5 + 6.2.6 provided diff --git a/appserver/tests/tck/authentication/pom.xml b/appserver/tests/tck/authentication/pom.xml index fbdf29ccd22..421cec147db 100644 --- a/appserver/tests/tck/authentication/pom.xml +++ b/appserver/tests/tck/authentication/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.5 + 6.2.6 glassfish-external-tck-authentication diff --git a/appserver/tests/tck/authorization/pom.xml b/appserver/tests/tck/authorization/pom.xml index 39f5f51e52c..5b16e508456 100644 --- a/appserver/tests/tck/authorization/pom.xml +++ b/appserver/tests/tck/authorization/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.5 + 6.2.6 glassfish-external-tck-authorization diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml index 5678616fa7e..875c5c13669 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck embedded-ejb-smoke - 6.2.5 + 6.2.6 ejb-lite-basic diff --git a/appserver/tests/tck/embedded_ejb_smoke/pom.xml b/appserver/tests/tck/embedded_ejb_smoke/pom.xml index c731b5a3fe0..d293acd3d1f 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/pom.xml +++ b/appserver/tests/tck/embedded_ejb_smoke/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.5 + 6.2.6 embedded-ejb-smoke diff --git a/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml b/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml index c0ec0306469..4f270ff1327 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml +++ b/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck embedded-ejb-smoke - 6.2.5 + 6.2.6 embedded-ejb-smoke-runner diff --git a/appserver/tests/tck/faces/pom.xml b/appserver/tests/tck/faces/pom.xml index cf1594e5d63..bf77b15abe5 100644 --- a/appserver/tests/tck/faces/pom.xml +++ b/appserver/tests/tck/faces/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.5 + 6.2.6 glassfish-external-tck-faces diff --git a/appserver/tests/tck/pom.xml b/appserver/tests/tck/pom.xml index 0cf8739c600..e807c40f297 100644 --- a/appserver/tests/tck/pom.xml +++ b/appserver/tests/tck/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests tests - 6.2.5 + 6.2.6 org.glassfish.main.tests.tck diff --git a/appserver/tests/tck/rest/pom.xml b/appserver/tests/tck/rest/pom.xml index 8521cb785be..4f97f34b399 100644 --- a/appserver/tests/tck/rest/pom.xml +++ b/appserver/tests/tck/rest/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.5 + 6.2.6 glassfish-external-tck-rest diff --git a/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml index 32d88e83d66..3cfe679de99 100644 --- a/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5 + 6.2.6 jakarta-authentication-tck diff --git a/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml index 7065160db22..0aea32e7c30 100644 --- a/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5 + 6.2.6 jakarta-authorization-tck diff --git a/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml index 57e8b958d41..865324a6ec0 100644 --- a/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5 + 6.2.6 jakarta-faces-tck diff --git a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml index 15deb9965ef..94cb3456a08 100644 --- a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5 + 6.2.6 jakarta-rest-tck diff --git a/appserver/tests/tck/tck-download/javatest/pom.xml b/appserver/tests/tck/tck-download/javatest/pom.xml index 7b794196826..909d149d38d 100644 --- a/appserver/tests/tck/tck-download/javatest/pom.xml +++ b/appserver/tests/tck/tck-download/javatest/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5 + 6.2.6 javatest diff --git a/appserver/tests/tck/tck-download/pom.xml b/appserver/tests/tck/tck-download/pom.xml index 549727197a7..e75e4dcfe90 100644 --- a/appserver/tests/tck/tck-download/pom.xml +++ b/appserver/tests/tck/tck-download/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main.tests.tck tck - 6.2.5 + 6.2.6 tck-download diff --git a/appserver/tests/tck/tck-download/tsharness/pom.xml b/appserver/tests/tck/tck-download/tsharness/pom.xml index fd70f4981e1..159c3d937c5 100644 --- a/appserver/tests/tck/tck-download/tsharness/pom.xml +++ b/appserver/tests/tck/tck-download/tsharness/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.5 + 6.2.6 tsharness diff --git a/appserver/transaction/internal-api/pom.xml b/appserver/transaction/internal-api/pom.xml index 2e24f5e0a3f..79042da963f 100644 --- a/appserver/transaction/internal-api/pom.xml +++ b/appserver/transaction/internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.transaction transaction - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/transaction/jta/pom.xml b/appserver/transaction/jta/pom.xml index 1995bcae066..9c9fbcfc903 100644 --- a/appserver/transaction/jta/pom.xml +++ b/appserver/transaction/jta/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.transaction transaction - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/transaction/jts/pom.xml b/appserver/transaction/jts/pom.xml index b452791c0f3..7f2584fdd71 100644 --- a/appserver/transaction/jts/pom.xml +++ b/appserver/transaction/jts/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.transaction transaction - 6.2.5 + 6.2.6 jts diff --git a/appserver/transaction/pom.xml b/appserver/transaction/pom.xml index de576741347..e9192b750f4 100644 --- a/appserver/transaction/pom.xml +++ b/appserver/transaction/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/admin/pom.xml b/appserver/web/admin/pom.xml index 5cba3d921a1..f06900f6e5b 100644 --- a/appserver/web/admin/pom.xml +++ b/appserver/web/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/cdi-api-fragment/pom.xml b/appserver/web/cdi-api-fragment/pom.xml index 2d6037c3b3a..f455c6fb29e 100644 --- a/appserver/web/cdi-api-fragment/pom.xml +++ b/appserver/web/cdi-api-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/gf-web-connector/pom.xml b/appserver/web/gf-web-connector/pom.xml index b8da43e6353..646b96a27f5 100755 --- a/appserver/web/gf-web-connector/pom.xml +++ b/appserver/web/gf-web-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/gf-weld-connector/pom.xml b/appserver/web/gf-weld-connector/pom.xml index f815b2bd06f..126e67f7013 100644 --- a/appserver/web/gf-weld-connector/pom.xml +++ b/appserver/web/gf-weld-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/gui-plugin-common/pom.xml b/appserver/web/gui-plugin-common/pom.xml index e4e9a14d92f..523ff44ef45 100755 --- a/appserver/web/gui-plugin-common/pom.xml +++ b/appserver/web/gui-plugin-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/jersey-ejb-component-provider/pom.xml b/appserver/web/jersey-ejb-component-provider/pom.xml index 887ab7b71c1..900c86d6d43 100644 --- a/appserver/web/jersey-ejb-component-provider/pom.xml +++ b/appserver/web/jersey-ejb-component-provider/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 jersey-ejb-component-provider diff --git a/appserver/web/jersey-mvc-connector/pom.xml b/appserver/web/jersey-mvc-connector/pom.xml index 31d03b9bc00..f1b25403c2b 100644 --- a/appserver/web/jersey-mvc-connector/pom.xml +++ b/appserver/web/jersey-mvc-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/jsf-connector/pom.xml b/appserver/web/jsf-connector/pom.xml index 5a1f6f42114..8015177aaad 100644 --- a/appserver/web/jsf-connector/pom.xml +++ b/appserver/web/jsf-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/jspcaching-connector/pom.xml b/appserver/web/jspcaching-connector/pom.xml index 2399ada3473..27b8bfb95f2 100644 --- a/appserver/web/jspcaching-connector/pom.xml +++ b/appserver/web/jspcaching-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/jstl-connector/pom.xml b/appserver/web/jstl-connector/pom.xml index 155f5b51db0..5e38ce06935 100644 --- a/appserver/web/jstl-connector/pom.xml +++ b/appserver/web/jstl-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/pom.xml b/appserver/web/pom.xml index f6b398f5db3..fa4474fac2d 100755 --- a/appserver/web/pom.xml +++ b/appserver/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/war-util/pom.xml b/appserver/web/war-util/pom.xml index a9e2928a97a..70e872191c3 100755 --- a/appserver/web/war-util/pom.xml +++ b/appserver/web/war-util/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/web-core/pom.xml b/appserver/web/web-core/pom.xml index cdaa92fb3c9..2cec6d8802b 100755 --- a/appserver/web/web-core/pom.xml +++ b/appserver/web/web-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/web-embed/api/pom.xml b/appserver/web/web-embed/api/pom.xml index 30b72b192e9..b06a10a711e 100755 --- a/appserver/web/web-embed/api/pom.xml +++ b/appserver/web/web-embed/api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web-embed - 6.2.5 + 6.2.6 web-embed-api diff --git a/appserver/web/web-embed/pom.xml b/appserver/web/web-embed/pom.xml index 37f3f3a230b..c0d0577aaea 100755 --- a/appserver/web/web-embed/pom.xml +++ b/appserver/web/web-embed/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/web-glue/pom.xml b/appserver/web/web-glue/pom.xml index 835c6bd4536..f72ce66b9d5 100755 --- a/appserver/web/web-glue/pom.xml +++ b/appserver/web/web-glue/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/web-ha/pom.xml b/appserver/web/web-ha/pom.xml index 8742a0c6e8b..0b1ea9a7a63 100755 --- a/appserver/web/web-ha/pom.xml +++ b/appserver/web/web-ha/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/web-naming/pom.xml b/appserver/web/web-naming/pom.xml index 00c9f1dd4a1..566943a626d 100755 --- a/appserver/web/web-naming/pom.xml +++ b/appserver/web/web-naming/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/web-sse/pom.xml b/appserver/web/web-sse/pom.xml index 24cb9b672ab..aed76fda3d1 100755 --- a/appserver/web/web-sse/pom.xml +++ b/appserver/web/web-sse/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/webtier-all/pom.xml b/appserver/web/webtier-all/pom.xml index 6f60cfe15b0..c2bcb4a54fa 100755 --- a/appserver/web/webtier-all/pom.xml +++ b/appserver/web/webtier-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/weld-integration-fragment/pom.xml b/appserver/web/weld-integration-fragment/pom.xml index 845c44c4d17..1f695604cb2 100644 --- a/appserver/web/weld-integration-fragment/pom.xml +++ b/appserver/web/weld-integration-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 weld-integration-fragment diff --git a/appserver/web/weld-integration-test-fragment/pom.xml b/appserver/web/weld-integration-test-fragment/pom.xml index cdb3d9ca9eb..5c15fb0b1d0 100644 --- a/appserver/web/weld-integration-test-fragment/pom.xml +++ b/appserver/web/weld-integration-test-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml index 6acbd1ebd31..8c00bd4af8c 100644 --- a/appserver/web/weld-integration/pom.xml +++ b/appserver/web/weld-integration/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/webservices/connector/pom.xml b/appserver/webservices/connector/pom.xml index 810c8457fae..c15f7f0deaa 100755 --- a/appserver/webservices/connector/pom.xml +++ b/appserver/webservices/connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5 + 6.2.6 webservices-connector diff --git a/appserver/webservices/jsr109-impl/pom.xml b/appserver/webservices/jsr109-impl/pom.xml index defc5d6f2d5..8a9a90f9226 100755 --- a/appserver/webservices/jsr109-impl/pom.xml +++ b/appserver/webservices/jsr109-impl/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5 + 6.2.6 jsr109-impl diff --git a/appserver/webservices/metro-fragments/pom.xml b/appserver/webservices/metro-fragments/pom.xml index a24a2063241..2d8533b39e7 100644 --- a/appserver/webservices/metro-fragments/pom.xml +++ b/appserver/webservices/metro-fragments/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5 + 6.2.6 metro-fragments diff --git a/appserver/webservices/metro-glue/pom.xml b/appserver/webservices/metro-glue/pom.xml index fff3b4cda43..4bcf8d266f5 100644 --- a/appserver/webservices/metro-glue/pom.xml +++ b/appserver/webservices/metro-glue/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/webservices/pom.xml b/appserver/webservices/pom.xml index b518ea8fa7c..91349495b1d 100755 --- a/appserver/webservices/pom.xml +++ b/appserver/webservices/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/webservices/soap-tcp/pom.xml b/appserver/webservices/soap-tcp/pom.xml index d7d875ca208..eb83ebb0c0f 100755 --- a/appserver/webservices/soap-tcp/pom.xml +++ b/appserver/webservices/soap-tcp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5 + 6.2.6 ../pom.xml diff --git a/appserver/webservices/webservices-scripts/pom.xml b/appserver/webservices/webservices-scripts/pom.xml index 06ef6deea2c..a369ff94790 100644 --- a/appserver/webservices/webservices-scripts/pom.xml +++ b/appserver/webservices/webservices-scripts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.5 + 6.2.6 webservices-scripts diff --git a/docs/add-on-component-development-guide/pom.xml b/docs/add-on-component-development-guide/pom.xml index a7c69291a84..08118b90698 100644 --- a/docs/add-on-component-development-guide/pom.xml +++ b/docs/add-on-component-development-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/administration-guide/pom.xml b/docs/administration-guide/pom.xml index 715beaa1789..39d40345861 100644 --- a/docs/administration-guide/pom.xml +++ b/docs/administration-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/application-deployment-guide/pom.xml b/docs/application-deployment-guide/pom.xml index 6784e7656d2..4389e2c8700 100644 --- a/docs/application-deployment-guide/pom.xml +++ b/docs/application-deployment-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/application-development-guide/pom.xml b/docs/application-development-guide/pom.xml index e5adc8e21b1..191b2f35b63 100644 --- a/docs/application-development-guide/pom.xml +++ b/docs/application-development-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/deployment-planning-guide/pom.xml b/docs/deployment-planning-guide/pom.xml index 2eff842f273..1cd19ebc529 100644 --- a/docs/deployment-planning-guide/pom.xml +++ b/docs/deployment-planning-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/distribution/pom.xml b/docs/distribution/pom.xml index 76cbe7f59ec..237fd99327a 100644 --- a/docs/distribution/pom.xml +++ b/docs/distribution/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.5 + 6.2.6 org.glassfish.docs distribution diff --git a/docs/embedded-server-guide/pom.xml b/docs/embedded-server-guide/pom.xml index 9fca9b4838d..50e0e8adb3a 100644 --- a/docs/embedded-server-guide/pom.xml +++ b/docs/embedded-server-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/error-messages-reference/pom.xml b/docs/error-messages-reference/pom.xml index 8105d42bb12..20c639bdb6a 100644 --- a/docs/error-messages-reference/pom.xml +++ b/docs/error-messages-reference/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/ha-administration-guide/pom.xml b/docs/ha-administration-guide/pom.xml index ba8edb769bc..9cfb42db10e 100644 --- a/docs/ha-administration-guide/pom.xml +++ b/docs/ha-administration-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/installation-guide/pom.xml b/docs/installation-guide/pom.xml index 314a632d093..25d617045c2 100644 --- a/docs/installation-guide/pom.xml +++ b/docs/installation-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/parent/pom.xml b/docs/parent/pom.xml index 57d25b04171..c31f3215a58 100644 --- a/docs/parent/pom.xml +++ b/docs/parent/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.5 + 6.2.6 org.glassfish.docs parent diff --git a/docs/performance-tuning-guide/pom.xml b/docs/performance-tuning-guide/pom.xml index a9fb66065d7..f114ee0488c 100644 --- a/docs/performance-tuning-guide/pom.xml +++ b/docs/performance-tuning-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/pom.xml b/docs/pom.xml index f0309974b65..25cf63a22c1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main nucleus-parent - 6.2.5 + 6.2.6 ../nucleus/parent org.glassfish.docs diff --git a/docs/publish/pom.xml b/docs/publish/pom.xml index 019689afda9..d05d338f137 100644 --- a/docs/publish/pom.xml +++ b/docs/publish/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.5 + 6.2.6 org.glassfish.docs publish diff --git a/docs/quick-start-guide/pom.xml b/docs/quick-start-guide/pom.xml index 975a47a40ad..c27952ff7c5 100644 --- a/docs/quick-start-guide/pom.xml +++ b/docs/quick-start-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/reference-manual/pom.xml b/docs/reference-manual/pom.xml index c81fad50b6a..81f9f87a4a6 100644 --- a/docs/reference-manual/pom.xml +++ b/docs/reference-manual/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/release-notes/pom.xml b/docs/release-notes/pom.xml index 8e0709e9d2e..0421f23601f 100644 --- a/docs/release-notes/pom.xml +++ b/docs/release-notes/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/security-guide/pom.xml b/docs/security-guide/pom.xml index 141f766a793..78a79b8ded3 100644 --- a/docs/security-guide/pom.xml +++ b/docs/security-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/troubleshooting-guide/pom.xml b/docs/troubleshooting-guide/pom.xml index ca22fa8f7d3..e4c4001488f 100644 --- a/docs/troubleshooting-guide/pom.xml +++ b/docs/troubleshooting-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/upgrade-guide/pom.xml b/docs/upgrade-guide/pom.xml index 1c769271c53..82668160a6e 100644 --- a/docs/upgrade-guide/pom.xml +++ b/docs/upgrade-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.5 + 6.2.6 ../parent org.glassfish.docs diff --git a/docs/website/pom.xml b/docs/website/pom.xml index 58389d46261..5f9ab5be617 100644 --- a/docs/website/pom.xml +++ b/docs/website/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.5 + 6.2.6 org.glassfish.docs website diff --git a/nucleus/admin/cli/pom.xml b/nucleus/admin/cli/pom.xml index ed8d7f44f00..fce2b686196 100755 --- a/nucleus/admin/cli/pom.xml +++ b/nucleus/admin/cli/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5 + 6.2.6 admin-cli diff --git a/nucleus/admin/config-api/pom.xml b/nucleus/admin/config-api/pom.xml index fddfd99bf0d..997f5933f07 100644 --- a/nucleus/admin/config-api/pom.xml +++ b/nucleus/admin/config-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5 + 6.2.6 config-api diff --git a/nucleus/admin/launcher/pom.xml b/nucleus/admin/launcher/pom.xml index 8230cc892e5..9d7ad982d47 100644 --- a/nucleus/admin/launcher/pom.xml +++ b/nucleus/admin/launcher/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5 + 6.2.6 launcher diff --git a/nucleus/admin/monitor/pom.xml b/nucleus/admin/monitor/pom.xml index ac930e00037..42195312d92 100755 --- a/nucleus/admin/monitor/pom.xml +++ b/nucleus/admin/monitor/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5 + 6.2.6 monitoring-core diff --git a/nucleus/admin/pom.xml b/nucleus/admin/pom.xml index 5969eb3d52e..f2e08ab842a 100755 --- a/nucleus/admin/pom.xml +++ b/nucleus/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.admin diff --git a/nucleus/admin/rest/gf-restadmin-connector/pom.xml b/nucleus/admin/rest/gf-restadmin-connector/pom.xml index b58bd7abba6..dcd6872fb05 100644 --- a/nucleus/admin/rest/gf-restadmin-connector/pom.xml +++ b/nucleus/admin/rest/gf-restadmin-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.5 + 6.2.6 gf-restadmin-connector diff --git a/nucleus/admin/rest/pom.xml b/nucleus/admin/rest/pom.xml index 6ea56ca1b61..b59cbbe5bd4 100644 --- a/nucleus/admin/rest/pom.xml +++ b/nucleus/admin/rest/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5 + 6.2.6 rest-service-parent diff --git a/nucleus/admin/rest/rest-client/pom.xml b/nucleus/admin/rest/rest-client/pom.xml index 8ed0894bae1..a1117977d24 100644 --- a/nucleus/admin/rest/rest-client/pom.xml +++ b/nucleus/admin/rest/rest-client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.5 + 6.2.6 rest-client diff --git a/nucleus/admin/rest/rest-service/pom.xml b/nucleus/admin/rest/rest-service/pom.xml index 90fadf69bef..7bc1577dc5f 100644 --- a/nucleus/admin/rest/rest-service/pom.xml +++ b/nucleus/admin/rest/rest-service/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.5 + 6.2.6 rest-service diff --git a/nucleus/admin/rest/rest-testing/pom.xml b/nucleus/admin/rest/rest-testing/pom.xml index ccab889cd7e..954be644775 100644 --- a/nucleus/admin/rest/rest-testing/pom.xml +++ b/nucleus/admin/rest/rest-testing/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.5 + 6.2.6 rest-testing diff --git a/nucleus/admin/server-mgmt/pom.xml b/nucleus/admin/server-mgmt/pom.xml index f4f5d30bcb5..70fbb4be89b 100644 --- a/nucleus/admin/server-mgmt/pom.xml +++ b/nucleus/admin/server-mgmt/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5 + 6.2.6 server-mgmt diff --git a/nucleus/admin/template/pom.xml b/nucleus/admin/template/pom.xml index 024936c332a..7c5ed54b230 100644 --- a/nucleus/admin/template/pom.xml +++ b/nucleus/admin/template/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5 + 6.2.6 nucleus-domain diff --git a/nucleus/admin/util/pom.xml b/nucleus/admin/util/pom.xml index 4dfc3a0b916..d70742aac31 100755 --- a/nucleus/admin/util/pom.xml +++ b/nucleus/admin/util/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.5 + 6.2.6 admin-util diff --git a/nucleus/cluster/admin/pom.xml b/nucleus/cluster/admin/pom.xml index 7cbfb363720..b8cf445d53a 100644 --- a/nucleus/cluster/admin/pom.xml +++ b/nucleus/cluster/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5 + 6.2.6 cluster-admin diff --git a/nucleus/cluster/cli/pom.xml b/nucleus/cluster/cli/pom.xml index c5085cf7c6e..8c6cc6c9272 100755 --- a/nucleus/cluster/cli/pom.xml +++ b/nucleus/cluster/cli/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5 + 6.2.6 cluster-cli diff --git a/nucleus/cluster/common/pom.xml b/nucleus/cluster/common/pom.xml index 9916e61ac7a..2a0fcf5195f 100644 --- a/nucleus/cluster/common/pom.xml +++ b/nucleus/cluster/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5 + 6.2.6 cluster-common diff --git a/nucleus/cluster/gms-adapter/pom.xml b/nucleus/cluster/gms-adapter/pom.xml index 541d2e4715a..8b0ab99fee3 100644 --- a/nucleus/cluster/gms-adapter/pom.xml +++ b/nucleus/cluster/gms-adapter/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5 + 6.2.6 gms-adapter diff --git a/nucleus/cluster/gms-bootstrap/pom.xml b/nucleus/cluster/gms-bootstrap/pom.xml index 86dd6bc973c..eb2316a6db8 100644 --- a/nucleus/cluster/gms-bootstrap/pom.xml +++ b/nucleus/cluster/gms-bootstrap/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5 + 6.2.6 gms-bootstrap diff --git a/nucleus/cluster/pom.xml b/nucleus/cluster/pom.xml index 5d758d6e9d0..97e91fbb81d 100755 --- a/nucleus/cluster/pom.xml +++ b/nucleus/cluster/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.cluster diff --git a/nucleus/cluster/ssh/pom.xml b/nucleus/cluster/ssh/pom.xml index f1fa798634b..52183ea7b1e 100644 --- a/nucleus/cluster/ssh/pom.xml +++ b/nucleus/cluster/ssh/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.5 + 6.2.6 cluster-ssh diff --git a/nucleus/common/amx-core/pom.xml b/nucleus/common/amx-core/pom.xml index 68e94e9d9e8..6bd78cb687f 100755 --- a/nucleus/common/amx-core/pom.xml +++ b/nucleus/common/amx-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5 + 6.2.6 amx-core diff --git a/nucleus/common/common-util/pom.xml b/nucleus/common/common-util/pom.xml index 145c7f2a0fe..b50b7363e1b 100755 --- a/nucleus/common/common-util/pom.xml +++ b/nucleus/common/common-util/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5 + 6.2.6 common-util diff --git a/nucleus/common/glassfish-api/pom.xml b/nucleus/common/glassfish-api/pom.xml index 36876162177..6c5cdf5ea0c 100644 --- a/nucleus/common/glassfish-api/pom.xml +++ b/nucleus/common/glassfish-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/nucleus/common/internal-api/pom.xml b/nucleus/common/internal-api/pom.xml index 7ebe1c96c62..2aee2349281 100644 --- a/nucleus/common/internal-api/pom.xml +++ b/nucleus/common/internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5 + 6.2.6 internal-api diff --git a/nucleus/common/mbeanserver/pom.xml b/nucleus/common/mbeanserver/pom.xml index 67bf152e3c1..56c2f9eb395 100755 --- a/nucleus/common/mbeanserver/pom.xml +++ b/nucleus/common/mbeanserver/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5 + 6.2.6 glassfish-mbeanserver diff --git a/nucleus/common/pom.xml b/nucleus/common/pom.xml index 1c2aac443ad..e84d67f0b62 100755 --- a/nucleus/common/pom.xml +++ b/nucleus/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.common diff --git a/nucleus/common/scattered-archive-api/pom.xml b/nucleus/common/scattered-archive-api/pom.xml index a0c94977cf5..b88669e1061 100644 --- a/nucleus/common/scattered-archive-api/pom.xml +++ b/nucleus/common/scattered-archive-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 ../../pom.xml diff --git a/nucleus/common/simple-glassfish-api/pom.xml b/nucleus/common/simple-glassfish-api/pom.xml index 971436658f8..4ca2bded585 100644 --- a/nucleus/common/simple-glassfish-api/pom.xml +++ b/nucleus/common/simple-glassfish-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5 + 6.2.6 simple-glassfish-api diff --git a/nucleus/core/api-exporter/pom.xml b/nucleus/core/api-exporter/pom.xml index f2ba27d533c..4ed6ead8c40 100755 --- a/nucleus/core/api-exporter/pom.xml +++ b/nucleus/core/api-exporter/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5 + 6.2.6 api-exporter diff --git a/nucleus/core/bootstrap/pom.xml b/nucleus/core/bootstrap/pom.xml index 949912f4a9d..e337ba7627a 100755 --- a/nucleus/core/bootstrap/pom.xml +++ b/nucleus/core/bootstrap/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5 + 6.2.6 glassfish diff --git a/nucleus/core/context-propagation/pom.xml b/nucleus/core/context-propagation/pom.xml index 9185cc3f468..06b3b50bf8e 100644 --- a/nucleus/core/context-propagation/pom.xml +++ b/nucleus/core/context-propagation/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5 + 6.2.6 context-propagation diff --git a/nucleus/core/extra-jre-packages/pom.xml b/nucleus/core/extra-jre-packages/pom.xml index 080848b9f53..8ae0a7b145b 100755 --- a/nucleus/core/extra-jre-packages/pom.xml +++ b/nucleus/core/extra-jre-packages/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5 + 6.2.6 glassfish-extra-jre-packages diff --git a/nucleus/core/kernel/pom.xml b/nucleus/core/kernel/pom.xml index 9ce5fc83817..ee3a87d923c 100755 --- a/nucleus/core/kernel/pom.xml +++ b/nucleus/core/kernel/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5 + 6.2.6 kernel diff --git a/nucleus/core/logging/pom.xml b/nucleus/core/logging/pom.xml index 2e6aad7dde9..175e82fa45f 100755 --- a/nucleus/core/logging/pom.xml +++ b/nucleus/core/logging/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.5 + 6.2.6 logging diff --git a/nucleus/core/pom.xml b/nucleus/core/pom.xml index 3370f54645c..b3b2685531a 100644 --- a/nucleus/core/pom.xml +++ b/nucleus/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.core diff --git a/nucleus/deployment/admin/pom.xml b/nucleus/deployment/admin/pom.xml index 6b016f039e3..da954f9671d 100755 --- a/nucleus/deployment/admin/pom.xml +++ b/nucleus/deployment/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.5 + 6.2.6 deployment-admin diff --git a/nucleus/deployment/autodeploy/pom.xml b/nucleus/deployment/autodeploy/pom.xml index 83d38f25a40..a3bf2b222e3 100755 --- a/nucleus/deployment/autodeploy/pom.xml +++ b/nucleus/deployment/autodeploy/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.5 + 6.2.6 deployment-autodeploy diff --git a/nucleus/deployment/common/pom.xml b/nucleus/deployment/common/pom.xml index 5a9547bb4aa..8fc3384f065 100755 --- a/nucleus/deployment/common/pom.xml +++ b/nucleus/deployment/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.5 + 6.2.6 deployment-common diff --git a/nucleus/deployment/dtds/pom.xml b/nucleus/deployment/dtds/pom.xml index 991acac4ffc..e020fa16bf3 100644 --- a/nucleus/deployment/dtds/pom.xml +++ b/nucleus/deployment/dtds/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.5 + 6.2.6 nucleus-dtds diff --git a/nucleus/deployment/pom.xml b/nucleus/deployment/pom.xml index 56774ad6937..a19d2119f0a 100755 --- a/nucleus/deployment/pom.xml +++ b/nucleus/deployment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.deployment diff --git a/nucleus/deployment/schemas/pom.xml b/nucleus/deployment/schemas/pom.xml index a51e40779a1..461c1a1b662 100644 --- a/nucleus/deployment/schemas/pom.xml +++ b/nucleus/deployment/schemas/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.5 + 6.2.6 nucleus-schemas diff --git a/nucleus/diagnostics/context/pom.xml b/nucleus/diagnostics/context/pom.xml index 07d45ea115a..fbb2b43e315 100644 --- a/nucleus/diagnostics/context/pom.xml +++ b/nucleus/diagnostics/context/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.diagnostics nucleus-diagnostics - 6.2.5 + 6.2.6 diagnostics-context diff --git a/nucleus/diagnostics/diagnostics-api/pom.xml b/nucleus/diagnostics/diagnostics-api/pom.xml index 455b3629080..750ab0153de 100755 --- a/nucleus/diagnostics/diagnostics-api/pom.xml +++ b/nucleus/diagnostics/diagnostics-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.diagnostics nucleus-diagnostics - 6.2.5 + 6.2.6 diagnostics-api diff --git a/nucleus/diagnostics/pom.xml b/nucleus/diagnostics/pom.xml index f16feb950db..abbfcaaef42 100755 --- a/nucleus/diagnostics/pom.xml +++ b/nucleus/diagnostics/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.diagnostics diff --git a/nucleus/distributions/atomic/pom.xml b/nucleus/distributions/atomic/pom.xml index be8ead1b617..90138981555 100644 --- a/nucleus/distributions/atomic/pom.xml +++ b/nucleus/distributions/atomic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions nucleus-distributions - 6.2.5 + 6.2.6 atomic diff --git a/nucleus/distributions/nucleus-common/pom.xml b/nucleus/distributions/nucleus-common/pom.xml index ed43d833fe9..1f98ad5a434 100644 --- a/nucleus/distributions/nucleus-common/pom.xml +++ b/nucleus/distributions/nucleus-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions nucleus-distributions - 6.2.5 + 6.2.6 nucleus-common diff --git a/nucleus/distributions/nucleus/pom.xml b/nucleus/distributions/nucleus/pom.xml index 1973679f7cc..c8ad37b24c5 100644 --- a/nucleus/distributions/nucleus/pom.xml +++ b/nucleus/distributions/nucleus/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions nucleus-distributions - 6.2.5 + 6.2.6 nucleus-new diff --git a/nucleus/distributions/pom.xml b/nucleus/distributions/pom.xml index 37690a5dd0d..1a1a7709f6d 100644 --- a/nucleus/distributions/pom.xml +++ b/nucleus/distributions/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.distributions diff --git a/nucleus/featuresets/atomic/pom.xml b/nucleus/featuresets/atomic/pom.xml index 4789f3ffb31..333a5425c82 100644 --- a/nucleus/featuresets/atomic/pom.xml +++ b/nucleus/featuresets/atomic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets nucleus-featuresets - 6.2.5 + 6.2.6 atomic diff --git a/nucleus/featuresets/nucleus/pom.xml b/nucleus/featuresets/nucleus/pom.xml index cf09d738f72..7e1bd80635f 100644 --- a/nucleus/featuresets/nucleus/pom.xml +++ b/nucleus/featuresets/nucleus/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets nucleus-featuresets - 6.2.5 + 6.2.6 nucleus diff --git a/nucleus/featuresets/pom.xml b/nucleus/featuresets/pom.xml index 3eaf3ad8cf6..a4e6cdf99fa 100644 --- a/nucleus/featuresets/pom.xml +++ b/nucleus/featuresets/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.featuresets diff --git a/nucleus/flashlight/agent/pom.xml b/nucleus/flashlight/agent/pom.xml index 4e72c247643..625d04c6a84 100755 --- a/nucleus/flashlight/agent/pom.xml +++ b/nucleus/flashlight/agent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5 + 6.2.6 ../../common/pom.xml diff --git a/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml b/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml index eeed7561306..df5bbc20daa 100755 --- a/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml +++ b/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5 + 6.2.6 ../../common/pom.xml diff --git a/nucleus/flashlight/framework/pom.xml b/nucleus/flashlight/framework/pom.xml index 7ba5d05f7f4..d6ce05caeea 100755 --- a/nucleus/flashlight/framework/pom.xml +++ b/nucleus/flashlight/framework/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.5 + 6.2.6 ../../common/pom.xml diff --git a/nucleus/flashlight/pom.xml b/nucleus/flashlight/pom.xml index 9d526d1beec..040051344c1 100755 --- a/nucleus/flashlight/pom.xml +++ b/nucleus/flashlight/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.flashlight diff --git a/nucleus/grizzly/config/pom.xml b/nucleus/grizzly/config/pom.xml index 19f803f20be..9e76d97e261 100644 --- a/nucleus/grizzly/config/pom.xml +++ b/nucleus/grizzly/config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly nucleus-grizzly - 6.2.5 + 6.2.6 grizzly-config diff --git a/nucleus/grizzly/nucleus-grizzly-all/pom.xml b/nucleus/grizzly/nucleus-grizzly-all/pom.xml index 41d3b9456b9..9f52a4955d3 100644 --- a/nucleus/grizzly/nucleus-grizzly-all/pom.xml +++ b/nucleus/grizzly/nucleus-grizzly-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly nucleus-grizzly - 6.2.5 + 6.2.6 nucleus-grizzly-all diff --git a/nucleus/grizzly/pom.xml b/nucleus/grizzly/pom.xml index 86eda9de9a8..ca7df9122b5 100644 --- a/nucleus/grizzly/pom.xml +++ b/nucleus/grizzly/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.grizzly diff --git a/nucleus/hk2/config-generator/pom.xml b/nucleus/hk2/config-generator/pom.xml index 9d3f28504e9..6f1339fb615 100644 --- a/nucleus/hk2/config-generator/pom.xml +++ b/nucleus/hk2/config-generator/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.5 + 6.2.6 config-generator maven-plugin diff --git a/nucleus/hk2/config-types/pom.xml b/nucleus/hk2/config-types/pom.xml index 6172d3a0a3c..1bdd2fe2736 100644 --- a/nucleus/hk2/config-types/pom.xml +++ b/nucleus/hk2/config-types/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.5 + 6.2.6 config-types diff --git a/nucleus/hk2/hk2-config/pom.xml b/nucleus/hk2/hk2-config/pom.xml index 07b9b4ebaaf..c649dd24115 100644 --- a/nucleus/hk2/hk2-config/pom.xml +++ b/nucleus/hk2/hk2-config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.5 + 6.2.6 hk2-config diff --git a/nucleus/hk2/pom.xml b/nucleus/hk2/pom.xml index f9f509e87fb..a3cb533e633 100755 --- a/nucleus/hk2/pom.xml +++ b/nucleus/hk2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main nucleus-parent - 6.2.5 + 6.2.6 ../parent/pom.xml diff --git a/nucleus/hk2/tiger-types/pom.xml b/nucleus/hk2/tiger-types/pom.xml index 1e342dea17e..6d7acbaf071 100644 --- a/nucleus/hk2/tiger-types/pom.xml +++ b/nucleus/hk2/tiger-types/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.5 + 6.2.6 tiger-types diff --git a/nucleus/osgi-platforms/felix/pom.xml b/nucleus/osgi-platforms/felix/pom.xml index 9b36c4e18fb..dcdfab73dcd 100644 --- a/nucleus/osgi-platforms/felix/pom.xml +++ b/nucleus/osgi-platforms/felix/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.5 + 6.2.6 felix diff --git a/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml b/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml index 84a32a5271f..5f37a3abfdf 100644 --- a/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml +++ b/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.5 + 6.2.6 osgi-cli-interactive diff --git a/nucleus/osgi-platforms/osgi-cli-remote/pom.xml b/nucleus/osgi-platforms/osgi-cli-remote/pom.xml index 3ba3f2b2aaf..67b35735941 100644 --- a/nucleus/osgi-platforms/osgi-cli-remote/pom.xml +++ b/nucleus/osgi-platforms/osgi-cli-remote/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.5 + 6.2.6 osgi-cli-remote diff --git a/nucleus/osgi-platforms/osgi-container/pom.xml b/nucleus/osgi-platforms/osgi-container/pom.xml index fa594120ef5..8908c37bcae 100755 --- a/nucleus/osgi-platforms/osgi-container/pom.xml +++ b/nucleus/osgi-platforms/osgi-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.5 + 6.2.6 osgi-container diff --git a/nucleus/osgi-platforms/pom.xml b/nucleus/osgi-platforms/pom.xml index c7ee04ff302..afbfb7f3d4a 100644 --- a/nucleus/osgi-platforms/pom.xml +++ b/nucleus/osgi-platforms/pom.xml @@ -28,7 +28,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 ../pom.xml diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index 082af703bc9..49eebfff3f1 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -30,7 +30,7 @@ org.glassfish.main nucleus-parent - 6.2.5 + 6.2.6 pom GlassFish Nucleus Parent Project diff --git a/nucleus/pom.xml b/nucleus/pom.xml index 1b681e6144c..c637dc6a490 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main nucleus-parent - 6.2.5 + 6.2.6 parent/pom.xml diff --git a/nucleus/resources/pom.xml b/nucleus/resources/pom.xml index 8f56860698f..900d73fd527 100755 --- a/nucleus/resources/pom.xml +++ b/nucleus/resources/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.resourcebase.resources diff --git a/nucleus/security/core/pom.xml b/nucleus/security/core/pom.xml index d22a9cdc659..ad1400279b3 100644 --- a/nucleus/security/core/pom.xml +++ b/nucleus/security/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security nucleus-security - 6.2.5 + 6.2.6 security diff --git a/nucleus/security/pom.xml b/nucleus/security/pom.xml index 5306e379c53..54381d2aa90 100644 --- a/nucleus/security/pom.xml +++ b/nucleus/security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.security diff --git a/nucleus/security/services/pom.xml b/nucleus/security/services/pom.xml index 9f79ba8e248..268aad7bece 100644 --- a/nucleus/security/services/pom.xml +++ b/nucleus/security/services/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security nucleus-security - 6.2.5 + 6.2.6 security-services diff --git a/nucleus/security/ssl-impl/pom.xml b/nucleus/security/ssl-impl/pom.xml index bab8b9906f1..75adcaf7399 100644 --- a/nucleus/security/ssl-impl/pom.xml +++ b/nucleus/security/ssl-impl/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security nucleus-security - 6.2.5 + 6.2.6 ssl-impl diff --git a/nucleus/test-utils/pom.xml b/nucleus/test-utils/pom.xml index ac9fade1f5d..732567a8ed3 100755 --- a/nucleus/test-utils/pom.xml +++ b/nucleus/test-utils/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 test-utils diff --git a/nucleus/tests/admin/pom.xml b/nucleus/tests/admin/pom.xml index 3986eafd4ee..37952766d19 100644 --- a/nucleus/tests/admin/pom.xml +++ b/nucleus/tests/admin/pom.xml @@ -56,7 +56,7 @@ of COPY_LIB map constant.) org.glassfish.main.tests nucleus-tests - 6.2.5 + 6.2.6 org.glassfish.tests diff --git a/nucleus/tests/pom.xml b/nucleus/tests/pom.xml index 550f7f89e4b..cd12ea696fa 100755 --- a/nucleus/tests/pom.xml +++ b/nucleus/tests/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.5 + 6.2.6 org.glassfish.main.tests diff --git a/pom.xml b/pom.xml index 84cd53303b9..a9946b9b5fa 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.glassfish.main glassfish-main-aggregator - 6.2.5 + 6.2.6 pom GlassFish Project diff --git a/qa/pom.xml b/qa/pom.xml index 6209af2ee83..8ac19b4f788 100644 --- a/qa/pom.xml +++ b/qa/pom.xml @@ -5,7 +5,7 @@ org.glassfish.main glassfish-main-aggregator - 6.2.5 + 6.2.6 glassfish-qa-config From d1c92b5c18739970b4cea1509d328b97e61553bb Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Mon, 14 Feb 2022 15:17:11 +0100 Subject: [PATCH 03/33] Next version is 6.2.6-SNAPSHOT Signed-off-by: Arjan Tijms --- appserver/admin/admin-core/pom.xml | 2 +- appserver/admin/backup/pom.xml | 2 +- appserver/admin/cli-optional/pom.xml | 2 +- appserver/admin/cli/pom.xml | 2 +- appserver/admin/pom.xml | 2 +- appserver/admin/template/pom.xml | 2 +- appserver/admingui/cluster/pom.xml | 2 +- appserver/admingui/common/pom.xml | 2 +- appserver/admingui/community-theme/pom.xml | 2 +- appserver/admingui/concurrent/pom.xml | 2 +- appserver/admingui/corba/pom.xml | 2 +- appserver/admingui/core/pom.xml | 2 +- appserver/admingui/dataprovider/pom.xml | 2 +- appserver/admingui/dist-fragment/pom.xml | 2 +- appserver/admingui/ejb-lite/pom.xml | 2 +- appserver/admingui/ejb/pom.xml | 2 +- appserver/admingui/full/pom.xml | 2 +- appserver/admingui/gf-admingui-connector/pom.xml | 2 +- appserver/admingui/jackson-jaxb/pom.xml | 2 +- appserver/admingui/jca/pom.xml | 2 +- appserver/admingui/jdbc/pom.xml | 2 +- appserver/admingui/jms-plugin/pom.xml | 2 +- appserver/admingui/jts/pom.xml | 2 +- appserver/admingui/plugin-service/pom.xml | 2 +- appserver/admingui/pom.xml | 2 +- appserver/admingui/war/pom.xml | 2 +- appserver/admingui/web/pom.xml | 2 +- appserver/ant-tasks/pom.xml | 2 +- appserver/appclient/client/acc-config/pom.xml | 2 +- appserver/appclient/client/acc-standalone/pom.xml | 2 +- appserver/appclient/client/acc/pom.xml | 2 +- appserver/appclient/client/appclient-scripts/pom.xml | 2 +- appserver/appclient/client/pom.xml | 2 +- appserver/appclient/pom.xml | 2 +- appserver/appclient/server/connector/pom.xml | 2 +- appserver/appclient/server/core/pom.xml | 2 +- appserver/appclient/server/pom.xml | 2 +- appserver/batch/batch-database/pom.xml | 2 +- appserver/batch/glassfish-batch-commands/pom.xml | 2 +- appserver/batch/glassfish-batch-connector/pom.xml | 2 +- appserver/batch/pom.xml | 2 +- appserver/common/amx-javaee/pom.xml | 2 +- appserver/common/annotation-framework/pom.xml | 2 +- appserver/common/container-common/pom.xml | 2 +- appserver/common/glassfish-ee-api/pom.xml | 2 +- appserver/common/glassfish-naming/pom.xml | 2 +- appserver/common/pom.xml | 2 +- appserver/common/stats77/pom.xml | 2 +- appserver/concurrent/concurrent-connector/pom.xml | 2 +- appserver/concurrent/concurrent-impl/pom.xml | 2 +- appserver/concurrent/pom.xml | 2 +- appserver/connectors/admin/pom.xml | 2 +- appserver/connectors/connectors-connector/pom.xml | 2 +- appserver/connectors/connectors-inbound-runtime/pom.xml | 2 +- appserver/connectors/connectors-internal-api/pom.xml | 2 +- appserver/connectors/connectors-runtime/pom.xml | 2 +- appserver/connectors/descriptors/pom.xml | 2 +- appserver/connectors/pom.xml | 2 +- appserver/connectors/work-management/pom.xml | 2 +- appserver/core/api-exporter-fragment/pom.xml | 2 +- appserver/core/javaee-kernel/pom.xml | 2 +- appserver/core/pom.xml | 2 +- appserver/deployment/dol/pom.xml | 2 +- appserver/deployment/dtds/pom.xml | 2 +- appserver/deployment/javaee-core/pom.xml | 2 +- appserver/deployment/javaee-full/pom.xml | 2 +- appserver/deployment/pom.xml | 2 +- appserver/deployment/schemas/pom.xml | 2 +- appserver/distributions/glassfish-common/pom.xml | 2 +- appserver/distributions/glassfish/pom.xml | 2 +- appserver/distributions/pom.xml | 2 +- appserver/distributions/web/pom.xml | 2 +- appserver/ejb/ejb-all/pom.xml | 2 +- appserver/ejb/ejb-client/pom.xml | 2 +- appserver/ejb/ejb-connector/pom.xml | 2 +- appserver/ejb/ejb-container/pom.xml | 2 +- appserver/ejb/ejb-full-container/pom.xml | 2 +- appserver/ejb/ejb-internal-api/pom.xml | 2 +- appserver/ejb/ejb-timer-databases/pom.xml | 2 +- appserver/ejb/ejb-timer-service-app/pom.xml | 2 +- appserver/ejb/pom.xml | 2 +- appserver/extras/appserv-rt/dist-frag/pom.xml | 2 +- appserver/extras/appserv-rt/manifest-jar/pom.xml | 2 +- appserver/extras/appserv-rt/pom.xml | 2 +- appserver/extras/embedded/all/pom.xml | 2 +- appserver/extras/embedded/common/bootstrap/pom.xml | 2 +- .../extras/embedded/common/installroot-builder/pom.xml | 2 +- .../extras/embedded/common/instanceroot-builder/pom.xml | 2 +- appserver/extras/embedded/common/osgi-main/pom.xml | 2 +- .../extras/embedded/common/osgi-modules-uninstaller/pom.xml | 2 +- appserver/extras/embedded/common/pom.xml | 2 +- appserver/extras/embedded/nucleus/pom.xml | 2 +- appserver/extras/embedded/pom.xml | 2 +- .../embedded/shell/glassfish-embedded-shell-frag/pom.xml | 2 +- .../extras/embedded/shell/glassfish-embedded-shell/pom.xml | 2 +- .../shell/glassfish-embedded-static-shell-frag/pom.xml | 2 +- .../embedded/shell/glassfish-embedded-static-shell/pom.xml | 2 +- appserver/extras/embedded/shell/pom.xml | 2 +- appserver/extras/embedded/tests/pom.xml | 2 +- appserver/extras/embedded/web/pom.xml | 2 +- appserver/extras/javaee/dist-frag/pom.xml | 2 +- appserver/extras/javaee/manifest-jar/pom.xml | 2 +- appserver/extras/javaee/pom.xml | 2 +- appserver/extras/pom.xml | 2 +- appserver/featuresets/debug/pom.xml | 2 +- appserver/featuresets/glassfish/pom.xml | 2 +- appserver/featuresets/pom.xml | 2 +- appserver/featuresets/web/pom.xml | 2 +- appserver/flashlight/client/pom.xml | 2 +- appserver/flashlight/pom.xml | 2 +- appserver/grizzly/glassfish-grizzly-extra-all/pom.xml | 2 +- appserver/grizzly/grizzly-container/pom.xml | 2 +- appserver/grizzly/pom.xml | 2 +- appserver/ha/ha-file-store/pom.xml | 2 +- appserver/ha/ha-shoal-cache-bootstrap/pom.xml | 2 +- appserver/ha/ha-shoal-store/pom.xml | 2 +- appserver/ha/pom.xml | 2 +- appserver/jdbc/admin/pom.xml | 2 +- appserver/jdbc/jdbc-config/pom.xml | 2 +- appserver/jdbc/jdbc-ra/jdbc-core/pom.xml | 2 +- appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml | 2 +- appserver/jdbc/jdbc-ra/jdbc40/pom.xml | 2 +- appserver/jdbc/jdbc-ra/pom.xml | 2 +- appserver/jdbc/jdbc-runtime/pom.xml | 2 +- appserver/jdbc/pom.xml | 2 +- appserver/jdbc/templates/pom.xml | 2 +- appserver/jms/admin/pom.xml | 2 +- appserver/jms/gf-jms-connector/pom.xml | 2 +- appserver/jms/gf-jms-injection/pom.xml | 2 +- appserver/jms/jms-core/pom.xml | 2 +- appserver/jms/jmsra/pom.xml | 2 +- appserver/jms/pom.xml | 2 +- appserver/ldapbp/pom.xml | 2 +- appserver/libpam4j/pom.xml | 2 +- appserver/load-balancer/admin/pom.xml | 2 +- appserver/load-balancer/gf-load-balancer-connector/pom.xml | 2 +- appserver/load-balancer/pom.xml | 2 +- appserver/orb/orb-connector/pom.xml | 2 +- appserver/orb/orb-enabler/pom.xml | 2 +- appserver/orb/orb-iiop/pom.xml | 2 +- appserver/orb/pom.xml | 2 +- appserver/osgi-platforms/felix-webconsole-extension/pom.xml | 2 +- .../osgi-platforms/glassfish-osgi-console-plugin/pom.xml | 2 +- appserver/osgi-platforms/pom.xml | 2 +- appserver/persistence/cmp/cmp-all/pom.xml | 2 +- appserver/persistence/cmp/cmp-scripts/pom.xml | 2 +- appserver/persistence/cmp/ejb-mapping/pom.xml | 2 +- appserver/persistence/cmp/enhancer/pom.xml | 2 +- appserver/persistence/cmp/generator-database/pom.xml | 2 +- appserver/persistence/cmp/internal-api/pom.xml | 2 +- appserver/persistence/cmp/model/pom.xml | 2 +- appserver/persistence/cmp/pom.xml | 2 +- appserver/persistence/cmp/support-ejb/pom.xml | 2 +- appserver/persistence/cmp/support-sqlstore/pom.xml | 2 +- appserver/persistence/cmp/utility/pom.xml | 2 +- appserver/persistence/common/pom.xml | 2 +- appserver/persistence/eclipselink-wrapper/pom.xml | 2 +- appserver/persistence/entitybean-container/pom.xml | 2 +- appserver/persistence/gf-jpa-connector/pom.xml | 2 +- appserver/persistence/jpa-container/pom.xml | 2 +- appserver/persistence/oracle-jdbc-driver-packages/pom.xml | 2 +- appserver/persistence/pom.xml | 2 +- appserver/pom.xml | 6 +++--- appserver/resources/mail/mail-connector/pom.xml | 2 +- appserver/resources/mail/mail-runtime/pom.xml | 2 +- appserver/resources/mail/pom.xml | 2 +- appserver/resources/pom.xml | 2 +- appserver/resources/resources-connector/pom.xml | 2 +- appserver/resources/resources-runtime/pom.xml | 2 +- appserver/security/appclient.security/pom.xml | 2 +- appserver/security/core-ee/pom.xml | 2 +- appserver/security/ejb.security/pom.xml | 2 +- appserver/security/jaspic-provider-framework/pom.xml | 2 +- appserver/security/pom.xml | 2 +- appserver/security/security-all/pom.xml | 2 +- appserver/security/webintegration/pom.xml | 2 +- appserver/security/webservices.security/pom.xml | 2 +- appserver/tests/admingui/auto-test/pom.xml | 2 +- appserver/tests/admingui/pom.xml | 2 +- appserver/tests/amx/pom.xml | 2 +- appserver/tests/appserv-tests/cciblackbox-tx/pom.xml | 2 +- .../tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml | 2 +- .../tests/appserv-tests/connectors-ra-redeploy/pom.xml | 2 +- .../appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml | 2 +- .../tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml | 2 +- .../batch/batch-dev-tests/batch-commands-tests/pom.xml | 2 +- .../batch/batch-dev-tests/batch-tests-utils/pom.xml | 2 +- .../appserv-tests/devtests/batch/batch-dev-tests/pom.xml | 2 +- appserver/tests/appserv-tests/devtests/cdi/pom.xml | 2 +- appserver/tests/appserv-tests/devtests/ejb/pom.xml | 2 +- .../security/ejb-auth-async/scheduler-service/pom.xml | 2 +- .../devtests/security/jaccApi/prog-auth/common/pom.xml | 2 +- .../devtests/security/jaccApi/prog-auth/pom.xml | 2 +- .../jaccApi/prog-auth/programmatic-authentication/pom.xml | 2 +- .../soteria/app-bundled-ham-basic-login-config-form/pom.xml | 2 +- .../devtests/security/soteria/app-caller-principal/pom.xml | 2 +- .../soteria/app-custom-identity-store-handler/pom.xml | 2 +- .../devtests/security/soteria/app-custom-rememberme/pom.xml | 2 +- .../devtests/security/soteria/app-custom-session/pom.xml | 2 +- .../devtests/security/soteria/app-custom/pom.xml | 2 +- .../appserv-tests/devtests/security/soteria/app-db/pom.xml | 4 ++-- .../devtests/security/soteria/app-double-ham/pom.xml | 4 ++-- .../devtests/security/soteria/app-ham-ordering/pom.xml | 4 ++-- .../devtests/security/soteria/app-mem-basic/pom.xml | 4 ++-- .../devtests/security/soteria/app-mem-form/pom.xml | 4 ++-- .../security/soteria/app-multiple-store-backup/pom.xml | 4 ++-- .../devtests/security/soteria/app-multiple-store/pom.xml | 4 ++-- .../soteria/app-no-application-caller-principal/pom.xml | 4 ++-- .../devtests/security/soteria/app-no-role-mapping/pom.xml | 4 ++-- .../security/soteria/app-securitycontext-auth-ejb/pom.xml | 4 ++-- .../security/soteria/app-securitycontext-auth/pom.xml | 4 ++-- .../appserv-tests/devtests/security/soteria/common/pom.xml | 2 +- .../tests/appserv-tests/devtests/security/soteria/pom.xml | 2 +- appserver/tests/appserv-tests/pom.xml | 2 +- appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml | 4 ++-- appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml | 4 ++-- .../tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml | 2 +- appserver/tests/cdi/cases/multiBeansXml/pom.xml | 4 ++-- appserver/tests/cdi/cases/pom.xml | 4 ++-- appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml | 2 +- appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml | 4 ++-- appserver/tests/cdi/cases/preDestroyScoping/pom.xml | 4 ++-- appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml | 2 +- appserver/tests/cdi/cases/runner/pom.xml | 2 +- appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml | 4 ++-- appserver/tests/cdi/negative/pom.xml | 4 ++-- appserver/tests/cdi/negative/runner/pom.xml | 2 +- appserver/tests/cdi/pom.xml | 2 +- appserver/tests/community/pom.xml | 2 +- appserver/tests/embedded/basic/lifecycle/pom.xml | 2 +- appserver/tests/embedded/basic/pom.xml | 2 +- appserver/tests/embedded/cdi_basic/pom.xml | 4 ++-- appserver/tests/embedded/cdi_ejb_jpa/pom.xml | 2 +- appserver/tests/embedded/ejb/basic/pom.xml | 4 ++-- appserver/tests/embedded/ejb/ejb-api/pom.xml | 4 ++-- appserver/tests/embedded/ejb/ejb-main/pom.xml | 2 +- appserver/tests/embedded/ejb/pom.xml | 2 +- appserver/tests/embedded/ejb/remoteejb/pom.xml | 4 ++-- appserver/tests/embedded/glassfish_resources_xml/pom.xml | 2 +- appserver/tests/embedded/inplanted/pom.xml | 4 ++-- .../embedded/maven-plugin/applicationDispatcher/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/dirListing/pom.xml | 2 +- .../tests/embedded/maven-plugin/filterURIMapping/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/index/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/init/pom.xml | 2 +- .../tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/jsftest/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/jsptest/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/localejbs/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/mdb/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/multipleApps/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/queryString/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/scattered/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml | 2 +- .../tests/embedded/maven-plugin/sessionDestroyed/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/simple/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/standalonewar/pom.xml | 2 +- .../tests/embedded/maven-plugin/static-shell-init/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/webservice/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/websockets/pom.xml | 2 +- appserver/tests/embedded/mysql/pom.xml | 4 ++-- appserver/tests/embedded/pom.xml | 2 +- appserver/tests/embedded/scatteredarchive/pom.xml | 4 ++-- appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml | 2 +- appserver/tests/embedded/static/ejb/pom.xml | 2 +- appserver/tests/embedded/static/ejb/simple/pom.xml | 4 ++-- appserver/tests/embedded/static/pom.xml | 2 +- appserver/tests/embedded/static/web/pom.xml | 2 +- appserver/tests/embedded/utils/pom.xml | 4 ++-- appserver/tests/embedded/web/autodelete/pom.xml | 2 +- appserver/tests/embedded/web/pom.xml | 2 +- appserver/tests/embedded/web/servlet/pom.xml | 2 +- appserver/tests/embedded/web/web-all/pom.xml | 6 +++--- appserver/tests/embedded/web/web-api/pom.xml | 4 ++-- appserver/tests/embedded/web/web-war/pom.xml | 2 +- appserver/tests/embedded/web/web-war/test/pom.xml | 4 ++-- appserver/tests/embedded/web/web-war/war/pom.xml | 2 +- appserver/tests/embedded/web/web-war/web-fragment1/pom.xml | 2 +- appserver/tests/embedded/web/web-war/web-fragment2/pom.xml | 2 +- appserver/tests/embedded/web/web-war/web-fragment3/pom.xml | 2 +- appserver/tests/embedded/wrapper/pom.xml | 2 +- appserver/tests/hk2/cdi/basic/ejb1/pom.xml | 2 +- appserver/tests/hk2/cdi/basic/pom.xml | 2 +- appserver/tests/hk2/cdi/basic/runner/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/app/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/ejb1/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/ejb2/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/lib1/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/runner/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/war1/pom.xml | 2 +- appserver/tests/hk2/cdi/ear/war2/pom.xml | 2 +- appserver/tests/hk2/cdi/jersey/pom.xml | 2 +- appserver/tests/hk2/cdi/jersey/runner/pom.xml | 2 +- appserver/tests/hk2/cdi/jersey/war/pom.xml | 2 +- appserver/tests/hk2/cdi/pom.xml | 2 +- appserver/tests/hk2/isolation/pom.xml | 4 ++-- appserver/tests/hk2/isolation/runner/pom.xml | 4 ++-- appserver/tests/hk2/isolation/web/iso1/pom.xml | 4 ++-- appserver/tests/hk2/isolation/web/iso2/pom.xml | 4 ++-- appserver/tests/hk2/isolation/web/pom.xml | 4 ++-- appserver/tests/hk2/pom.xml | 2 +- .../tests/paas/appscoped-db-with-resources-xml/pom.xml | 2 +- appserver/tests/paas/basic-bookstore-dns/pom.xml | 2 +- appserver/tests/paas/basic-db-initsql/pom.xml | 2 +- appserver/tests/paas/basic-db-teardown-sql/pom.xml | 2 +- appserver/tests/paas/basic-db-with-resources-xml/pom.xml | 2 +- appserver/tests/paas/basic-db/pom.xml | 2 +- appserver/tests/paas/basic-jpa/pom.xml | 2 +- appserver/tests/paas/basic-service-discovery/pom.xml | 2 +- appserver/tests/paas/basic-shared-service-test/pom.xml | 2 +- appserver/tests/paas/basic/pom.xml | 2 +- appserver/tests/paas/bookstore/pom.xml | 2 +- appserver/tests/paas/deployment-rollback/pom.xml | 2 +- appserver/tests/paas/enable-disable-test/pom.xml | 2 +- .../paas/ext-shared-service-enable-disable-test/pom.xml | 2 +- appserver/tests/paas/external-and-shared-service/pom.xml | 2 +- .../tests/paas/external-db-service/generatederbyvm/pom.xml | 2 +- appserver/tests/paas/external-db-service/pom.xml | 2 +- appserver/tests/paas/external-db-service/test/pom.xml | 2 +- appserver/tests/paas/helloworld/pom.xml | 2 +- appserver/tests/paas/javaee_shared_service/pom.xml | 2 +- appserver/tests/paas/lazy-shared-service-test/pom.xml | 2 +- appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml | 2 +- appserver/tests/paas/mq-shared-service-test/pom.xml | 2 +- .../paas/multiple-db-app-scoped-services/advanced/pom.xml | 2 +- .../paas/multiple-db-app-scoped-services/basic/pom.xml | 2 +- .../tests/paas/multiple-db-app-scoped-services/pom.xml | 2 +- .../tests/paas/multiple-db-shared-services/advanced/pom.xml | 2 +- .../tests/paas/multiple-db-shared-services/basic/pom.xml | 2 +- appserver/tests/paas/multiple-db-shared-services/pom.xml | 2 +- appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml | 4 ++-- appserver/tests/paas/multiple-spe-test/pom.xml | 2 +- appserver/tests/paas/multiple-spe-test/spetest/pom.xml | 2 +- appserver/tests/paas/pom.xml | 2 +- appserver/tests/paas/scale_service/pom.xml | 2 +- .../tests/paas/service_metadata/custom_db_name/pom.xml | 2 +- appserver/tests/paas/service_metadata/pom.xml | 2 +- .../provision_using_specified_template/pom.xml | 2 +- appserver/tests/pom.xml | 2 +- appserver/tests/quicklook/admin/pom.xml | 2 +- appserver/tests/quicklook/adminconsole/pom.xml | 4 ++-- appserver/tests/quicklook/amx/pom.xml | 2 +- appserver/tests/quicklook/ejb/cmp/pom.xml | 2 +- appserver/tests/quicklook/ejb/embedded/pom.xml | 2 +- appserver/tests/quicklook/ejb/remoteview/pom.xml | 2 +- appserver/tests/quicklook/ejb/sfulnoi/pom.xml | 2 +- appserver/tests/quicklook/ejb/singleton/pom.xml | 2 +- appserver/tests/quicklook/ejb/slsbnicmt/pom.xml | 2 +- appserver/tests/quicklook/jms/injection/pom.xml | 2 +- appserver/tests/quicklook/pom.xml | 2 +- appserver/tests/quicklook/rest/pom.xml | 2 +- appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml | 2 +- appserver/tests/quicklook/wsit/jsr109tester/pom.xml | 2 +- appserver/tests/sse/basic/pom.xml | 2 +- appserver/tests/sse/videoplayer/pom.xml | 2 +- appserver/tests/tck/authentication/pom.xml | 2 +- appserver/tests/tck/authorization/pom.xml | 2 +- .../tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml | 2 +- appserver/tests/tck/embedded_ejb_smoke/pom.xml | 2 +- appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml | 2 +- appserver/tests/tck/faces/pom.xml | 2 +- appserver/tests/tck/pom.xml | 2 +- appserver/tests/tck/rest/pom.xml | 2 +- .../tck/tck-download/jakarta-authentication-tck/pom.xml | 2 +- .../tck/tck-download/jakarta-authorization-tck/pom.xml | 2 +- appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml | 2 +- appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml | 2 +- appserver/tests/tck/tck-download/javatest/pom.xml | 2 +- appserver/tests/tck/tck-download/pom.xml | 2 +- appserver/tests/tck/tck-download/tsharness/pom.xml | 2 +- appserver/transaction/internal-api/pom.xml | 2 +- appserver/transaction/jta/pom.xml | 2 +- appserver/transaction/jts/pom.xml | 2 +- appserver/transaction/pom.xml | 2 +- appserver/web/admin/pom.xml | 2 +- appserver/web/cdi-api-fragment/pom.xml | 2 +- appserver/web/gf-web-connector/pom.xml | 2 +- appserver/web/gf-weld-connector/pom.xml | 2 +- appserver/web/gui-plugin-common/pom.xml | 2 +- appserver/web/jersey-ejb-component-provider/pom.xml | 2 +- appserver/web/jersey-mvc-connector/pom.xml | 2 +- appserver/web/jsf-connector/pom.xml | 2 +- appserver/web/jspcaching-connector/pom.xml | 2 +- appserver/web/jstl-connector/pom.xml | 2 +- appserver/web/pom.xml | 2 +- appserver/web/war-util/pom.xml | 2 +- appserver/web/web-core/pom.xml | 2 +- appserver/web/web-embed/api/pom.xml | 2 +- appserver/web/web-embed/pom.xml | 2 +- appserver/web/web-glue/pom.xml | 2 +- appserver/web/web-ha/pom.xml | 2 +- appserver/web/web-naming/pom.xml | 2 +- appserver/web/web-sse/pom.xml | 2 +- appserver/web/webtier-all/pom.xml | 2 +- appserver/web/weld-integration-fragment/pom.xml | 2 +- appserver/web/weld-integration-test-fragment/pom.xml | 2 +- appserver/web/weld-integration/pom.xml | 2 +- appserver/webservices/connector/pom.xml | 2 +- appserver/webservices/jsr109-impl/pom.xml | 2 +- appserver/webservices/metro-fragments/pom.xml | 2 +- appserver/webservices/metro-glue/pom.xml | 2 +- appserver/webservices/pom.xml | 2 +- appserver/webservices/soap-tcp/pom.xml | 2 +- appserver/webservices/webservices-scripts/pom.xml | 2 +- docs/add-on-component-development-guide/pom.xml | 2 +- docs/administration-guide/pom.xml | 2 +- docs/application-deployment-guide/pom.xml | 2 +- docs/application-development-guide/pom.xml | 2 +- docs/deployment-planning-guide/pom.xml | 2 +- docs/distribution/pom.xml | 2 +- docs/embedded-server-guide/pom.xml | 2 +- docs/error-messages-reference/pom.xml | 2 +- docs/ha-administration-guide/pom.xml | 2 +- docs/installation-guide/pom.xml | 2 +- docs/parent/pom.xml | 2 +- docs/performance-tuning-guide/pom.xml | 2 +- docs/pom.xml | 2 +- docs/publish/pom.xml | 2 +- docs/quick-start-guide/pom.xml | 2 +- docs/reference-manual/pom.xml | 2 +- docs/release-notes/pom.xml | 2 +- docs/security-guide/pom.xml | 2 +- docs/troubleshooting-guide/pom.xml | 2 +- docs/upgrade-guide/pom.xml | 2 +- docs/website/pom.xml | 2 +- nucleus/admin/cli/pom.xml | 2 +- nucleus/admin/config-api/pom.xml | 2 +- nucleus/admin/launcher/pom.xml | 2 +- nucleus/admin/monitor/pom.xml | 2 +- nucleus/admin/pom.xml | 2 +- nucleus/admin/rest/gf-restadmin-connector/pom.xml | 2 +- nucleus/admin/rest/pom.xml | 2 +- nucleus/admin/rest/rest-client/pom.xml | 2 +- nucleus/admin/rest/rest-service/pom.xml | 2 +- nucleus/admin/rest/rest-testing/pom.xml | 2 +- nucleus/admin/server-mgmt/pom.xml | 2 +- nucleus/admin/template/pom.xml | 2 +- nucleus/admin/util/pom.xml | 2 +- nucleus/cluster/admin/pom.xml | 2 +- nucleus/cluster/cli/pom.xml | 2 +- nucleus/cluster/common/pom.xml | 2 +- nucleus/cluster/gms-adapter/pom.xml | 2 +- nucleus/cluster/gms-bootstrap/pom.xml | 2 +- nucleus/cluster/pom.xml | 2 +- nucleus/cluster/ssh/pom.xml | 2 +- nucleus/common/amx-core/pom.xml | 2 +- nucleus/common/common-util/pom.xml | 2 +- nucleus/common/glassfish-api/pom.xml | 2 +- nucleus/common/internal-api/pom.xml | 2 +- nucleus/common/mbeanserver/pom.xml | 2 +- nucleus/common/pom.xml | 2 +- nucleus/common/scattered-archive-api/pom.xml | 2 +- nucleus/common/simple-glassfish-api/pom.xml | 2 +- nucleus/core/api-exporter/pom.xml | 2 +- nucleus/core/bootstrap/pom.xml | 2 +- nucleus/core/context-propagation/pom.xml | 2 +- nucleus/core/extra-jre-packages/pom.xml | 2 +- nucleus/core/kernel/pom.xml | 2 +- nucleus/core/logging/pom.xml | 2 +- nucleus/core/pom.xml | 2 +- nucleus/deployment/admin/pom.xml | 2 +- nucleus/deployment/autodeploy/pom.xml | 2 +- nucleus/deployment/common/pom.xml | 2 +- nucleus/deployment/dtds/pom.xml | 2 +- nucleus/deployment/pom.xml | 2 +- nucleus/deployment/schemas/pom.xml | 2 +- nucleus/diagnostics/context/pom.xml | 2 +- nucleus/diagnostics/diagnostics-api/pom.xml | 2 +- nucleus/diagnostics/pom.xml | 2 +- nucleus/distributions/atomic/pom.xml | 2 +- nucleus/distributions/nucleus-common/pom.xml | 2 +- nucleus/distributions/nucleus/pom.xml | 2 +- nucleus/distributions/pom.xml | 2 +- nucleus/featuresets/atomic/pom.xml | 2 +- nucleus/featuresets/nucleus/pom.xml | 2 +- nucleus/featuresets/pom.xml | 2 +- nucleus/flashlight/agent/pom.xml | 2 +- nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml | 2 +- nucleus/flashlight/framework/pom.xml | 2 +- nucleus/flashlight/pom.xml | 2 +- nucleus/grizzly/config/pom.xml | 2 +- nucleus/grizzly/nucleus-grizzly-all/pom.xml | 2 +- nucleus/grizzly/pom.xml | 2 +- nucleus/hk2/config-generator/pom.xml | 2 +- nucleus/hk2/config-types/pom.xml | 2 +- nucleus/hk2/hk2-config/pom.xml | 2 +- nucleus/hk2/pom.xml | 2 +- nucleus/hk2/tiger-types/pom.xml | 2 +- nucleus/osgi-platforms/felix/pom.xml | 2 +- nucleus/osgi-platforms/osgi-cli-interactive/pom.xml | 2 +- nucleus/osgi-platforms/osgi-cli-remote/pom.xml | 2 +- nucleus/osgi-platforms/osgi-container/pom.xml | 2 +- nucleus/osgi-platforms/pom.xml | 2 +- nucleus/parent/pom.xml | 2 +- nucleus/pom.xml | 2 +- nucleus/resources/pom.xml | 2 +- nucleus/security/core/pom.xml | 2 +- nucleus/security/pom.xml | 2 +- nucleus/security/services/pom.xml | 2 +- nucleus/security/ssl-impl/pom.xml | 2 +- nucleus/test-utils/pom.xml | 2 +- nucleus/tests/admin/pom.xml | 2 +- nucleus/tests/pom.xml | 2 +- pom.xml | 2 +- qa/pom.xml | 2 +- 509 files changed, 550 insertions(+), 550 deletions(-) diff --git a/appserver/admin/admin-core/pom.xml b/appserver/admin/admin-core/pom.xml index 6c0b7b3b392..ea1b0e2d2c6 100755 --- a/appserver/admin/admin-core/pom.xml +++ b/appserver/admin/admin-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.6 + 6.2.6-SNAPSHOT admin-core diff --git a/appserver/admin/backup/pom.xml b/appserver/admin/backup/pom.xml index 8e24eb87782..425c040f74c 100644 --- a/appserver/admin/backup/pom.xml +++ b/appserver/admin/backup/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.6 + 6.2.6-SNAPSHOT backup diff --git a/appserver/admin/cli-optional/pom.xml b/appserver/admin/cli-optional/pom.xml index b4cce600408..2c2c3b7252f 100755 --- a/appserver/admin/cli-optional/pom.xml +++ b/appserver/admin/cli-optional/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.6 + 6.2.6-SNAPSHOT cli-optional diff --git a/appserver/admin/cli/pom.xml b/appserver/admin/cli/pom.xml index ce606068a74..8c7c5a0a98d 100755 --- a/appserver/admin/cli/pom.xml +++ b/appserver/admin/cli/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.6 + 6.2.6-SNAPSHOT appserver-cli diff --git a/appserver/admin/pom.xml b/appserver/admin/pom.xml index ec23f8cf1f2..9b55baf3e42 100755 --- a/appserver/admin/pom.xml +++ b/appserver/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admin/template/pom.xml b/appserver/admin/template/pom.xml index 33d859893c8..18b9c3e98f8 100644 --- a/appserver/admin/template/pom.xml +++ b/appserver/admin/template/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin admin - 6.2.6 + 6.2.6-SNAPSHOT appserver-domain diff --git a/appserver/admingui/cluster/pom.xml b/appserver/admingui/cluster/pom.xml index d3454ef64e4..a9503922285 100644 --- a/appserver/admingui/cluster/pom.xml +++ b/appserver/admingui/cluster/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml index c92a04c5cce..e64ee3c45c6 100644 --- a/appserver/admingui/common/pom.xml +++ b/appserver/admingui/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/community-theme/pom.xml b/appserver/admingui/community-theme/pom.xml index da902a197cf..5dc4d523e1f 100644 --- a/appserver/admingui/community-theme/pom.xml +++ b/appserver/admingui/community-theme/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/concurrent/pom.xml b/appserver/admingui/concurrent/pom.xml index 518236afca8..ae81a7d846e 100644 --- a/appserver/admingui/concurrent/pom.xml +++ b/appserver/admingui/concurrent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/corba/pom.xml b/appserver/admingui/corba/pom.xml index 67add0acd74..515b07d3f79 100644 --- a/appserver/admingui/corba/pom.xml +++ b/appserver/admingui/corba/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/core/pom.xml b/appserver/admingui/core/pom.xml index dec9e6676ab..b3ac5894bda 100644 --- a/appserver/admingui/core/pom.xml +++ b/appserver/admingui/core/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/dataprovider/pom.xml b/appserver/admingui/dataprovider/pom.xml index 23e8e3f9e3e..612a648dd74 100644 --- a/appserver/admingui/dataprovider/pom.xml +++ b/appserver/admingui/dataprovider/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/admingui/dist-fragment/pom.xml b/appserver/admingui/dist-fragment/pom.xml index ceaa7ee88f9..39d9953db76 100644 --- a/appserver/admingui/dist-fragment/pom.xml +++ b/appserver/admingui/dist-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT dist-fragment diff --git a/appserver/admingui/ejb-lite/pom.xml b/appserver/admingui/ejb-lite/pom.xml index de91d28cc9d..1a7f9ee7a1b 100644 --- a/appserver/admingui/ejb-lite/pom.xml +++ b/appserver/admingui/ejb-lite/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/ejb/pom.xml b/appserver/admingui/ejb/pom.xml index 05420dbd094..c9ee0872c68 100644 --- a/appserver/admingui/ejb/pom.xml +++ b/appserver/admingui/ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/full/pom.xml b/appserver/admingui/full/pom.xml index 739c976084a..e99d92987e5 100644 --- a/appserver/admingui/full/pom.xml +++ b/appserver/admingui/full/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/gf-admingui-connector/pom.xml b/appserver/admingui/gf-admingui-connector/pom.xml index 085774f72aa..30c2aaa6eef 100755 --- a/appserver/admingui/gf-admingui-connector/pom.xml +++ b/appserver/admingui/gf-admingui-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/admingui/jackson-jaxb/pom.xml b/appserver/admingui/jackson-jaxb/pom.xml index 0055fa3ebcc..16df5a3b6b6 100644 --- a/appserver/admingui/jackson-jaxb/pom.xml +++ b/appserver/admingui/jackson-jaxb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/admingui/jca/pom.xml b/appserver/admingui/jca/pom.xml index 059ce31d09d..4cb6f8b8137 100644 --- a/appserver/admingui/jca/pom.xml +++ b/appserver/admingui/jca/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/jdbc/pom.xml b/appserver/admingui/jdbc/pom.xml index 23e382eb7bd..abb87bba314 100644 --- a/appserver/admingui/jdbc/pom.xml +++ b/appserver/admingui/jdbc/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/jms-plugin/pom.xml b/appserver/admingui/jms-plugin/pom.xml index 22eb22840f5..9ed3f7ad863 100644 --- a/appserver/admingui/jms-plugin/pom.xml +++ b/appserver/admingui/jms-plugin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/jts/pom.xml b/appserver/admingui/jts/pom.xml index c9f4d9ee58f..003db8c3e7a 100644 --- a/appserver/admingui/jts/pom.xml +++ b/appserver/admingui/jts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/plugin-service/pom.xml b/appserver/admingui/plugin-service/pom.xml index 6425e7bc2d5..d3a16eabdba 100644 --- a/appserver/admingui/plugin-service/pom.xml +++ b/appserver/admingui/plugin-service/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/admingui/pom.xml b/appserver/admingui/pom.xml index d1bf0f53bf7..39f515faf70 100644 --- a/appserver/admingui/pom.xml +++ b/appserver/admingui/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/admingui/war/pom.xml b/appserver/admingui/war/pom.xml index e0dce0b639a..8840024f72b 100644 --- a/appserver/admingui/war/pom.xml +++ b/appserver/admingui/war/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/admingui/web/pom.xml b/appserver/admingui/web/pom.xml index 44439d042bc..43c544f7a6a 100644 --- a/appserver/admingui/web/pom.xml +++ b/appserver/admingui/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT console-web-plugin diff --git a/appserver/ant-tasks/pom.xml b/appserver/ant-tasks/pom.xml index 01319fa6058..fc62a03027e 100644 --- a/appserver/ant-tasks/pom.xml +++ b/appserver/ant-tasks/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/appclient/client/acc-config/pom.xml b/appserver/appclient/client/acc-config/pom.xml index e6277dfb34c..a0742d3e798 100755 --- a/appserver/appclient/client/acc-config/pom.xml +++ b/appserver/appclient/client/acc-config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.6 + 6.2.6-SNAPSHOT acc-config diff --git a/appserver/appclient/client/acc-standalone/pom.xml b/appserver/appclient/client/acc-standalone/pom.xml index 7313c74b07a..33aac8e6237 100755 --- a/appserver/appclient/client/acc-standalone/pom.xml +++ b/appserver/appclient/client/acc-standalone/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/appclient/client/acc/pom.xml b/appserver/appclient/client/acc/pom.xml index 4436ec876ee..1f3225af29a 100755 --- a/appserver/appclient/client/acc/pom.xml +++ b/appserver/appclient/client/acc/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.6 + 6.2.6-SNAPSHOT gf-client-module diff --git a/appserver/appclient/client/appclient-scripts/pom.xml b/appserver/appclient/client/appclient-scripts/pom.xml index 68c28947d38..4a28fa60944 100644 --- a/appserver/appclient/client/appclient-scripts/pom.xml +++ b/appserver/appclient/client/appclient-scripts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient client - 6.2.6 + 6.2.6-SNAPSHOT appclient-scripts diff --git a/appserver/appclient/client/pom.xml b/appserver/appclient/client/pom.xml index b3716bed56c..a7a29381da4 100755 --- a/appserver/appclient/client/pom.xml +++ b/appserver/appclient/client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main appclient - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.appclient diff --git a/appserver/appclient/pom.xml b/appserver/appclient/pom.xml index ecee8623b32..95d043ec383 100755 --- a/appserver/appclient/pom.xml +++ b/appserver/appclient/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT appclient diff --git a/appserver/appclient/server/connector/pom.xml b/appserver/appclient/server/connector/pom.xml index fa0eb2297bf..40fd19aa33e 100644 --- a/appserver/appclient/server/connector/pom.xml +++ b/appserver/appclient/server/connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient server - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.appclient.server diff --git a/appserver/appclient/server/core/pom.xml b/appserver/appclient/server/core/pom.xml index 4f45653703a..b035a485465 100644 --- a/appserver/appclient/server/core/pom.xml +++ b/appserver/appclient/server/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.appclient server - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.appclient.server diff --git a/appserver/appclient/server/pom.xml b/appserver/appclient/server/pom.xml index b9b14f91732..4b25c2616e8 100755 --- a/appserver/appclient/server/pom.xml +++ b/appserver/appclient/server/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main appclient - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/batch/batch-database/pom.xml b/appserver/batch/batch-database/pom.xml index e32903b11a8..8b510fda0f0 100644 --- a/appserver/batch/batch-database/pom.xml +++ b/appserver/batch/batch-database/pom.xml @@ -26,7 +26,7 @@ org.glassfish.main.batch batch - 6.2.6 + 6.2.6-SNAPSHOT batch-databases diff --git a/appserver/batch/glassfish-batch-commands/pom.xml b/appserver/batch/glassfish-batch-commands/pom.xml index 9763374b43e..5c4db0a6486 100755 --- a/appserver/batch/glassfish-batch-commands/pom.xml +++ b/appserver/batch/glassfish-batch-commands/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.batch batch - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/batch/glassfish-batch-connector/pom.xml b/appserver/batch/glassfish-batch-connector/pom.xml index e4d17800926..14293689b17 100755 --- a/appserver/batch/glassfish-batch-connector/pom.xml +++ b/appserver/batch/glassfish-batch-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.batch batch - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/batch/pom.xml b/appserver/batch/pom.xml index 37410c0b228..ed28b55199e 100755 --- a/appserver/batch/pom.xml +++ b/appserver/batch/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/common/amx-javaee/pom.xml b/appserver/common/amx-javaee/pom.xml index 154428cdabe..a087f58a2b9 100755 --- a/appserver/common/amx-javaee/pom.xml +++ b/appserver/common/amx-javaee/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.6 + 6.2.6-SNAPSHOT amx-javaee diff --git a/appserver/common/annotation-framework/pom.xml b/appserver/common/annotation-framework/pom.xml index db9a9cc3622..ee105f321ad 100755 --- a/appserver/common/annotation-framework/pom.xml +++ b/appserver/common/annotation-framework/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.6 + 6.2.6-SNAPSHOT annotation-framework diff --git a/appserver/common/container-common/pom.xml b/appserver/common/container-common/pom.xml index 0b5f4a0971c..4ba6ec84ec9 100755 --- a/appserver/common/container-common/pom.xml +++ b/appserver/common/container-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/common/glassfish-ee-api/pom.xml b/appserver/common/glassfish-ee-api/pom.xml index b17c0969bd7..5cd0fe025b4 100644 --- a/appserver/common/glassfish-ee-api/pom.xml +++ b/appserver/common/glassfish-ee-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.6 + 6.2.6-SNAPSHOT glassfish-ee-api diff --git a/appserver/common/glassfish-naming/pom.xml b/appserver/common/glassfish-naming/pom.xml index 447b1470388..faa0fe6e898 100755 --- a/appserver/common/glassfish-naming/pom.xml +++ b/appserver/common/glassfish-naming/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.6 + 6.2.6-SNAPSHOT glassfish-naming diff --git a/appserver/common/pom.xml b/appserver/common/pom.xml index 2f6cd2d4706..ea18d4d2444 100755 --- a/appserver/common/pom.xml +++ b/appserver/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/common/stats77/pom.xml b/appserver/common/stats77/pom.xml index 7337481d5da..02ca37432b6 100755 --- a/appserver/common/stats77/pom.xml +++ b/appserver/common/stats77/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.6 + 6.2.6-SNAPSHOT stats77 diff --git a/appserver/concurrent/concurrent-connector/pom.xml b/appserver/concurrent/concurrent-connector/pom.xml index df2324ab391..4cd04005f3b 100644 --- a/appserver/concurrent/concurrent-connector/pom.xml +++ b/appserver/concurrent/concurrent-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.concurrent concurrent - 6.2.6 + 6.2.6-SNAPSHOT concurrent-connector diff --git a/appserver/concurrent/concurrent-impl/pom.xml b/appserver/concurrent/concurrent-impl/pom.xml index 98664e04c3f..efe10d84ca0 100644 --- a/appserver/concurrent/concurrent-impl/pom.xml +++ b/appserver/concurrent/concurrent-impl/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.concurrent concurrent - 6.2.6 + 6.2.6-SNAPSHOT concurrent-impl diff --git a/appserver/concurrent/pom.xml b/appserver/concurrent/pom.xml index 3995ff804d5..c2605f66bdd 100755 --- a/appserver/concurrent/pom.xml +++ b/appserver/concurrent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.concurrent diff --git a/appserver/connectors/admin/pom.xml b/appserver/connectors/admin/pom.xml index 19d4c1220ea..f9cc6f66c2e 100644 --- a/appserver/connectors/admin/pom.xml +++ b/appserver/connectors/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.6 + 6.2.6-SNAPSHOT connectors-admin diff --git a/appserver/connectors/connectors-connector/pom.xml b/appserver/connectors/connectors-connector/pom.xml index b8a904d32a9..e261e894acc 100644 --- a/appserver/connectors/connectors-connector/pom.xml +++ b/appserver/connectors/connectors-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.6 + 6.2.6-SNAPSHOT gf-connectors-connector diff --git a/appserver/connectors/connectors-inbound-runtime/pom.xml b/appserver/connectors/connectors-inbound-runtime/pom.xml index b609763e3d6..31f5e68cb22 100644 --- a/appserver/connectors/connectors-inbound-runtime/pom.xml +++ b/appserver/connectors/connectors-inbound-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/connectors/connectors-internal-api/pom.xml b/appserver/connectors/connectors-internal-api/pom.xml index cabd7df96bc..2f8eaca40ee 100755 --- a/appserver/connectors/connectors-internal-api/pom.xml +++ b/appserver/connectors/connectors-internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/connectors/connectors-runtime/pom.xml b/appserver/connectors/connectors-runtime/pom.xml index cd66b2f8ac9..767ab23dee8 100644 --- a/appserver/connectors/connectors-runtime/pom.xml +++ b/appserver/connectors/connectors-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/connectors/descriptors/pom.xml b/appserver/connectors/descriptors/pom.xml index 15224345b78..7b77ce2a26d 100644 --- a/appserver/connectors/descriptors/pom.xml +++ b/appserver/connectors/descriptors/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.6 + 6.2.6-SNAPSHOT descriptors diff --git a/appserver/connectors/pom.xml b/appserver/connectors/pom.xml index e922934e348..598e5161390 100644 --- a/appserver/connectors/pom.xml +++ b/appserver/connectors/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.connectors diff --git a/appserver/connectors/work-management/pom.xml b/appserver/connectors/work-management/pom.xml index 58e6313a7c4..56355ea17b6 100644 --- a/appserver/connectors/work-management/pom.xml +++ b/appserver/connectors/work-management/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.connectors connectors - 6.2.6 + 6.2.6-SNAPSHOT work-management diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml index 7e648eca7a8..ecb16f2ccea 100755 --- a/appserver/core/api-exporter-fragment/pom.xml +++ b/appserver/core/api-exporter-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core core - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/core/javaee-kernel/pom.xml b/appserver/core/javaee-kernel/pom.xml index 530f67a6e36..00d84eec682 100755 --- a/appserver/core/javaee-kernel/pom.xml +++ b/appserver/core/javaee-kernel/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core core - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/core/pom.xml b/appserver/core/pom.xml index 52ab8b18014..f93fdd22037 100644 --- a/appserver/core/pom.xml +++ b/appserver/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/deployment/dol/pom.xml b/appserver/deployment/dol/pom.xml index ecc82b338d1..ee06cc3253c 100755 --- a/appserver/deployment/dol/pom.xml +++ b/appserver/deployment/dol/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.6 + 6.2.6-SNAPSHOT dol diff --git a/appserver/deployment/dtds/pom.xml b/appserver/deployment/dtds/pom.xml index bbf9dca9323..8c82eb42efe 100644 --- a/appserver/deployment/dtds/pom.xml +++ b/appserver/deployment/dtds/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.6 + 6.2.6-SNAPSHOT appserver-dtds diff --git a/appserver/deployment/javaee-core/pom.xml b/appserver/deployment/javaee-core/pom.xml index b1c81beff19..acb5ec80787 100755 --- a/appserver/deployment/javaee-core/pom.xml +++ b/appserver/deployment/javaee-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/deployment/javaee-full/pom.xml b/appserver/deployment/javaee-full/pom.xml index c9dc15407bc..ced3dfb9404 100755 --- a/appserver/deployment/javaee-full/pom.xml +++ b/appserver/deployment/javaee-full/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/deployment/pom.xml b/appserver/deployment/pom.xml index 852c500e61f..fb90bfc308f 100755 --- a/appserver/deployment/pom.xml +++ b/appserver/deployment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/deployment/schemas/pom.xml b/appserver/deployment/schemas/pom.xml index 3b36d599b15..2e4db471156 100644 --- a/appserver/deployment/schemas/pom.xml +++ b/appserver/deployment/schemas/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment deployment - 6.2.6 + 6.2.6-SNAPSHOT appserver-schemas diff --git a/appserver/distributions/glassfish-common/pom.xml b/appserver/distributions/glassfish-common/pom.xml index 0e2130be043..5aadcffb0e9 100644 --- a/appserver/distributions/glassfish-common/pom.xml +++ b/appserver/distributions/glassfish-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions distributions - 6.2.6 + 6.2.6-SNAPSHOT glassfish-common diff --git a/appserver/distributions/glassfish/pom.xml b/appserver/distributions/glassfish/pom.xml index d2a2041125f..08cc6ea516f 100644 --- a/appserver/distributions/glassfish/pom.xml +++ b/appserver/distributions/glassfish/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions distributions - 6.2.6 + 6.2.6-SNAPSHOT glassfish diff --git a/appserver/distributions/pom.xml b/appserver/distributions/pom.xml index cd28db12013..4ed16a12aa6 100644 --- a/appserver/distributions/pom.xml +++ b/appserver/distributions/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.distributions diff --git a/appserver/distributions/web/pom.xml b/appserver/distributions/web/pom.xml index 2215bf7e5da..f3f39c71582 100644 --- a/appserver/distributions/web/pom.xml +++ b/appserver/distributions/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions distributions - 6.2.6 + 6.2.6-SNAPSHOT web diff --git a/appserver/ejb/ejb-all/pom.xml b/appserver/ejb/ejb-all/pom.xml index 6245eea2b37..045dd6164ec 100755 --- a/appserver/ejb/ejb-all/pom.xml +++ b/appserver/ejb/ejb-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/ejb/ejb-client/pom.xml b/appserver/ejb/ejb-client/pom.xml index d58b2e0215b..73d0945a701 100755 --- a/appserver/ejb/ejb-client/pom.xml +++ b/appserver/ejb/ejb-client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.6 + 6.2.6-SNAPSHOT ejb-client diff --git a/appserver/ejb/ejb-connector/pom.xml b/appserver/ejb/ejb-connector/pom.xml index 87d0ece1a27..b2891d14d12 100755 --- a/appserver/ejb/ejb-connector/pom.xml +++ b/appserver/ejb/ejb-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/ejb/ejb-container/pom.xml b/appserver/ejb/ejb-container/pom.xml index 0b93c7e5ff1..63309d4c66a 100755 --- a/appserver/ejb/ejb-container/pom.xml +++ b/appserver/ejb/ejb-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/ejb/ejb-full-container/pom.xml b/appserver/ejb/ejb-full-container/pom.xml index 34be82c4104..a242e6661a9 100644 --- a/appserver/ejb/ejb-full-container/pom.xml +++ b/appserver/ejb/ejb-full-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/ejb/ejb-internal-api/pom.xml b/appserver/ejb/ejb-internal-api/pom.xml index bc9b77495fd..bfd56f93c59 100755 --- a/appserver/ejb/ejb-internal-api/pom.xml +++ b/appserver/ejb/ejb-internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/ejb/ejb-timer-databases/pom.xml b/appserver/ejb/ejb-timer-databases/pom.xml index 0ebf80e78cf..38405509a9e 100644 --- a/appserver/ejb/ejb-timer-databases/pom.xml +++ b/appserver/ejb/ejb-timer-databases/pom.xml @@ -26,7 +26,7 @@ org.glassfish.main.ejb ejb - 6.2.6 + 6.2.6-SNAPSHOT ejb-timer-databases diff --git a/appserver/ejb/ejb-timer-service-app/pom.xml b/appserver/ejb/ejb-timer-service-app/pom.xml index 5d6f7aaf2a3..e7719721830 100644 --- a/appserver/ejb/ejb-timer-service-app/pom.xml +++ b/appserver/ejb/ejb-timer-service-app/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ejb ejb - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/ejb/pom.xml b/appserver/ejb/pom.xml index 8b9d4d9eb8a..3daaaecd4ed 100755 --- a/appserver/ejb/pom.xml +++ b/appserver/ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.ejb diff --git a/appserver/extras/appserv-rt/dist-frag/pom.xml b/appserver/extras/appserv-rt/dist-frag/pom.xml index c7c3186330c..3d82e9e5695 100644 --- a/appserver/extras/appserv-rt/dist-frag/pom.xml +++ b/appserver/extras/appserv-rt/dist-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras appserv-rt-pom - 6.2.6 + 6.2.6-SNAPSHOT appserv-rt-frag diff --git a/appserver/extras/appserv-rt/manifest-jar/pom.xml b/appserver/extras/appserv-rt/manifest-jar/pom.xml index a74f6d36f7b..b96a9ca611e 100644 --- a/appserver/extras/appserv-rt/manifest-jar/pom.xml +++ b/appserver/extras/appserv-rt/manifest-jar/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras appserv-rt-pom - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/extras/appserv-rt/pom.xml b/appserver/extras/appserv-rt/pom.xml index b75dd797862..554fc17ed9d 100644 --- a/appserver/extras/appserv-rt/pom.xml +++ b/appserver/extras/appserv-rt/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml index e4f365c4708..c3ea234d8f3 100644 --- a/appserver/extras/embedded/all/pom.xml +++ b/appserver/extras/embedded/all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/extras/embedded/common/bootstrap/pom.xml b/appserver/extras/embedded/common/bootstrap/pom.xml index 5fe1c62f223..7c4626899f0 100644 --- a/appserver/extras/embedded/common/bootstrap/pom.xml +++ b/appserver/extras/embedded/common/bootstrap/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/extras/embedded/common/installroot-builder/pom.xml b/appserver/extras/embedded/common/installroot-builder/pom.xml index d5a0357989a..5a5ccb6767c 100644 --- a/appserver/extras/embedded/common/installroot-builder/pom.xml +++ b/appserver/extras/embedded/common/installroot-builder/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/extras/embedded/common/instanceroot-builder/pom.xml b/appserver/extras/embedded/common/instanceroot-builder/pom.xml index 7d670160d06..2365b20830b 100644 --- a/appserver/extras/embedded/common/instanceroot-builder/pom.xml +++ b/appserver/extras/embedded/common/instanceroot-builder/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/extras/embedded/common/osgi-main/pom.xml b/appserver/extras/embedded/common/osgi-main/pom.xml index c1d956a9d15..bb184b3eada 100644 --- a/appserver/extras/embedded/common/osgi-main/pom.xml +++ b/appserver/extras/embedded/common/osgi-main/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml b/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml index 57da56dae1d..b25a0adc890 100644 --- a/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml +++ b/appserver/extras/embedded/common/osgi-modules-uninstaller/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.extras glassfish-embedded-common - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/extras/embedded/common/pom.xml b/appserver/extras/embedded/common/pom.xml index 15eaa23a246..f270d235f4b 100644 --- a/appserver/extras/embedded/common/pom.xml +++ b/appserver/extras/embedded/common/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/extras/embedded/nucleus/pom.xml b/appserver/extras/embedded/nucleus/pom.xml index f103af91c8f..20d2f5c9e0a 100644 --- a/appserver/extras/embedded/nucleus/pom.xml +++ b/appserver/extras/embedded/nucleus/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/extras/embedded/pom.xml b/appserver/extras/embedded/pom.xml index c1ccf3dc53e..73184444be8 100644 --- a/appserver/extras/embedded/pom.xml +++ b/appserver/extras/embedded/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT embedded diff --git a/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml index 7a4e9cb13cc..11997a59bd5 100644 --- a/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-shell-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT ../../../pom.xml diff --git a/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml index 1f500110617..d1ffa84accd 100755 --- a/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT ../../../pom.xml diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml index 79924c28886..ea7d63dda98 100644 --- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT ../../../pom.xml diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml index 63711fcf298..35ada01485d 100755 --- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT ../../../pom.xml diff --git a/appserver/extras/embedded/shell/pom.xml b/appserver/extras/embedded/shell/pom.xml index bc0c62c180f..4310e1355f2 100755 --- a/appserver/extras/embedded/shell/pom.xml +++ b/appserver/extras/embedded/shell/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/extras/embedded/tests/pom.xml b/appserver/extras/embedded/tests/pom.xml index 3e3dbfdb661..478b4e654b1 100644 --- a/appserver/extras/embedded/tests/pom.xml +++ b/appserver/extras/embedded/tests/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras embedded - 6.2.6 + 6.2.6-SNAPSHOT tests-embedded diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml index 28d14261b4c..559524b015e 100644 --- a/appserver/extras/embedded/web/pom.xml +++ b/appserver/extras/embedded/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/extras/javaee/dist-frag/pom.xml b/appserver/extras/javaee/dist-frag/pom.xml index 5231b534e9a..26a199de26b 100644 --- a/appserver/extras/javaee/dist-frag/pom.xml +++ b/appserver/extras/javaee/dist-frag/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras javaee-pom - 6.2.6 + 6.2.6-SNAPSHOT javaee-frag diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/javaee/manifest-jar/pom.xml index 908506cafed..22514e35986 100644 --- a/appserver/extras/javaee/manifest-jar/pom.xml +++ b/appserver/extras/javaee/manifest-jar/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras javaee-pom - 6.2.6 + 6.2.6-SNAPSHOT javaee diff --git a/appserver/extras/javaee/pom.xml b/appserver/extras/javaee/pom.xml index 5f9e34714db..41a11fa218b 100644 --- a/appserver/extras/javaee/pom.xml +++ b/appserver/extras/javaee/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.extras extras - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/extras/pom.xml b/appserver/extras/pom.xml index 5e725d31dae..1b685e17c91 100755 --- a/appserver/extras/pom.xml +++ b/appserver/extras/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.extras diff --git a/appserver/featuresets/debug/pom.xml b/appserver/featuresets/debug/pom.xml index 7208be4862a..391e8a04819 100644 --- a/appserver/featuresets/debug/pom.xml +++ b/appserver/featuresets/debug/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets featuresets - 6.2.6 + 6.2.6-SNAPSHOT debug diff --git a/appserver/featuresets/glassfish/pom.xml b/appserver/featuresets/glassfish/pom.xml index d7ed03bd833..5da620dad13 100644 --- a/appserver/featuresets/glassfish/pom.xml +++ b/appserver/featuresets/glassfish/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets featuresets - 6.2.6 + 6.2.6-SNAPSHOT glassfish diff --git a/appserver/featuresets/pom.xml b/appserver/featuresets/pom.xml index b9ca4945848..a7948f41277 100644 --- a/appserver/featuresets/pom.xml +++ b/appserver/featuresets/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.featuresets diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml index dd8359b3d83..9e6e2f3e1ae 100644 --- a/appserver/featuresets/web/pom.xml +++ b/appserver/featuresets/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets featuresets - 6.2.6 + 6.2.6-SNAPSHOT web diff --git a/appserver/flashlight/client/pom.xml b/appserver/flashlight/client/pom.xml index d8082c3303b..8c879dfabbd 100755 --- a/appserver/flashlight/client/pom.xml +++ b/appserver/flashlight/client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common common - 6.2.6 + 6.2.6-SNAPSHOT ../../common/pom.xml diff --git a/appserver/flashlight/pom.xml b/appserver/flashlight/pom.xml index 53ab1ad6c82..0fd4317e7e8 100755 --- a/appserver/flashlight/pom.xml +++ b/appserver/flashlight/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml b/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml index e0f9f008eb5..689252410d4 100644 --- a/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml +++ b/appserver/grizzly/glassfish-grizzly-extra-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly glassfish-grizzly - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/grizzly/grizzly-container/pom.xml b/appserver/grizzly/grizzly-container/pom.xml index 32f632149e0..58f7820a97e 100755 --- a/appserver/grizzly/grizzly-container/pom.xml +++ b/appserver/grizzly/grizzly-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly glassfish-grizzly - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/grizzly/pom.xml b/appserver/grizzly/pom.xml index 198315cce19..90babe23386 100755 --- a/appserver/grizzly/pom.xml +++ b/appserver/grizzly/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/ha/ha-file-store/pom.xml b/appserver/ha/ha-file-store/pom.xml index 4cc65adb207..5d083dc641a 100644 --- a/appserver/ha/ha-file-store/pom.xml +++ b/appserver/ha/ha-file-store/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ha ha - 6.2.6 + 6.2.6-SNAPSHOT ha-file-store diff --git a/appserver/ha/ha-shoal-cache-bootstrap/pom.xml b/appserver/ha/ha-shoal-cache-bootstrap/pom.xml index ad81f443c5e..195d0b5b7c9 100644 --- a/appserver/ha/ha-shoal-cache-bootstrap/pom.xml +++ b/appserver/ha/ha-shoal-cache-bootstrap/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ha ha - 6.2.6 + 6.2.6-SNAPSHOT ha-shoal-cache-bootstrap diff --git a/appserver/ha/ha-shoal-store/pom.xml b/appserver/ha/ha-shoal-store/pom.xml index cd639702140..d7942ce7c6e 100644 --- a/appserver/ha/ha-shoal-store/pom.xml +++ b/appserver/ha/ha-shoal-store/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.ha ha - 6.2.6 + 6.2.6-SNAPSHOT ha-shoal-cache-store diff --git a/appserver/ha/pom.xml b/appserver/ha/pom.xml index 7917288282d..f41fd0d1f63 100755 --- a/appserver/ha/pom.xml +++ b/appserver/ha/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/jdbc/admin/pom.xml b/appserver/jdbc/admin/pom.xml index 079e2f28707..0778a4bc3e5 100644 --- a/appserver/jdbc/admin/pom.xml +++ b/appserver/jdbc/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc jdbc - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/jdbc/jdbc-config/pom.xml b/appserver/jdbc/jdbc-config/pom.xml index ba7f92a9a67..70be3352f76 100644 --- a/appserver/jdbc/jdbc-config/pom.xml +++ b/appserver/jdbc/jdbc-config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc jdbc - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml b/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml index 8d474ccf40b..390f7f188f4 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml +++ b/appserver/jdbc/jdbc-ra/jdbc-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc.jdbc-ra jdbc-ra - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml b/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml index 10ce81d9409..f91449bfaa6 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml +++ b/appserver/jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc.jdbc-ra jdbc-ra - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/jdbc40/pom.xml b/appserver/jdbc/jdbc-ra/jdbc40/pom.xml index e2a99736448..abb4865a010 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/pom.xml +++ b/appserver/jdbc/jdbc-ra/jdbc40/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc.jdbc-ra jdbc-ra - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/jdbc/jdbc-ra/pom.xml b/appserver/jdbc/jdbc-ra/pom.xml index f61e86946d8..b82ca2d90e9 100644 --- a/appserver/jdbc/jdbc-ra/pom.xml +++ b/appserver/jdbc/jdbc-ra/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/jdbc/jdbc-runtime/pom.xml b/appserver/jdbc/jdbc-runtime/pom.xml index 976717a8fee..5b04c3f3349 100644 --- a/appserver/jdbc/jdbc-runtime/pom.xml +++ b/appserver/jdbc/jdbc-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jdbc jdbc - 6.2.6 + 6.2.6-SNAPSHOT jdbc-runtime diff --git a/appserver/jdbc/pom.xml b/appserver/jdbc/pom.xml index 590421d8ed7..64a5ae0dc16 100755 --- a/appserver/jdbc/pom.xml +++ b/appserver/jdbc/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.jdbc diff --git a/appserver/jdbc/templates/pom.xml b/appserver/jdbc/templates/pom.xml index cb416430dd3..04dda36c277 100644 --- a/appserver/jdbc/templates/pom.xml +++ b/appserver/jdbc/templates/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main.jdbc jdbc - 6.2.6 + 6.2.6-SNAPSHOT templates JDBC Templates diff --git a/appserver/jms/admin/pom.xml b/appserver/jms/admin/pom.xml index 83253f6e26f..e96666f2962 100644 --- a/appserver/jms/admin/pom.xml +++ b/appserver/jms/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/jms/gf-jms-connector/pom.xml b/appserver/jms/gf-jms-connector/pom.xml index 8a0fc8f59cd..057e19c7463 100644 --- a/appserver/jms/gf-jms-connector/pom.xml +++ b/appserver/jms/gf-jms-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/jms/gf-jms-injection/pom.xml b/appserver/jms/gf-jms-injection/pom.xml index f3302ccdb51..36102107b64 100644 --- a/appserver/jms/gf-jms-injection/pom.xml +++ b/appserver/jms/gf-jms-injection/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/jms/jms-core/pom.xml b/appserver/jms/jms-core/pom.xml index 78b62ce8896..24075febdcf 100644 --- a/appserver/jms/jms-core/pom.xml +++ b/appserver/jms/jms-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/jms/jmsra/pom.xml b/appserver/jms/jmsra/pom.xml index 3645656b13f..97ff9116360 100644 --- a/appserver/jms/jmsra/pom.xml +++ b/appserver/jms/jmsra/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.jms jms - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/jms/pom.xml b/appserver/jms/pom.xml index 914b38c2902..6ccfafb9b3f 100644 --- a/appserver/jms/pom.xml +++ b/appserver/jms/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/ldapbp/pom.xml b/appserver/ldapbp/pom.xml index 1f2d2fb86a1..54279548304 100644 --- a/appserver/ldapbp/pom.xml +++ b/appserver/ldapbp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.ldapbp diff --git a/appserver/libpam4j/pom.xml b/appserver/libpam4j/pom.xml index e115dd77c4e..c4b26419ee2 100644 --- a/appserver/libpam4j/pom.xml +++ b/appserver/libpam4j/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.libpam4j diff --git a/appserver/load-balancer/admin/pom.xml b/appserver/load-balancer/admin/pom.xml index b8b3dd15e64..3e61cc4fa1a 100644 --- a/appserver/load-balancer/admin/pom.xml +++ b/appserver/load-balancer/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.loadbalancer load-balancer - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/load-balancer/gf-load-balancer-connector/pom.xml b/appserver/load-balancer/gf-load-balancer-connector/pom.xml index ec23c4b6f9a..a7604bdd464 100644 --- a/appserver/load-balancer/gf-load-balancer-connector/pom.xml +++ b/appserver/load-balancer/gf-load-balancer-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.loadbalancer load-balancer - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/load-balancer/pom.xml b/appserver/load-balancer/pom.xml index cf19d6bc387..62277873c71 100644 --- a/appserver/load-balancer/pom.xml +++ b/appserver/load-balancer/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/orb/orb-connector/pom.xml b/appserver/orb/orb-connector/pom.xml index 0deec188655..aef716e50d4 100755 --- a/appserver/orb/orb-connector/pom.xml +++ b/appserver/orb/orb-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.orb orb - 6.2.6 + 6.2.6-SNAPSHOT orb-connector diff --git a/appserver/orb/orb-enabler/pom.xml b/appserver/orb/orb-enabler/pom.xml index 9fbe86b82eb..56eae4eea1d 100755 --- a/appserver/orb/orb-enabler/pom.xml +++ b/appserver/orb/orb-enabler/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.orb orb - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/orb/orb-iiop/pom.xml b/appserver/orb/orb-iiop/pom.xml index ef4d3a52b2e..e0713ccd872 100755 --- a/appserver/orb/orb-iiop/pom.xml +++ b/appserver/orb/orb-iiop/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.orb orb - 6.2.6 + 6.2.6-SNAPSHOT orb-iiop diff --git a/appserver/orb/pom.xml b/appserver/orb/pom.xml index c826fc6f33f..75b3b5b6151 100755 --- a/appserver/orb/pom.xml +++ b/appserver/orb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/osgi-platforms/felix-webconsole-extension/pom.xml b/appserver/osgi-platforms/felix-webconsole-extension/pom.xml index d8b013c6422..8534d5c08ec 100644 --- a/appserver/osgi-platforms/felix-webconsole-extension/pom.xml +++ b/appserver/osgi-platforms/felix-webconsole-extension/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-console-extensions - 6.2.6 + 6.2.6-SNAPSHOT felix-webconsole-extension diff --git a/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml b/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml index bd5a8eddf50..3374b22931c 100644 --- a/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml +++ b/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../../admingui/pom.xml diff --git a/appserver/osgi-platforms/pom.xml b/appserver/osgi-platforms/pom.xml index 144bc9ae823..67608d1a16d 100644 --- a/appserver/osgi-platforms/pom.xml +++ b/appserver/osgi-platforms/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/cmp/cmp-all/pom.xml b/appserver/persistence/cmp/cmp-all/pom.xml index 57a4ea1bdcc..f691aa034d0 100755 --- a/appserver/persistence/cmp/cmp-all/pom.xml +++ b/appserver/persistence/cmp/cmp-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/cmp/cmp-scripts/pom.xml b/appserver/persistence/cmp/cmp-scripts/pom.xml index 2ba8794cf72..82fd9222332 100755 --- a/appserver/persistence/cmp/cmp-scripts/pom.xml +++ b/appserver/persistence/cmp/cmp-scripts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.6 + 6.2.6-SNAPSHOT cmp-scripts diff --git a/appserver/persistence/cmp/ejb-mapping/pom.xml b/appserver/persistence/cmp/ejb-mapping/pom.xml index 7a18f42ec08..256560df94b 100644 --- a/appserver/persistence/cmp/ejb-mapping/pom.xml +++ b/appserver/persistence/cmp/ejb-mapping/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/cmp/enhancer/pom.xml b/appserver/persistence/cmp/enhancer/pom.xml index 5d96caf0c93..420f6a5a9f0 100644 --- a/appserver/persistence/cmp/enhancer/pom.xml +++ b/appserver/persistence/cmp/enhancer/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/cmp/generator-database/pom.xml b/appserver/persistence/cmp/generator-database/pom.xml index 105dfd6d7f3..d4b67009d4e 100644 --- a/appserver/persistence/cmp/generator-database/pom.xml +++ b/appserver/persistence/cmp/generator-database/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/cmp/internal-api/pom.xml b/appserver/persistence/cmp/internal-api/pom.xml index 80b5aa7c788..99c79df0f63 100644 --- a/appserver/persistence/cmp/internal-api/pom.xml +++ b/appserver/persistence/cmp/internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/cmp/model/pom.xml b/appserver/persistence/cmp/model/pom.xml index cfd703dea4c..f75aab27073 100644 --- a/appserver/persistence/cmp/model/pom.xml +++ b/appserver/persistence/cmp/model/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/cmp/pom.xml b/appserver/persistence/cmp/pom.xml index d0cc73c5325..f2f65ae32d6 100644 --- a/appserver/persistence/cmp/pom.xml +++ b/appserver/persistence/cmp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.persistence.cmp diff --git a/appserver/persistence/cmp/support-ejb/pom.xml b/appserver/persistence/cmp/support-ejb/pom.xml index 875ea1b8a03..a722f38ea07 100644 --- a/appserver/persistence/cmp/support-ejb/pom.xml +++ b/appserver/persistence/cmp/support-ejb/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.6 + 6.2.6-SNAPSHOT cmp-support-ejb diff --git a/appserver/persistence/cmp/support-sqlstore/pom.xml b/appserver/persistence/cmp/support-sqlstore/pom.xml index 071690cd812..f15d9d15049 100644 --- a/appserver/persistence/cmp/support-sqlstore/pom.xml +++ b/appserver/persistence/cmp/support-sqlstore/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.6 + 6.2.6-SNAPSHOT cmp-support-sqlstore diff --git a/appserver/persistence/cmp/utility/pom.xml b/appserver/persistence/cmp/utility/pom.xml index 0cc518fdbe6..f70b8b645d5 100644 --- a/appserver/persistence/cmp/utility/pom.xml +++ b/appserver/persistence/cmp/utility/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence.cmp cmp - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/common/pom.xml b/appserver/persistence/common/pom.xml index 66a6573d777..c5b5a119f93 100644 --- a/appserver/persistence/common/pom.xml +++ b/appserver/persistence/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/eclipselink-wrapper/pom.xml b/appserver/persistence/eclipselink-wrapper/pom.xml index 470a381481c..45d0ef3c48b 100644 --- a/appserver/persistence/eclipselink-wrapper/pom.xml +++ b/appserver/persistence/eclipselink-wrapper/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/entitybean-container/pom.xml b/appserver/persistence/entitybean-container/pom.xml index 9870861272c..6652e03cf5b 100644 --- a/appserver/persistence/entitybean-container/pom.xml +++ b/appserver/persistence/entitybean-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/gf-jpa-connector/pom.xml b/appserver/persistence/gf-jpa-connector/pom.xml index 79f3cb09b54..4e0d5bef934 100644 --- a/appserver/persistence/gf-jpa-connector/pom.xml +++ b/appserver/persistence/gf-jpa-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/jpa-container/pom.xml b/appserver/persistence/jpa-container/pom.xml index 1cf04a5cb6b..939f48217b2 100644 --- a/appserver/persistence/jpa-container/pom.xml +++ b/appserver/persistence/jpa-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/persistence/oracle-jdbc-driver-packages/pom.xml b/appserver/persistence/oracle-jdbc-driver-packages/pom.xml index a7f2d6d26bb..97b3575aadc 100755 --- a/appserver/persistence/oracle-jdbc-driver-packages/pom.xml +++ b/appserver/persistence/oracle-jdbc-driver-packages/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.persistence persistence - 6.2.6 + 6.2.6-SNAPSHOT glassfish-oracle-jdbc-driver-packages diff --git a/appserver/persistence/pom.xml b/appserver/persistence/pom.xml index e7367676824..4a85b25c93a 100644 --- a/appserver/persistence/pom.xml +++ b/appserver/persistence/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.persistence diff --git a/appserver/pom.xml b/appserver/pom.xml index e61e7417b89..41db196860e 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT ../nucleus/pom.xml @@ -85,7 +85,7 @@ 6 2 - 5 + 6 glassfish6 @@ -146,7 +146,7 @@ 3.0.1 - 6.2.6 + 6.2.5 4.2.1 diff --git a/appserver/resources/mail/mail-connector/pom.xml b/appserver/resources/mail/mail-connector/pom.xml index 1a6dd53e686..575dfeb3112 100644 --- a/appserver/resources/mail/mail-connector/pom.xml +++ b/appserver/resources/mail/mail-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources mail - 6.2.6 + 6.2.6-SNAPSHOT mail-connector diff --git a/appserver/resources/mail/mail-runtime/pom.xml b/appserver/resources/mail/mail-runtime/pom.xml index 6c4fcaef85f..9777b986da6 100644 --- a/appserver/resources/mail/mail-runtime/pom.xml +++ b/appserver/resources/mail/mail-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources mail - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/resources/mail/pom.xml b/appserver/resources/mail/pom.xml index 9a347a13220..fd60384834e 100644 --- a/appserver/resources/mail/pom.xml +++ b/appserver/resources/mail/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources resources - 6.2.6 + 6.2.6-SNAPSHOT mail diff --git a/appserver/resources/pom.xml b/appserver/resources/pom.xml index 1bf2a092964..5983ce70f3d 100644 --- a/appserver/resources/pom.xml +++ b/appserver/resources/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/resources/resources-connector/pom.xml b/appserver/resources/resources-connector/pom.xml index 8d96e0bcc59..6afca3594c8 100755 --- a/appserver/resources/resources-connector/pom.xml +++ b/appserver/resources/resources-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources resources - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/resources/resources-runtime/pom.xml b/appserver/resources/resources-runtime/pom.xml index 9e25379ab20..6fa6754f548 100755 --- a/appserver/resources/resources-runtime/pom.xml +++ b/appserver/resources/resources-runtime/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.resources resources - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/security/appclient.security/pom.xml b/appserver/security/appclient.security/pom.xml index eda71eec116..c3e8b39766b 100644 --- a/appserver/security/appclient.security/pom.xml +++ b/appserver/security/appclient.security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.6 + 6.2.6-SNAPSHOT appclient.security diff --git a/appserver/security/core-ee/pom.xml b/appserver/security/core-ee/pom.xml index 5db5c3f083b..dcc6e098021 100644 --- a/appserver/security/core-ee/pom.xml +++ b/appserver/security/core-ee/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.6 + 6.2.6-SNAPSHOT security-ee diff --git a/appserver/security/ejb.security/pom.xml b/appserver/security/ejb.security/pom.xml index 3ca6c0873df..6e29e66da33 100644 --- a/appserver/security/ejb.security/pom.xml +++ b/appserver/security/ejb.security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/security/jaspic-provider-framework/pom.xml b/appserver/security/jaspic-provider-framework/pom.xml index 817b77756e2..8fe228417c5 100644 --- a/appserver/security/jaspic-provider-framework/pom.xml +++ b/appserver/security/jaspic-provider-framework/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/security/pom.xml b/appserver/security/pom.xml index 8f127440f4f..e2f739ff364 100644 --- a/appserver/security/pom.xml +++ b/appserver/security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/security/security-all/pom.xml b/appserver/security/security-all/pom.xml index 4a110cffce9..e18d217ca99 100644 --- a/appserver/security/security-all/pom.xml +++ b/appserver/security/security-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/security/webintegration/pom.xml b/appserver/security/webintegration/pom.xml index 9de55572c17..7d0a1c67993 100644 --- a/appserver/security/webintegration/pom.xml +++ b/appserver/security/webintegration/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/security/webservices.security/pom.xml b/appserver/security/webservices.security/pom.xml index 3c41d966539..b407789795b 100644 --- a/appserver/security/webservices.security/pom.xml +++ b/appserver/security/webservices.security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security securitymodule - 6.2.6 + 6.2.6-SNAPSHOT webservices.security diff --git a/appserver/tests/admingui/auto-test/pom.xml b/appserver/tests/admingui/auto-test/pom.xml index 9c301c0bfc4..d61cacd586f 100644 --- a/appserver/tests/admingui/auto-test/pom.xml +++ b/appserver/tests/admingui/auto-test/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml console-auto-tests diff --git a/appserver/tests/admingui/pom.xml b/appserver/tests/admingui/pom.xml index eb51a255b6f..90e4f657ba7 100644 --- a/appserver/tests/admingui/pom.xml +++ b/appserver/tests/admingui/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.admingui admingui - 6.2.6 + 6.2.6-SNAPSHOT pom GlassFish admingui Tests diff --git a/appserver/tests/amx/pom.xml b/appserver/tests/amx/pom.xml index f3075395af4..a6a476ec8c0 100755 --- a/appserver/tests/amx/pom.xml +++ b/appserver/tests/amx/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests tests - 6.2.6 + 6.2.6-SNAPSHOT 4.0.0 amx-tests diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml b/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml index 4ab0b523ede..a22f677dfed 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml +++ b/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests ant-tests - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.tests.connectors diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml index 0f15060e7aa..7f1461eeaa9 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests.connectors connectors-ra-redeploy - 6.2.6 + 6.2.6-SNAPSHOT connectors-ra-redeploy-jars diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml index 769c8eabd98..3f91921f93f 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests ant-tests - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.tests.connectors connectors-ra-redeploy diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml index 8fd3365c1e4..13450c6417e 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests.connectors connectors-ra-redeploy - 6.2.6 + 6.2.6-SNAPSHOT connectors-ra-redeploy-rars-xa rar diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml index df821d17ca2..c45f4ff91f7 100644 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml @@ -6,7 +6,7 @@ org.glassfish.main.tests.connectors connectors-ra-redeploy - 6.2.6 + 6.2.6-SNAPSHOT connectors-ra-redeploy-rars rar diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml index 6bd093c22b3..1a7bfe06294 100644 --- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml +++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main batch-dev-tests - 6.2.6 + 6.2.6-SNAPSHOT batch-commands-tests jar diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml index 655cca452ee..85260977ed6 100644 --- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml +++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main batch-dev-tests - 6.2.6 + 6.2.6-SNAPSHOT batch-tests-utils jar diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml index 41d1ba16064..969dfaf9c01 100644 --- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml +++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT batch-dev-tests diff --git a/appserver/tests/appserv-tests/devtests/cdi/pom.xml b/appserver/tests/appserv-tests/devtests/cdi/pom.xml index 3f3be935123..ee6fdacd1c3 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/pom.xml +++ b/appserver/tests/appserv-tests/devtests/cdi/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.tests tests diff --git a/appserver/tests/appserv-tests/devtests/ejb/pom.xml b/appserver/tests/appserv-tests/devtests/ejb/pom.xml index c8d0d0229a0..7f91c8ca280 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/pom.xml +++ b/appserver/tests/appserv-tests/devtests/ejb/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.tests tests diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml index 30d6fe55e3f..920198e7143 100644 --- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/pom.xml @@ -21,7 +21,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT 4.0.0 diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml index 63dab3be125..68727ec6d5e 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.jaccApi.test prog-auth - 6.2.6 + 6.2.6-SNAPSHOT jaccApi-common diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml index 0c79fdf0da9..a63176398cb 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.jaccApi.test prog-auth - 6.2.6 + 6.2.6-SNAPSHOT pom Programmatic authentication with Jakarta Authorization api diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml index 77edfc1f68a..e4503e05539 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml @@ -23,7 +23,7 @@ org.glassfish.jaccApi.test prog-auth - 6.2.6 + 6.2.6-SNAPSHOT programmatic-authentication-jacc-api diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml index bd1a24dab96..1d9efa7d82e 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-bundled-ham-basic-login-config-form diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml index d55902ba301..f9f345085c1 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-caller-principal diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml index c45722f8a84..557f17919e2 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-custom-identity-store-handler diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml index 4245febd91d..ad5f7ba3472 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-custom-rememberme diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml index d5a6b20f502..4ce035c3231 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-custom-session diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml index 2cb5132a3ec..d85a476a2eb 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-custom diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml index 4b6912f9206..f10e03b1db8 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-db @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml index a773056a3e7..6f49151f7d8 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-double-ham @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml index 37aab333626..a34428947eb 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-ham-ordering @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml index 5bfa234dd3e..0245a9faeeb 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-mem-basic @@ -41,7 +41,7 @@ org.glassfish.soteria.test common - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml index 689cf923790..35321b78d15 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-mem-form @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml index f05f52b8bfd..4e77b7b7aef 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-multiple-store-backup @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml index 28003a41c17..d99d57a6da8 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-multiple-store @@ -40,7 +40,7 @@ org.glassfish.soteria.test common - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml index ab40989ab80..abda6da8337 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml @@ -22,7 +22,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-no-application-caller-principal @@ -39,7 +39,7 @@ org.glassfish.soteria.test common - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml index 4fa2018b39b..ccf1c2b502f 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml @@ -24,7 +24,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-no-role-mapping @@ -42,7 +42,7 @@ org.glassfish.soteria.test common - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml index e2c0414f860..a7518de28cb 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-securitycontext-auth-ejb @@ -41,7 +41,7 @@ org.glassfish.soteria.test common - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml index 42ce48ced7d..120a9f0ef78 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT app-securitycontext-auth @@ -41,7 +41,7 @@ org.glassfish.soteria.test common - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml index a275362fab6..eafc6dfa0f6 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT common diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml index c069d048256..56512ed864b 100644 --- a/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.soteria.test soteria - 6.2.6 + 6.2.6-SNAPSHOT pom Soteria ${project.version} Integration tests and examples diff --git a/appserver/tests/appserv-tests/pom.xml b/appserver/tests/appserv-tests/pom.xml index 5afe55c6726..4ee8bfb279f 100644 --- a/appserver/tests/appserv-tests/pom.xml +++ b/appserver/tests/appserv-tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main.tests tests - 6.2.6 + 6.2.6-SNAPSHOT ant-tests diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml index 42a1598a808..b2e6250674a 100755 --- a/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi.cases multiBeansXml - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.cdi.cases.multiBeansXml ejb1 - 6.2.6 + 6.2.6-SNAPSHOT GlassFish Ejb1 With Specific beans.xml diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml index 270d3122a11..2ef18157c74 100755 --- a/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi.cases multiBeansXml - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.cdi.cases.multiBeansXml ejb2 - 6.2.6 + 6.2.6-SNAPSHOT GlassFish Ejb2 With Specific beans.xml diff --git a/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml index 2493ad72947..0e0ed15aafb 100644 --- a/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi.cases multiBeansXml - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.cdi.cases.multiBeansXml diff --git a/appserver/tests/cdi/cases/multiBeansXml/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/pom.xml index c237e18550d..4ad3a991a09 100755 --- a/appserver/tests/cdi/cases/multiBeansXml/pom.xml +++ b/appserver/tests/cdi/cases/multiBeansXml/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.cdi cases - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.cdi.cases multiBeansXml pom - 6.2.6 + 6.2.6-SNAPSHOT GlassFish CDI MultiBeanXml Test diff --git a/appserver/tests/cdi/cases/pom.xml b/appserver/tests/cdi/cases/pom.xml index cc22a478b74..beb430618ce 100755 --- a/appserver/tests/cdi/cases/pom.xml +++ b/appserver/tests/cdi/cases/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests cdi - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.cdi cases pom - 6.2.6 + 6.2.6-SNAPSHOT GlassFish CDI Test Cases diff --git a/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml index 4b7eee5c5ff..69235f7e033 100644 --- a/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi.cases preDestroyScoping - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.cdi.cases.preDestroyScoping diff --git a/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml index 720a49b72df..982d5eeb4eb 100755 --- a/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/lib/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi.cases preDestroyScoping - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.cdi.cases.preDestroyScoping lib - 6.2.6 + 6.2.6-SNAPSHOT GlassFish library for PreDestroyScoping test diff --git a/appserver/tests/cdi/cases/preDestroyScoping/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/pom.xml index ee339f790c7..0d43f5d1043 100755 --- a/appserver/tests/cdi/cases/preDestroyScoping/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.cdi cases - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.cdi.cases preDestroyScoping pom - 6.2.6 + 6.2.6-SNAPSHOT GlassFish CDI PreDestroyScoping Test diff --git a/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml index 4e35240a971..f4b92d156e2 100644 --- a/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml +++ b/appserver/tests/cdi/cases/preDestroyScoping/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi.cases preDestroyScoping - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.cdi.cases.preDestroyScoping diff --git a/appserver/tests/cdi/cases/runner/pom.xml b/appserver/tests/cdi/cases/runner/pom.xml index 9bbfa2391d9..df44d85d519 100644 --- a/appserver/tests/cdi/cases/runner/pom.xml +++ b/appserver/tests/cdi/cases/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi cases - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.cdi.cases diff --git a/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml b/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml index ff59aeb3a1a..5aa4dc78c82 100755 --- a/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml +++ b/appserver/tests/cdi/negative/normalScopeWithFinal/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.cdi negative - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.cdi.negative normalScopeWithFinal - 6.2.6 + 6.2.6-SNAPSHOT GlassFish Normal Scoped Bean With Final Methods diff --git a/appserver/tests/cdi/negative/pom.xml b/appserver/tests/cdi/negative/pom.xml index 504fe5cab9f..b9bd6dd86d3 100755 --- a/appserver/tests/cdi/negative/pom.xml +++ b/appserver/tests/cdi/negative/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests cdi - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.cdi negative pom - 6.2.6 + 6.2.6-SNAPSHOT GlassFish CDI Negative Tests diff --git a/appserver/tests/cdi/negative/runner/pom.xml b/appserver/tests/cdi/negative/runner/pom.xml index 9a2a70eb85f..a1dbb10fb13 100644 --- a/appserver/tests/cdi/negative/runner/pom.xml +++ b/appserver/tests/cdi/negative/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.cdi negative - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.cdi.negative diff --git a/appserver/tests/cdi/pom.xml b/appserver/tests/cdi/pom.xml index 4a662673fd4..8bef1835018 100755 --- a/appserver/tests/cdi/pom.xml +++ b/appserver/tests/cdi/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests tests - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests diff --git a/appserver/tests/community/pom.xml b/appserver/tests/community/pom.xml index 37a8cf91f8b..b25b361fe96 100644 --- a/appserver/tests/community/pom.xml +++ b/appserver/tests/community/pom.xml @@ -28,7 +28,7 @@ quicklook Glassfish Quicklook Bundle jar - 6.2.6 + 6.2.6-SNAPSHOT This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/embedded/basic/lifecycle/pom.xml b/appserver/tests/embedded/basic/lifecycle/pom.xml index 4e560ead049..2619914224e 100644 --- a/appserver/tests/embedded/basic/lifecycle/pom.xml +++ b/appserver/tests/embedded/basic/lifecycle/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic lifecycle - 6.2.6 + 6.2.6-SNAPSHOT Test newGlassFish(), start(), stop(), dispose() lifecyle operations diff --git a/appserver/tests/embedded/basic/pom.xml b/appserver/tests/embedded/basic/pom.xml index e39a76d2791..bf3e298ab3f 100755 --- a/appserver/tests/embedded/basic/pom.xml +++ b/appserver/tests/embedded/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded basic - 6.2.6 + 6.2.6-SNAPSHOT pom Basic tests for testing org.glassfish.embeddable APIs diff --git a/appserver/tests/embedded/cdi_basic/pom.xml b/appserver/tests/embedded/cdi_basic/pom.xml index 8cb7007ddd4..02c42070358 100644 --- a/appserver/tests/embedded/cdi_basic/pom.xml +++ b/appserver/tests/embedded/cdi_basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic cdi_basic - 6.2.6 + 6.2.6-SNAPSHOT Basic CDI Test cdi_basic @@ -57,7 +57,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.6 + 6.2.6-SNAPSHOT junit diff --git a/appserver/tests/embedded/cdi_ejb_jpa/pom.xml b/appserver/tests/embedded/cdi_ejb_jpa/pom.xml index fbe92f50152..fae2ec6590d 100644 --- a/appserver/tests/embedded/cdi_ejb_jpa/pom.xml +++ b/appserver/tests/embedded/cdi_ejb_jpa/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic cdi_ejb_jpa - 6.2.6 + 6.2.6-SNAPSHOT CDI, EJB, JPA integration test cdi_ejb_jpa diff --git a/appserver/tests/embedded/ejb/basic/pom.xml b/appserver/tests/embedded/ejb/basic/pom.xml index 4d4ffcca336..261124f522a 100644 --- a/appserver/tests/embedded/ejb/basic/pom.xml +++ b/appserver/tests/embedded/ejb/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.ejb basic - 6.2.6 + 6.2.6-SNAPSHOT Test HelloWorld and Timer EJB deployed with org.glassfish.embeddable APIs @@ -53,7 +53,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.6 + 6.2.6-SNAPSHOT diff --git a/appserver/tests/embedded/ejb/ejb-api/pom.xml b/appserver/tests/embedded/ejb/ejb-api/pom.xml index 358cd24f8a6..7c8b1f3be63 100644 --- a/appserver/tests/embedded/ejb/ejb-api/pom.xml +++ b/appserver/tests/embedded/ejb/ejb-api/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.ejb ejb-api-test - 6.2.6 + 6.2.6-SNAPSHOT EJB Embedded API test @@ -57,7 +57,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.6 + 6.2.6-SNAPSHOT diff --git a/appserver/tests/embedded/ejb/ejb-main/pom.xml b/appserver/tests/embedded/ejb/ejb-main/pom.xml index c0b7d0f5900..6e7bdf1774f 100644 --- a/appserver/tests/embedded/ejb/ejb-main/pom.xml +++ b/appserver/tests/embedded/ejb/ejb-main/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded ejb - 6.2.6 + 6.2.6-SNAPSHOT 4.0.0 org.glassfish.tests.embedded.ejb diff --git a/appserver/tests/embedded/ejb/pom.xml b/appserver/tests/embedded/ejb/pom.xml index f9d67dae9cc..0acd16a3d94 100755 --- a/appserver/tests/embedded/ejb/pom.xml +++ b/appserver/tests/embedded/ejb/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded ejb - 6.2.6 + 6.2.6-SNAPSHOT pom EJB related Embedded Tests diff --git a/appserver/tests/embedded/ejb/remoteejb/pom.xml b/appserver/tests/embedded/ejb/remoteejb/pom.xml index 688a2b7b48a..4594d8d58b5 100644 --- a/appserver/tests/embedded/ejb/remoteejb/pom.xml +++ b/appserver/tests/embedded/ejb/remoteejb/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.ejb remoteejb - 6.2.6 + 6.2.6-SNAPSHOT Test remote EJB deployment with org.glassfish.embeddable APIs remoteejb @@ -65,7 +65,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.6 + 6.2.6-SNAPSHOT diff --git a/appserver/tests/embedded/glassfish_resources_xml/pom.xml b/appserver/tests/embedded/glassfish_resources_xml/pom.xml index 6da2efd1d55..17954101e1b 100644 --- a/appserver/tests/embedded/glassfish_resources_xml/pom.xml +++ b/appserver/tests/embedded/glassfish_resources_xml/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic glassfish_resources_xml - 6.2.6 + 6.2.6-SNAPSHOT CDI, EJB, JPA integration test which has glassfish-resources.xml glassfish_resources_xml diff --git a/appserver/tests/embedded/inplanted/pom.xml b/appserver/tests/embedded/inplanted/pom.xml index 12a28436304..0641f573ef6 100755 --- a/appserver/tests/embedded/inplanted/pom.xml +++ b/appserver/tests/embedded/inplanted/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT 4.0.0 @@ -74,7 +74,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.6 + 6.2.6-SNAPSHOT diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml index f9b53acb970..38a6e87c895 100644 --- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml +++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin applicationDispatcher diff --git a/appserver/tests/embedded/maven-plugin/dirListing/pom.xml b/appserver/tests/embedded/maven-plugin/dirListing/pom.xml index bf33d6b65ff..c0a99334509 100644 --- a/appserver/tests/embedded/maven-plugin/dirListing/pom.xml +++ b/appserver/tests/embedded/maven-plugin/dirListing/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin dirListing diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml b/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml index 5f6e8b04dc8..deb48c1cc71 100644 --- a/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml +++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin filterURIMapping diff --git a/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml b/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml index a543c41fd1f..696eb32659c 100644 --- a/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml +++ b/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin getRequestURI diff --git a/appserver/tests/embedded/maven-plugin/index/pom.xml b/appserver/tests/embedded/maven-plugin/index/pom.xml index ca346e81a88..52dc13499ae 100644 --- a/appserver/tests/embedded/maven-plugin/index/pom.xml +++ b/appserver/tests/embedded/maven-plugin/index/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin index diff --git a/appserver/tests/embedded/maven-plugin/init/pom.xml b/appserver/tests/embedded/maven-plugin/init/pom.xml index 4ae812f7825..8df11575330 100644 --- a/appserver/tests/embedded/maven-plugin/init/pom.xml +++ b/appserver/tests/embedded/maven-plugin/init/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin init diff --git a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml index f37d99938e4..bc8c45ae148 100644 --- a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin jmxUndeployEvent diff --git a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml index be40b3c8c39..03581fa0c66 100644 --- a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin jsftest diff --git a/appserver/tests/embedded/maven-plugin/jsptest/pom.xml b/appserver/tests/embedded/maven-plugin/jsptest/pom.xml index c1cabb028b4..8566ffe3d33 100644 --- a/appserver/tests/embedded/maven-plugin/jsptest/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jsptest/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin jsptest diff --git a/appserver/tests/embedded/maven-plugin/localejbs/pom.xml b/appserver/tests/embedded/maven-plugin/localejbs/pom.xml index b809b6b670c..15e3b95d9e5 100644 --- a/appserver/tests/embedded/maven-plugin/localejbs/pom.xml +++ b/appserver/tests/embedded/maven-plugin/localejbs/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin localejbs diff --git a/appserver/tests/embedded/maven-plugin/mdb/pom.xml b/appserver/tests/embedded/maven-plugin/mdb/pom.xml index 297a00623ae..f21c3ba5d59 100644 --- a/appserver/tests/embedded/maven-plugin/mdb/pom.xml +++ b/appserver/tests/embedded/maven-plugin/mdb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin mdb diff --git a/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml b/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml index a134a241eb2..5b45b957478 100644 --- a/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml +++ b/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin multipleApps diff --git a/appserver/tests/embedded/maven-plugin/pom.xml b/appserver/tests/embedded/maven-plugin/pom.xml index 90cd2c03dca..c8f7edda886 100644 --- a/appserver/tests/embedded/maven-plugin/pom.xml +++ b/appserver/tests/embedded/maven-plugin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT pom GlassFish Embedded Maven Plugin Tests diff --git a/appserver/tests/embedded/maven-plugin/queryString/pom.xml b/appserver/tests/embedded/maven-plugin/queryString/pom.xml index bf0052e16bd..4f520f1bdde 100644 --- a/appserver/tests/embedded/maven-plugin/queryString/pom.xml +++ b/appserver/tests/embedded/maven-plugin/queryString/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin queryString diff --git a/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml b/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml index a7dd3164762..57de1a9ac27 100644 --- a/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml +++ b/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin remoteejbs diff --git a/appserver/tests/embedded/maven-plugin/scattered/pom.xml b/appserver/tests/embedded/maven-plugin/scattered/pom.xml index 921e77a864e..2f4485afa0a 100644 --- a/appserver/tests/embedded/maven-plugin/scattered/pom.xml +++ b/appserver/tests/embedded/maven-plugin/scattered/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish scattered diff --git a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml index f456f86a44d..2afe5ab18ce 100644 --- a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml +++ b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin securewebapp diff --git a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml index 6abc4a60ae3..3e110ebeef6 100644 --- a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml +++ b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin sessionDestroyed diff --git a/appserver/tests/embedded/maven-plugin/simple/pom.xml b/appserver/tests/embedded/maven-plugin/simple/pom.xml index e41c8eea2db..cac40cc4bda 100644 --- a/appserver/tests/embedded/maven-plugin/simple/pom.xml +++ b/appserver/tests/embedded/maven-plugin/simple/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish maven-glassfish-plugin-tester-deploy diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml b/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml index f9d4ed8316f..b77ddf49fed 100644 --- a/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml +++ b/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin standalonewar diff --git a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml index fc17161c550..7cb995d2f08 100644 --- a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml +++ b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin init diff --git a/appserver/tests/embedded/maven-plugin/webservice/pom.xml b/appserver/tests/embedded/maven-plugin/webservice/pom.xml index 9afe59c034a..a598361f34d 100644 --- a/appserver/tests/embedded/maven-plugin/webservice/pom.xml +++ b/appserver/tests/embedded/maven-plugin/webservice/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin webservice diff --git a/appserver/tests/embedded/maven-plugin/websockets/pom.xml b/appserver/tests/embedded/maven-plugin/websockets/pom.xml index 3cfc1ce1658..54940d6eaf5 100644 --- a/appserver/tests/embedded/maven-plugin/websockets/pom.xml +++ b/appserver/tests/embedded/maven-plugin/websockets/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded maven-plugin - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.embedded.maven-plugin websockets diff --git a/appserver/tests/embedded/mysql/pom.xml b/appserver/tests/embedded/mysql/pom.xml index 13cb24459af..5265a1d2a49 100644 --- a/appserver/tests/embedded/mysql/pom.xml +++ b/appserver/tests/embedded/mysql/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded mysql - 6.2.6 + 6.2.6-SNAPSHOT war Simple web application which uses mysql as database @@ -65,7 +65,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.6 + 6.2.6-SNAPSHOT mysql diff --git a/appserver/tests/embedded/pom.xml b/appserver/tests/embedded/pom.xml index c43365f19a4..2a6ee4d26e3 100755 --- a/appserver/tests/embedded/pom.xml +++ b/appserver/tests/embedded/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests embedded - 6.2.6 + 6.2.6-SNAPSHOT pom GlassFish Embedded Tests diff --git a/appserver/tests/embedded/scatteredarchive/pom.xml b/appserver/tests/embedded/scatteredarchive/pom.xml index 31acf9e6efd..8c034190c18 100644 --- a/appserver/tests/embedded/scatteredarchive/pom.xml +++ b/appserver/tests/embedded/scatteredarchive/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic scatteredarchive - 6.2.6 + 6.2.6-SNAPSHOT Scattered Archive Test scatteredarchive @@ -57,7 +57,7 @@ org.glassfish.main.extras glassfish-embedded-all - 6.2.6 + 6.2.6-SNAPSHOT diff --git a/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml b/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml index 07fb8219662..6d0c28087f6 100644 --- a/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml +++ b/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.embedded.basic servlet_runs_admin_cmds - 6.2.6 + 6.2.6-SNAPSHOT Servlet Running Admin Commands using org.glassfish.embeddable.CommandRunner war diff --git a/appserver/tests/embedded/static/ejb/pom.xml b/appserver/tests/embedded/static/ejb/pom.xml index 101d4f0b9c1..73cd96c376b 100755 --- a/appserver/tests/embedded/static/ejb/pom.xml +++ b/appserver/tests/embedded/static/ejb/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded static - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml org.glassfish.tests.embedded.static diff --git a/appserver/tests/embedded/static/ejb/simple/pom.xml b/appserver/tests/embedded/static/ejb/simple/pom.xml index d6e0841da89..c94d94e4ab2 100644 --- a/appserver/tests/embedded/static/ejb/simple/pom.xml +++ b/appserver/tests/embedded/static/ejb/simple/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.embedded.static ejb - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml 4.0.0 @@ -44,7 +44,7 @@ org.glassfish.extras glassfish-embedded-web - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/embedded/static/pom.xml b/appserver/tests/embedded/static/pom.xml index 90192b93f51..fc7065ab2a1 100755 --- a/appserver/tests/embedded/static/pom.xml +++ b/appserver/tests/embedded/static/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml org.glassfish.tests.embedded diff --git a/appserver/tests/embedded/static/web/pom.xml b/appserver/tests/embedded/static/web/pom.xml index e389d644f60..6d6503b36fe 100755 --- a/appserver/tests/embedded/static/web/pom.xml +++ b/appserver/tests/embedded/static/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT 4.0.0 diff --git a/appserver/tests/embedded/utils/pom.xml b/appserver/tests/embedded/utils/pom.xml index e44527724d7..9ebc14fc813 100644 --- a/appserver/tests/embedded/utils/pom.xml +++ b/appserver/tests/embedded/utils/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.embedded @@ -33,7 +33,7 @@ org.glassfish.main.extras glassfish-embedded-shell - 6.2.6 + 6.2.6-SNAPSHOT junit diff --git a/appserver/tests/embedded/web/autodelete/pom.xml b/appserver/tests/embedded/web/autodelete/pom.xml index 4d4eeac9cf0..28af6eed154 100644 --- a/appserver/tests/embedded/web/autodelete/pom.xml +++ b/appserver/tests/embedded/web/autodelete/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded web - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/tests/embedded/web/pom.xml b/appserver/tests/embedded/web/pom.xml index ba3e167d92f..dd54eded23e 100755 --- a/appserver/tests/embedded/web/pom.xml +++ b/appserver/tests/embedded/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded web pom - 6.2.6 + 6.2.6-SNAPSHOT GlassFish Web Embedded Tests web-api diff --git a/appserver/tests/embedded/web/servlet/pom.xml b/appserver/tests/embedded/web/servlet/pom.xml index c39a7f33388..2f450961568 100644 --- a/appserver/tests/embedded/web/servlet/pom.xml +++ b/appserver/tests/embedded/web/servlet/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.embedded web - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/appserver/tests/embedded/web/web-all/pom.xml b/appserver/tests/embedded/web/web-all/pom.xml index 3110969322d..26d061ce361 100644 --- a/appserver/tests/embedded/web/web-all/pom.xml +++ b/appserver/tests/embedded/web/web-all/pom.xml @@ -28,13 +28,13 @@ - + 4.0.0 org.glassfish.tests web-all-embedded-test - 6.2.6 + 6.2.6-SNAPSHOT Test for glassfish-embedded-web @@ -118,7 +118,7 @@ org.glassfish.extras glassfish-embedded-all - 6.2.6 + 6.2.6-SNAPSHOT diff --git a/appserver/tests/embedded/web/web-api/pom.xml b/appserver/tests/embedded/web/web-api/pom.xml index 66e5af3e1ba..1bae4ac5e7c 100755 --- a/appserver/tests/embedded/web/web-api/pom.xml +++ b/appserver/tests/embedded/web/web-api/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tests.embedded web-api-embedded-test war - 6.2.6 + 6.2.6-SNAPSHOT Test for glassfish-embedded-web @@ -72,7 +72,7 @@ org.glassfish.main.extras glassfish-embedded-web - 6.2.6 + 6.2.6-SNAPSHOT junit diff --git a/appserver/tests/embedded/web/web-war/pom.xml b/appserver/tests/embedded/web/web-war/pom.xml index 3f3a66d6c6f..e06f3d77fa6 100644 --- a/appserver/tests/embedded/web/web-war/pom.xml +++ b/appserver/tests/embedded/web/web-war/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/test/pom.xml b/appserver/tests/embedded/web/web-war/test/pom.xml index a10a5737a8b..3226144a978 100644 --- a/appserver/tests/embedded/web/web-war/test/pom.xml +++ b/appserver/tests/embedded/web/web-war/test/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml @@ -139,7 +139,7 @@ org.glassfish.transaction jta - 6.2.6 + 6.2.6-SNAPSHOT test diff --git a/appserver/tests/embedded/web/web-war/war/pom.xml b/appserver/tests/embedded/web/web-war/war/pom.xml index 92a4434163a..0d695ad4093 100644 --- a/appserver/tests/embedded/web/web-war/war/pom.xml +++ b/appserver/tests/embedded/web/web-war/war/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml b/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml index 1050ac68131..aafb5f275a0 100644 --- a/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml +++ b/appserver/tests/embedded/web/web-war/web-fragment1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml b/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml index 226b4494259..d1f3fd52414 100644 --- a/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml +++ b/appserver/tests/embedded/web/web-war/web-fragment2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml b/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml index 7f596b9d7c0..08a1f765b68 100644 --- a/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml +++ b/appserver/tests/embedded/web/web-war/web-fragment3/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests embedded-web-war - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/tests/embedded/wrapper/pom.xml b/appserver/tests/embedded/wrapper/pom.xml index 3b42cf05c9f..5f26ede3cdb 100644 --- a/appserver/tests/embedded/wrapper/pom.xml +++ b/appserver/tests/embedded/wrapper/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.test test-wrapper - 6.2.6 + 6.2.6-SNAPSHOT Embedded GlassFish Wrapper diff --git a/appserver/tests/hk2/cdi/basic/ejb1/pom.xml b/appserver/tests/hk2/cdi/basic/ejb1/pom.xml index d0987298415..6332b95ce87 100644 --- a/appserver/tests/hk2/cdi/basic/ejb1/pom.xml +++ b/appserver/tests/hk2/cdi/basic/ejb1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi basic - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi.basic diff --git a/appserver/tests/hk2/cdi/basic/pom.xml b/appserver/tests/hk2/cdi/basic/pom.xml index a46d36f72f1..f6b36c4be74 100755 --- a/appserver/tests/hk2/cdi/basic/pom.xml +++ b/appserver/tests/hk2/cdi/basic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2 cdi - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi diff --git a/appserver/tests/hk2/cdi/basic/runner/pom.xml b/appserver/tests/hk2/cdi/basic/runner/pom.xml index c6ccf60cc4c..7ea125298f9 100644 --- a/appserver/tests/hk2/cdi/basic/runner/pom.xml +++ b/appserver/tests/hk2/cdi/basic/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi basic - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi.basic diff --git a/appserver/tests/hk2/cdi/ear/app/pom.xml b/appserver/tests/hk2/cdi/ear/app/pom.xml index 00a23f64f46..3c98636cf78 100644 --- a/appserver/tests/hk2/cdi/ear/app/pom.xml +++ b/appserver/tests/hk2/cdi/ear/app/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/ejb1/pom.xml b/appserver/tests/hk2/cdi/ear/ejb1/pom.xml index 011952ef6c8..033275a6543 100644 --- a/appserver/tests/hk2/cdi/ear/ejb1/pom.xml +++ b/appserver/tests/hk2/cdi/ear/ejb1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/ejb2/pom.xml b/appserver/tests/hk2/cdi/ear/ejb2/pom.xml index 4f80bafa067..3c573e5c772 100644 --- a/appserver/tests/hk2/cdi/ear/ejb2/pom.xml +++ b/appserver/tests/hk2/cdi/ear/ejb2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/lib1/pom.xml b/appserver/tests/hk2/cdi/ear/lib1/pom.xml index 49325bc71a1..1d0490a741e 100644 --- a/appserver/tests/hk2/cdi/ear/lib1/pom.xml +++ b/appserver/tests/hk2/cdi/ear/lib1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/pom.xml b/appserver/tests/hk2/cdi/ear/pom.xml index 7db32bac331..cb92aebf0b7 100755 --- a/appserver/tests/hk2/cdi/ear/pom.xml +++ b/appserver/tests/hk2/cdi/ear/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2 cdi - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi diff --git a/appserver/tests/hk2/cdi/ear/runner/pom.xml b/appserver/tests/hk2/cdi/ear/runner/pom.xml index 13209fea94a..4ab71032b43 100644 --- a/appserver/tests/hk2/cdi/ear/runner/pom.xml +++ b/appserver/tests/hk2/cdi/ear/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/war1/pom.xml b/appserver/tests/hk2/cdi/ear/war1/pom.xml index d5c896670e8..a744fc6a307 100644 --- a/appserver/tests/hk2/cdi/ear/war1/pom.xml +++ b/appserver/tests/hk2/cdi/ear/war1/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/ear/war2/pom.xml b/appserver/tests/hk2/cdi/ear/war2/pom.xml index a53ef1423ad..3bc9daacde1 100644 --- a/appserver/tests/hk2/cdi/ear/war2/pom.xml +++ b/appserver/tests/hk2/cdi/ear/war2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi ear - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi.ear diff --git a/appserver/tests/hk2/cdi/jersey/pom.xml b/appserver/tests/hk2/cdi/jersey/pom.xml index 7748d3ea1ad..a0cb9856fa3 100755 --- a/appserver/tests/hk2/cdi/jersey/pom.xml +++ b/appserver/tests/hk2/cdi/jersey/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2 cdi - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi diff --git a/appserver/tests/hk2/cdi/jersey/runner/pom.xml b/appserver/tests/hk2/cdi/jersey/runner/pom.xml index 19b434f9f48..163bd366564 100644 --- a/appserver/tests/hk2/cdi/jersey/runner/pom.xml +++ b/appserver/tests/hk2/cdi/jersey/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests.hk2.cdi jersey - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi.jersey diff --git a/appserver/tests/hk2/cdi/jersey/war/pom.xml b/appserver/tests/hk2/cdi/jersey/war/pom.xml index 93c78b4475e..c43ea064722 100644 --- a/appserver/tests/hk2/cdi/jersey/war/pom.xml +++ b/appserver/tests/hk2/cdi/jersey/war/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tests.hk2.cdi jersey - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2.cdi.jersey diff --git a/appserver/tests/hk2/cdi/pom.xml b/appserver/tests/hk2/cdi/pom.xml index 29f6daacaa3..1f4aaef937b 100755 --- a/appserver/tests/hk2/cdi/pom.xml +++ b/appserver/tests/hk2/cdi/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tests hk2 - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests.hk2 diff --git a/appserver/tests/hk2/isolation/pom.xml b/appserver/tests/hk2/isolation/pom.xml index 4ac77491321..cc29cd8eb1b 100755 --- a/appserver/tests/hk2/isolation/pom.xml +++ b/appserver/tests/hk2/isolation/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests hk2 - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.hk2 isolation pom - 6.2.6 + 6.2.6-SNAPSHOT GlassFish HK2 Isolation Tests diff --git a/appserver/tests/hk2/isolation/runner/pom.xml b/appserver/tests/hk2/isolation/runner/pom.xml index f8aa8b96026..a3a30734093 100755 --- a/appserver/tests/hk2/isolation/runner/pom.xml +++ b/appserver/tests/hk2/isolation/runner/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.hk2 isolation - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.hk2.isolation runner jar - 6.2.6 + 6.2.6-SNAPSHOT GlassFish HK2 Isolation Test Runner diff --git a/appserver/tests/hk2/isolation/web/iso1/pom.xml b/appserver/tests/hk2/isolation/web/iso1/pom.xml index c76c7ce9380..e5cf6cf555f 100644 --- a/appserver/tests/hk2/isolation/web/iso1/pom.xml +++ b/appserver/tests/hk2/isolation/web/iso1/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.hk2.isolation web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.hk2.isolation.web iso1 - 6.2.6 + 6.2.6-SNAPSHOT war Isolation servlet one diff --git a/appserver/tests/hk2/isolation/web/iso2/pom.xml b/appserver/tests/hk2/isolation/web/iso2/pom.xml index 9634cc9fa90..0526b34a553 100644 --- a/appserver/tests/hk2/isolation/web/iso2/pom.xml +++ b/appserver/tests/hk2/isolation/web/iso2/pom.xml @@ -23,13 +23,13 @@ org.glassfish.tests.hk2.isolation web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.hk2.isolation.web iso2 - 6.2.6 + 6.2.6-SNAPSHOT war Isolation servlet two diff --git a/appserver/tests/hk2/isolation/web/pom.xml b/appserver/tests/hk2/isolation/web/pom.xml index e03da756b89..f99bf082dd4 100755 --- a/appserver/tests/hk2/isolation/web/pom.xml +++ b/appserver/tests/hk2/isolation/web/pom.xml @@ -23,14 +23,14 @@ org.glassfish.tests.hk2 isolation - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml org.glassfish.tests.hk2.isolation web pom - 6.2.6 + 6.2.6-SNAPSHOT GlassFish HK2 Isolation WebApps diff --git a/appserver/tests/hk2/pom.xml b/appserver/tests/hk2/pom.xml index 213f264aaab..8cda20d4490 100755 --- a/appserver/tests/hk2/pom.xml +++ b/appserver/tests/hk2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests tests - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests diff --git a/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml b/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml index d2635421f22..148995cec10 100644 --- a/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml +++ b/appserver/tests/paas/appscoped-db-with-resources-xml/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas appscoped-db-with-resources-xml - 6.2.6 + 6.2.6-SNAPSHOT Appscoped DB Service with glassfish-resources.xml sample war diff --git a/appserver/tests/paas/basic-bookstore-dns/pom.xml b/appserver/tests/paas/basic-bookstore-dns/pom.xml index 1888274b08e..52df3c0a993 100644 --- a/appserver/tests/paas/basic-bookstore-dns/pom.xml +++ b/appserver/tests/paas/basic-bookstore-dns/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-bookstore-dns - 6.2.6 + 6.2.6-SNAPSHOT Basic Bookstore DNS sample war diff --git a/appserver/tests/paas/basic-db-initsql/pom.xml b/appserver/tests/paas/basic-db-initsql/pom.xml index bbbd5f7cb39..28d98b84b80 100644 --- a/appserver/tests/paas/basic-db-initsql/pom.xml +++ b/appserver/tests/paas/basic-db-initsql/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db-initsql - 6.2.6 + 6.2.6-SNAPSHOT Basic InitSQL PaaS sample war diff --git a/appserver/tests/paas/basic-db-teardown-sql/pom.xml b/appserver/tests/paas/basic-db-teardown-sql/pom.xml index aaa77adbdf8..fec7f28363e 100644 --- a/appserver/tests/paas/basic-db-teardown-sql/pom.xml +++ b/appserver/tests/paas/basic-db-teardown-sql/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db-teardown-sql - 6.2.6 + 6.2.6-SNAPSHOT Basic DB Tear down SQL PaaS sample war diff --git a/appserver/tests/paas/basic-db-with-resources-xml/pom.xml b/appserver/tests/paas/basic-db-with-resources-xml/pom.xml index b84d4e026b4..be1b443b849 100644 --- a/appserver/tests/paas/basic-db-with-resources-xml/pom.xml +++ b/appserver/tests/paas/basic-db-with-resources-xml/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db-with-resources-xml - 6.2.6 + 6.2.6-SNAPSHOT Basic DB with glassfish-resources.xml sample war diff --git a/appserver/tests/paas/basic-db/pom.xml b/appserver/tests/paas/basic-db/pom.xml index f221d03d4f0..3bf9b18947d 100644 --- a/appserver/tests/paas/basic-db/pom.xml +++ b/appserver/tests/paas/basic-db/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-db - 6.2.6 + 6.2.6-SNAPSHOT Basic PaaS sample war diff --git a/appserver/tests/paas/basic-jpa/pom.xml b/appserver/tests/paas/basic-jpa/pom.xml index fa3b14f3f69..728489397df 100644 --- a/appserver/tests/paas/basic-jpa/pom.xml +++ b/appserver/tests/paas/basic-jpa/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-jpa - 6.2.6 + 6.2.6-SNAPSHOT Basic JPA PaaS sample war diff --git a/appserver/tests/paas/basic-service-discovery/pom.xml b/appserver/tests/paas/basic-service-discovery/pom.xml index b5912e1c4f9..7e9226e760e 100644 --- a/appserver/tests/paas/basic-service-discovery/pom.xml +++ b/appserver/tests/paas/basic-service-discovery/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-sd - 6.2.6 + 6.2.6-SNAPSHOT Basic Service Discovery PaaS sample war diff --git a/appserver/tests/paas/basic-shared-service-test/pom.xml b/appserver/tests/paas/basic-shared-service-test/pom.xml index 9b2c4d84cb6..aca6e93f364 100644 --- a/appserver/tests/paas/basic-shared-service-test/pom.xml +++ b/appserver/tests/paas/basic-shared-service-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-shared-service-test - 6.2.6 + 6.2.6-SNAPSHOT Basic Shared Sevice Test war diff --git a/appserver/tests/paas/basic/pom.xml b/appserver/tests/paas/basic/pom.xml index 323280817ae..42fc7d3c0f4 100644 --- a/appserver/tests/paas/basic/pom.xml +++ b/appserver/tests/paas/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic - 6.2.6 + 6.2.6-SNAPSHOT Basic PaaS sample war diff --git a/appserver/tests/paas/bookstore/pom.xml b/appserver/tests/paas/bookstore/pom.xml index 756438b1361..77efd73aafe 100644 --- a/appserver/tests/paas/bookstore/pom.xml +++ b/appserver/tests/paas/bookstore/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas bookstore - 6.2.6 + 6.2.6-SNAPSHOT Bookstore PaaS sample war diff --git a/appserver/tests/paas/deployment-rollback/pom.xml b/appserver/tests/paas/deployment-rollback/pom.xml index c2ab5b985de..3a20a9c689d 100644 --- a/appserver/tests/paas/deployment-rollback/pom.xml +++ b/appserver/tests/paas/deployment-rollback/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas rollback-test - 6.2.6 + 6.2.6-SNAPSHOT Deployment Rollback Test war diff --git a/appserver/tests/paas/enable-disable-test/pom.xml b/appserver/tests/paas/enable-disable-test/pom.xml index 6148ac9daba..e059bac9759 100644 --- a/appserver/tests/paas/enable-disable-test/pom.xml +++ b/appserver/tests/paas/enable-disable-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas enable-disable-test - 6.2.6 + 6.2.6-SNAPSHOT Enable Disable Test war diff --git a/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml b/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml index 4fa168e848f..4f0d37c9c58 100644 --- a/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml +++ b/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas ext-shared-service-enable-disable-test - 6.2.6 + 6.2.6-SNAPSHOT Enable Disable External and Shared Service Test war diff --git a/appserver/tests/paas/external-and-shared-service/pom.xml b/appserver/tests/paas/external-and-shared-service/pom.xml index 6906312fd8c..4cee3d4b4ec 100644 --- a/appserver/tests/paas/external-and-shared-service/pom.xml +++ b/appserver/tests/paas/external-and-shared-service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas external-and-shared-service-test - 6.2.6 + 6.2.6-SNAPSHOT External and Shared Service Test war diff --git a/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml b/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml index 2bae373d00a..c76893e7848 100644 --- a/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml +++ b/appserver/tests/paas/external-db-service/generatederbyvm/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main paas.plugins - 6.2.6 + 6.2.6-SNAPSHOT 4.0.0 generatederbyvm diff --git a/appserver/tests/paas/external-db-service/pom.xml b/appserver/tests/paas/external-db-service/pom.xml index 3c6a5cf353d..1b6acba83ee 100644 --- a/appserver/tests/paas/external-db-service/pom.xml +++ b/appserver/tests/paas/external-db-service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas external-service-test - 6.2.6 + 6.2.6-SNAPSHOT External DB Service TesT pom diff --git a/appserver/tests/paas/external-db-service/test/pom.xml b/appserver/tests/paas/external-db-service/test/pom.xml index bd656bbc1ef..be9068dda51 100644 --- a/appserver/tests/paas/external-db-service/test/pom.xml +++ b/appserver/tests/paas/external-db-service/test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas external-db-service-test - 6.2.6 + 6.2.6-SNAPSHOT External DB Service PaaS application war diff --git a/appserver/tests/paas/helloworld/pom.xml b/appserver/tests/paas/helloworld/pom.xml index d401dd315b9..e7dd2de4ea7 100644 --- a/appserver/tests/paas/helloworld/pom.xml +++ b/appserver/tests/paas/helloworld/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas helloworld - 6.2.6 + 6.2.6-SNAPSHOT PaaS Hello World sample war diff --git a/appserver/tests/paas/javaee_shared_service/pom.xml b/appserver/tests/paas/javaee_shared_service/pom.xml index bb0cc70f705..b933498cd22 100644 --- a/appserver/tests/paas/javaee_shared_service/pom.xml +++ b/appserver/tests/paas/javaee_shared_service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas bookstore2 - 6.2.6 + 6.2.6-SNAPSHOT Bookstore PaaS sample running on Java EE (GlassFish) shared service. war diff --git a/appserver/tests/paas/lazy-shared-service-test/pom.xml b/appserver/tests/paas/lazy-shared-service-test/pom.xml index 6d4068da210..c29c52db270 100644 --- a/appserver/tests/paas/lazy-shared-service-test/pom.xml +++ b/appserver/tests/paas/lazy-shared-service-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas lazy-shared-service-test - 6.2.6 + 6.2.6-SNAPSHOT Lazy Shared Service PaaS sample war diff --git a/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml b/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml index 99faa57affb..672050247eb 100644 --- a/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml +++ b/appserver/tests/paas/mq-shared-service-test/mq-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas mq-test - 6.2.6 + 6.2.6-SNAPSHOT MQ Shared Service Test jar diff --git a/appserver/tests/paas/mq-shared-service-test/pom.xml b/appserver/tests/paas/mq-shared-service-test/pom.xml index 02829c74ed7..665e82bbba6 100644 --- a/appserver/tests/paas/mq-shared-service-test/pom.xml +++ b/appserver/tests/paas/mq-shared-service-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas mq-shared-service-test - 6.2.6 + 6.2.6-SNAPSHOT MQ Shared Service TesT pom diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml b/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml index b011b668c95..3ccfba12cb8 100644 --- a/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml +++ b/appserver/tests/paas/multiple-db-app-scoped-services/advanced/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-app-scoped-service-test-advanced - 6.2.6 + 6.2.6-SNAPSHOT Multiple Application Scoped Database Services Advanced PaaS Application war diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml b/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml index 3bf036b5028..b22ab19a187 100644 --- a/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml +++ b/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-app-scoped-service-test-basic - 6.2.6 + 6.2.6-SNAPSHOT Multiple Application Scoped Database Services Basic PaaS Application war diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml b/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml index dbf588bb0cc..31998fb24c7 100644 --- a/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml +++ b/appserver/tests/paas/multiple-db-app-scoped-services/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-db-app-scoped-services - 6.2.6 + 6.2.6-SNAPSHOT Multiple DB App Scoped Services pom diff --git a/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml b/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml index 00a6cc2f248..a6d34a1164c 100644 --- a/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml +++ b/appserver/tests/paas/multiple-db-shared-services/advanced/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-shared-db-service-test - 6.2.6 + 6.2.6-SNAPSHOT Multiple Shared DB service PaaS application war diff --git a/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml b/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml index ca7e8a56c59..bde112fbdbc 100644 --- a/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml +++ b/appserver/tests/paas/multiple-db-shared-services/basic/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-shared-db-service-test-basic - 6.2.6 + 6.2.6-SNAPSHOT Multiple Shared DB service Basic PaaS application war diff --git a/appserver/tests/paas/multiple-db-shared-services/pom.xml b/appserver/tests/paas/multiple-db-shared-services/pom.xml index e3a9136b2b0..c1218c6b36a 100644 --- a/appserver/tests/paas/multiple-db-shared-services/pom.xml +++ b/appserver/tests/paas/multiple-db-shared-services/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-db-shared-services - 6.2.6 + 6.2.6-SNAPSHOT Multiple DB Shared Services pom diff --git a/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml b/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml index b0afa89dc76..83bcaab5e07 100644 --- a/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml +++ b/appserver/tests/paas/multiple-spe-test/mydb-plugin/pom.xml @@ -22,13 +22,13 @@ org.glassfish paas.plugins - 6.2.6 + 6.2.6-SNAPSHOT 4.0.0 org.glassfish paas.mydbplugin - 6.2.6 + 6.2.6-SNAPSHOT MyDB Plugin diff --git a/appserver/tests/paas/multiple-spe-test/pom.xml b/appserver/tests/paas/multiple-spe-test/pom.xml index 57baffeeb14..3d8a4c532f0 100644 --- a/appserver/tests/paas/multiple-spe-test/pom.xml +++ b/appserver/tests/paas/multiple-spe-test/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas multiple-spe-test - 6.2.6 + 6.2.6-SNAPSHOT Multiple SPE TesT pom diff --git a/appserver/tests/paas/multiple-spe-test/spetest/pom.xml b/appserver/tests/paas/multiple-spe-test/spetest/pom.xml index 11424c1806c..9ec98441c57 100644 --- a/appserver/tests/paas/multiple-spe-test/spetest/pom.xml +++ b/appserver/tests/paas/multiple-spe-test/spetest/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas basic-spe-test - 6.2.6 + 6.2.6-SNAPSHOT Basic SPE Test war diff --git a/appserver/tests/paas/pom.xml b/appserver/tests/paas/pom.xml index 8b5199f9777..99fdbafeaf5 100644 --- a/appserver/tests/paas/pom.xml +++ b/appserver/tests/paas/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests paas - 6.2.6 + 6.2.6-SNAPSHOT PaaS samples pom diff --git a/appserver/tests/paas/scale_service/pom.xml b/appserver/tests/paas/scale_service/pom.xml index d8ba032969f..971b8e7c56a 100644 --- a/appserver/tests/paas/scale_service/pom.xml +++ b/appserver/tests/paas/scale_service/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas scale_service - 6.2.6 + 6.2.6-SNAPSHOT Scale Service PaaS sample war diff --git a/appserver/tests/paas/service_metadata/custom_db_name/pom.xml b/appserver/tests/paas/service_metadata/custom_db_name/pom.xml index 1c88ff5cd35..0518b9e37ca 100644 --- a/appserver/tests/paas/service_metadata/custom_db_name/pom.xml +++ b/appserver/tests/paas/service_metadata/custom_db_name/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas custom_db_name - 6.2.6 + 6.2.6-SNAPSHOT Custom DB Name PaaS sample war diff --git a/appserver/tests/paas/service_metadata/pom.xml b/appserver/tests/paas/service_metadata/pom.xml index f8de3c289ca..0c274be1a4b 100644 --- a/appserver/tests/paas/service_metadata/pom.xml +++ b/appserver/tests/paas/service_metadata/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas service_metadata - 6.2.6 + 6.2.6-SNAPSHOT Service Metadata PaaS samples pom diff --git a/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml b/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml index 5257c0d0450..81bd2a66822 100644 --- a/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml +++ b/appserver/tests/paas/service_metadata/provision_using_specified_template/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.glassfish.tests.paas service_metadata.provision_using_specified_template - 6.2.6 + 6.2.6-SNAPSHOT Provision service(s) using specified template war diff --git a/appserver/tests/pom.xml b/appserver/tests/pom.xml index 3e0304fe2ad..5f723b07087 100755 --- a/appserver/tests/pom.xml +++ b/appserver/tests/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.tests diff --git a/appserver/tests/quicklook/admin/pom.xml b/appserver/tests/quicklook/admin/pom.xml index 87c7b06d033..98746f28151 100644 --- a/appserver/tests/quicklook/admin/pom.xml +++ b/appserver/tests/quicklook/admin/pom.xml @@ -26,7 +26,7 @@ org.glassfish.quicklook quicklook - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml Runs the tests on admin/asadmin code diff --git a/appserver/tests/quicklook/adminconsole/pom.xml b/appserver/tests/quicklook/adminconsole/pom.xml index afc19623be5..6411e5639a4 100644 --- a/appserver/tests/quicklook/adminconsole/pom.xml +++ b/appserver/tests/quicklook/adminconsole/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.quicklook adminconsole - 6.2.6 + 6.2.6-SNAPSHOT Admin Console Quicklook Tests jar @@ -101,7 +101,7 @@ org.glassfish.common amx-core - 6.2.6 + 6.2.6-SNAPSHOT diff --git a/appserver/tests/quicklook/amx/pom.xml b/appserver/tests/quicklook/amx/pom.xml index ecea889e9bc..0de7895914e 100644 --- a/appserver/tests/quicklook/amx/pom.xml +++ b/appserver/tests/quicklook/amx/pom.xml @@ -26,7 +26,7 @@ org.glassfish.quicklook quicklook - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml Runs the tests on admin/asadmin code diff --git a/appserver/tests/quicklook/ejb/cmp/pom.xml b/appserver/tests/quicklook/ejb/cmp/pom.xml index 69e4ff32a21..8f5774effa6 100644 --- a/appserver/tests/quicklook/ejb/cmp/pom.xml +++ b/appserver/tests/quicklook/ejb/cmp/pom.xml @@ -28,7 +28,7 @@ cmp_quicklook CMP Roster App Quicklook jar - 6.2.6 + 6.2.6-SNAPSHOT This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/embedded/pom.xml b/appserver/tests/quicklook/ejb/embedded/pom.xml index 85ef3fb9e34..dec6cf15ed9 100644 --- a/appserver/tests/quicklook/ejb/embedded/pom.xml +++ b/appserver/tests/quicklook/ejb/embedded/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.6 + 6.2.6-SNAPSHOT This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/remoteview/pom.xml b/appserver/tests/quicklook/ejb/remoteview/pom.xml index 85ef3fb9e34..dec6cf15ed9 100644 --- a/appserver/tests/quicklook/ejb/remoteview/pom.xml +++ b/appserver/tests/quicklook/ejb/remoteview/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.6 + 6.2.6-SNAPSHOT This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/sfulnoi/pom.xml b/appserver/tests/quicklook/ejb/sfulnoi/pom.xml index 85ef3fb9e34..dec6cf15ed9 100644 --- a/appserver/tests/quicklook/ejb/sfulnoi/pom.xml +++ b/appserver/tests/quicklook/ejb/sfulnoi/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.6 + 6.2.6-SNAPSHOT This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/singleton/pom.xml b/appserver/tests/quicklook/ejb/singleton/pom.xml index 85ef3fb9e34..dec6cf15ed9 100644 --- a/appserver/tests/quicklook/ejb/singleton/pom.xml +++ b/appserver/tests/quicklook/ejb/singleton/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.6 + 6.2.6-SNAPSHOT This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml b/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml index 85ef3fb9e34..dec6cf15ed9 100644 --- a/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml +++ b/appserver/tests/quicklook/ejb/slsbnicmt/pom.xml @@ -28,7 +28,7 @@ ejb_quicklook Glassfish JRuby Quicklook jar - 6.2.6 + 6.2.6-SNAPSHOT This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/jms/injection/pom.xml b/appserver/tests/quicklook/jms/injection/pom.xml index 93cbbf0324d..69c4620ea22 100644 --- a/appserver/tests/quicklook/jms/injection/pom.xml +++ b/appserver/tests/quicklook/jms/injection/pom.xml @@ -28,7 +28,7 @@ injection_quicklook Glassfish JMS Injection Quicklook jar - 6.2.6 + 6.2.6-SNAPSHOT This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/pom.xml b/appserver/tests/quicklook/pom.xml index b45f53a87c0..95189c36284 100644 --- a/appserver/tests/quicklook/pom.xml +++ b/appserver/tests/quicklook/pom.xml @@ -29,7 +29,7 @@ quicklook Glassfish Quicklook Bundle jar - 6.2.6 + 6.2.6-SNAPSHOT This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/rest/pom.xml b/appserver/tests/quicklook/rest/pom.xml index 8da6f03af35..8c97641c5d6 100644 --- a/appserver/tests/quicklook/rest/pom.xml +++ b/appserver/tests/quicklook/rest/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.glassfish.quicklook rest - 6.2.6 + 6.2.6-SNAPSHOT REST API Quicklook Tests jar diff --git a/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml b/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml index 88e1798f71e..6acb3f23c36 100644 --- a/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml +++ b/appserver/tests/quicklook/wsit/JaxwsFromWsdl/pom.xml @@ -28,7 +28,7 @@ wsit_quicklook Glassfish Web Services Quicklook jar - 6.2.6 + 6.2.6-SNAPSHOT This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/quicklook/wsit/jsr109tester/pom.xml b/appserver/tests/quicklook/wsit/jsr109tester/pom.xml index 12f7a3e2516..55d48556ef2 100644 --- a/appserver/tests/quicklook/wsit/jsr109tester/pom.xml +++ b/appserver/tests/quicklook/wsit/jsr109tester/pom.xml @@ -29,7 +29,7 @@ wsit_quicklook Glassfish Web Services Quicklook jar - 6.2.6 + 6.2.6-SNAPSHOT This pom describes how to run QuickLook tests on the Glassfish Bundle diff --git a/appserver/tests/sse/basic/pom.xml b/appserver/tests/sse/basic/pom.xml index 43b6fd68b18..c12c6f289ce 100644 --- a/appserver/tests/sse/basic/pom.xml +++ b/appserver/tests/sse/basic/pom.xml @@ -37,7 +37,7 @@ org.glassfish.main.web web-sse - 6.2.6 + 6.2.6-SNAPSHOT provided diff --git a/appserver/tests/sse/videoplayer/pom.xml b/appserver/tests/sse/videoplayer/pom.xml index 98bae196c41..9b322599771 100644 --- a/appserver/tests/sse/videoplayer/pom.xml +++ b/appserver/tests/sse/videoplayer/pom.xml @@ -37,7 +37,7 @@ org.glassfish.main.web web-sse - 6.2.6 + 6.2.6-SNAPSHOT provided diff --git a/appserver/tests/tck/authentication/pom.xml b/appserver/tests/tck/authentication/pom.xml index 421cec147db..445ad8c5d9b 100644 --- a/appserver/tests/tck/authentication/pom.xml +++ b/appserver/tests/tck/authentication/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.6 + 6.2.6-SNAPSHOT glassfish-external-tck-authentication diff --git a/appserver/tests/tck/authorization/pom.xml b/appserver/tests/tck/authorization/pom.xml index 5b16e508456..30dc819ed30 100644 --- a/appserver/tests/tck/authorization/pom.xml +++ b/appserver/tests/tck/authorization/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.6 + 6.2.6-SNAPSHOT glassfish-external-tck-authorization diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml index 875c5c13669..a7f58877133 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck embedded-ejb-smoke - 6.2.6 + 6.2.6-SNAPSHOT ejb-lite-basic diff --git a/appserver/tests/tck/embedded_ejb_smoke/pom.xml b/appserver/tests/tck/embedded_ejb_smoke/pom.xml index d293acd3d1f..7492b7b72a5 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/pom.xml +++ b/appserver/tests/tck/embedded_ejb_smoke/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.6 + 6.2.6-SNAPSHOT embedded-ejb-smoke diff --git a/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml b/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml index 4f270ff1327..5ef50e98b21 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml +++ b/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck embedded-ejb-smoke - 6.2.6 + 6.2.6-SNAPSHOT embedded-ejb-smoke-runner diff --git a/appserver/tests/tck/faces/pom.xml b/appserver/tests/tck/faces/pom.xml index bf77b15abe5..00fc6194d7f 100644 --- a/appserver/tests/tck/faces/pom.xml +++ b/appserver/tests/tck/faces/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.6 + 6.2.6-SNAPSHOT glassfish-external-tck-faces diff --git a/appserver/tests/tck/pom.xml b/appserver/tests/tck/pom.xml index e807c40f297..9d5c53f7274 100644 --- a/appserver/tests/tck/pom.xml +++ b/appserver/tests/tck/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests tests - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.tests.tck diff --git a/appserver/tests/tck/rest/pom.xml b/appserver/tests/tck/rest/pom.xml index 4f97f34b399..4622e021932 100644 --- a/appserver/tests/tck/rest/pom.xml +++ b/appserver/tests/tck/rest/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.tests.tck tck - 6.2.6 + 6.2.6-SNAPSHOT glassfish-external-tck-rest diff --git a/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml index 3cfe679de99..a9a8cb59c57 100644 --- a/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.6 + 6.2.6-SNAPSHOT jakarta-authentication-tck diff --git a/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml index 0aea32e7c30..e78bcc8b907 100644 --- a/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.6 + 6.2.6-SNAPSHOT jakarta-authorization-tck diff --git a/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml index 865324a6ec0..b5598cbc05e 100644 --- a/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.6 + 6.2.6-SNAPSHOT jakarta-faces-tck diff --git a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml index 94cb3456a08..448dc66e8a6 100644 --- a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml +++ b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.6 + 6.2.6-SNAPSHOT jakarta-rest-tck diff --git a/appserver/tests/tck/tck-download/javatest/pom.xml b/appserver/tests/tck/tck-download/javatest/pom.xml index 909d149d38d..a6acd0213e8 100644 --- a/appserver/tests/tck/tck-download/javatest/pom.xml +++ b/appserver/tests/tck/tck-download/javatest/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.6 + 6.2.6-SNAPSHOT javatest diff --git a/appserver/tests/tck/tck-download/pom.xml b/appserver/tests/tck/tck-download/pom.xml index e75e4dcfe90..aca7fa11243 100644 --- a/appserver/tests/tck/tck-download/pom.xml +++ b/appserver/tests/tck/tck-download/pom.xml @@ -25,7 +25,7 @@ org.glassfish.main.tests.tck tck - 6.2.6 + 6.2.6-SNAPSHOT tck-download diff --git a/appserver/tests/tck/tck-download/tsharness/pom.xml b/appserver/tests/tck/tck-download/tsharness/pom.xml index 159c3d937c5..893da8fdb38 100644 --- a/appserver/tests/tck/tck-download/tsharness/pom.xml +++ b/appserver/tests/tck/tck-download/tsharness/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.tests.tck tck-download - 6.2.6 + 6.2.6-SNAPSHOT tsharness diff --git a/appserver/transaction/internal-api/pom.xml b/appserver/transaction/internal-api/pom.xml index 79042da963f..a256cc8c4a9 100644 --- a/appserver/transaction/internal-api/pom.xml +++ b/appserver/transaction/internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.transaction transaction - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/transaction/jta/pom.xml b/appserver/transaction/jta/pom.xml index 9c9fbcfc903..ec01c19a5e4 100644 --- a/appserver/transaction/jta/pom.xml +++ b/appserver/transaction/jta/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.transaction transaction - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/transaction/jts/pom.xml b/appserver/transaction/jts/pom.xml index 7f2584fdd71..a3d19fb6a7a 100644 --- a/appserver/transaction/jts/pom.xml +++ b/appserver/transaction/jts/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main.transaction transaction - 6.2.6 + 6.2.6-SNAPSHOT jts diff --git a/appserver/transaction/pom.xml b/appserver/transaction/pom.xml index e9192b750f4..c5207eba1ae 100644 --- a/appserver/transaction/pom.xml +++ b/appserver/transaction/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/admin/pom.xml b/appserver/web/admin/pom.xml index f06900f6e5b..dd78a2c11de 100644 --- a/appserver/web/admin/pom.xml +++ b/appserver/web/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/cdi-api-fragment/pom.xml b/appserver/web/cdi-api-fragment/pom.xml index f455c6fb29e..fbd6e98272b 100644 --- a/appserver/web/cdi-api-fragment/pom.xml +++ b/appserver/web/cdi-api-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/gf-web-connector/pom.xml b/appserver/web/gf-web-connector/pom.xml index 646b96a27f5..f3347b7d41b 100755 --- a/appserver/web/gf-web-connector/pom.xml +++ b/appserver/web/gf-web-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/gf-weld-connector/pom.xml b/appserver/web/gf-weld-connector/pom.xml index 126e67f7013..5973d1cc04e 100644 --- a/appserver/web/gf-weld-connector/pom.xml +++ b/appserver/web/gf-weld-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/gui-plugin-common/pom.xml b/appserver/web/gui-plugin-common/pom.xml index 523ff44ef45..ce5f82ca5d5 100755 --- a/appserver/web/gui-plugin-common/pom.xml +++ b/appserver/web/gui-plugin-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/jersey-ejb-component-provider/pom.xml b/appserver/web/jersey-ejb-component-provider/pom.xml index 900c86d6d43..6d6320f04da 100644 --- a/appserver/web/jersey-ejb-component-provider/pom.xml +++ b/appserver/web/jersey-ejb-component-provider/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT jersey-ejb-component-provider diff --git a/appserver/web/jersey-mvc-connector/pom.xml b/appserver/web/jersey-mvc-connector/pom.xml index f1b25403c2b..33e06997bf5 100644 --- a/appserver/web/jersey-mvc-connector/pom.xml +++ b/appserver/web/jersey-mvc-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/jsf-connector/pom.xml b/appserver/web/jsf-connector/pom.xml index 8015177aaad..1f924045dc1 100644 --- a/appserver/web/jsf-connector/pom.xml +++ b/appserver/web/jsf-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/jspcaching-connector/pom.xml b/appserver/web/jspcaching-connector/pom.xml index 27b8bfb95f2..57c4ff55bb4 100644 --- a/appserver/web/jspcaching-connector/pom.xml +++ b/appserver/web/jspcaching-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/jstl-connector/pom.xml b/appserver/web/jstl-connector/pom.xml index 5e38ce06935..ce38a982d40 100644 --- a/appserver/web/jstl-connector/pom.xml +++ b/appserver/web/jstl-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/pom.xml b/appserver/web/pom.xml index fa4474fac2d..b609230d9cf 100755 --- a/appserver/web/pom.xml +++ b/appserver/web/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/war-util/pom.xml b/appserver/web/war-util/pom.xml index 70e872191c3..8f06edd5b27 100755 --- a/appserver/web/war-util/pom.xml +++ b/appserver/web/war-util/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/web-core/pom.xml b/appserver/web/web-core/pom.xml index 2cec6d8802b..f3773d122de 100755 --- a/appserver/web/web-core/pom.xml +++ b/appserver/web/web-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/web-embed/api/pom.xml b/appserver/web/web-embed/api/pom.xml index b06a10a711e..ac5dcf53626 100755 --- a/appserver/web/web-embed/api/pom.xml +++ b/appserver/web/web-embed/api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web-embed - 6.2.6 + 6.2.6-SNAPSHOT web-embed-api diff --git a/appserver/web/web-embed/pom.xml b/appserver/web/web-embed/pom.xml index c0d0577aaea..54b5411f5f2 100755 --- a/appserver/web/web-embed/pom.xml +++ b/appserver/web/web-embed/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/web-glue/pom.xml b/appserver/web/web-glue/pom.xml index f72ce66b9d5..860b2ec6898 100755 --- a/appserver/web/web-glue/pom.xml +++ b/appserver/web/web-glue/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/web-ha/pom.xml b/appserver/web/web-ha/pom.xml index 0b1ea9a7a63..72144217437 100755 --- a/appserver/web/web-ha/pom.xml +++ b/appserver/web/web-ha/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/web-naming/pom.xml b/appserver/web/web-naming/pom.xml index 566943a626d..f6636dc8057 100755 --- a/appserver/web/web-naming/pom.xml +++ b/appserver/web/web-naming/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/web-sse/pom.xml b/appserver/web/web-sse/pom.xml index aed76fda3d1..9609f4b3c0f 100755 --- a/appserver/web/web-sse/pom.xml +++ b/appserver/web/web-sse/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/webtier-all/pom.xml b/appserver/web/webtier-all/pom.xml index c2bcb4a54fa..68a08ebc1ae 100755 --- a/appserver/web/webtier-all/pom.xml +++ b/appserver/web/webtier-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/weld-integration-fragment/pom.xml b/appserver/web/weld-integration-fragment/pom.xml index 1f695604cb2..01b28be22fe 100644 --- a/appserver/web/weld-integration-fragment/pom.xml +++ b/appserver/web/weld-integration-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT weld-integration-fragment diff --git a/appserver/web/weld-integration-test-fragment/pom.xml b/appserver/web/weld-integration-test-fragment/pom.xml index 5c15fb0b1d0..094eecc9ff8 100644 --- a/appserver/web/weld-integration-test-fragment/pom.xml +++ b/appserver/web/weld-integration-test-fragment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml index 8c00bd4af8c..7b58d3ba139 100644 --- a/appserver/web/weld-integration/pom.xml +++ b/appserver/web/weld-integration/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.web web - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/webservices/connector/pom.xml b/appserver/webservices/connector/pom.xml index c15f7f0deaa..9e5e2b69466 100755 --- a/appserver/webservices/connector/pom.xml +++ b/appserver/webservices/connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.6 + 6.2.6-SNAPSHOT webservices-connector diff --git a/appserver/webservices/jsr109-impl/pom.xml b/appserver/webservices/jsr109-impl/pom.xml index 8a9a90f9226..166b4d5a8be 100755 --- a/appserver/webservices/jsr109-impl/pom.xml +++ b/appserver/webservices/jsr109-impl/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.6 + 6.2.6-SNAPSHOT jsr109-impl diff --git a/appserver/webservices/metro-fragments/pom.xml b/appserver/webservices/metro-fragments/pom.xml index 2d8533b39e7..8aa776eabe5 100644 --- a/appserver/webservices/metro-fragments/pom.xml +++ b/appserver/webservices/metro-fragments/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.6 + 6.2.6-SNAPSHOT metro-fragments diff --git a/appserver/webservices/metro-glue/pom.xml b/appserver/webservices/metro-glue/pom.xml index 4bcf8d266f5..5c124c737a6 100644 --- a/appserver/webservices/metro-glue/pom.xml +++ b/appserver/webservices/metro-glue/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/webservices/pom.xml b/appserver/webservices/pom.xml index 91349495b1d..effdaa3654f 100755 --- a/appserver/webservices/pom.xml +++ b/appserver/webservices/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/webservices/soap-tcp/pom.xml b/appserver/webservices/soap-tcp/pom.xml index eb83ebb0c0f..1afefd918f6 100755 --- a/appserver/webservices/soap-tcp/pom.xml +++ b/appserver/webservices/soap-tcp/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/appserver/webservices/webservices-scripts/pom.xml b/appserver/webservices/webservices-scripts/pom.xml index a369ff94790..c1d069de9d2 100644 --- a/appserver/webservices/webservices-scripts/pom.xml +++ b/appserver/webservices/webservices-scripts/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.webservices webservices - 6.2.6 + 6.2.6-SNAPSHOT webservices-scripts diff --git a/docs/add-on-component-development-guide/pom.xml b/docs/add-on-component-development-guide/pom.xml index 08118b90698..95880b69cb3 100644 --- a/docs/add-on-component-development-guide/pom.xml +++ b/docs/add-on-component-development-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/administration-guide/pom.xml b/docs/administration-guide/pom.xml index 39d40345861..2e7409992e1 100644 --- a/docs/administration-guide/pom.xml +++ b/docs/administration-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/application-deployment-guide/pom.xml b/docs/application-deployment-guide/pom.xml index 4389e2c8700..9f3bb4d5ebf 100644 --- a/docs/application-deployment-guide/pom.xml +++ b/docs/application-deployment-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/application-development-guide/pom.xml b/docs/application-development-guide/pom.xml index 191b2f35b63..c60bea62ded 100644 --- a/docs/application-development-guide/pom.xml +++ b/docs/application-development-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/deployment-planning-guide/pom.xml b/docs/deployment-planning-guide/pom.xml index 1cd19ebc529..3c09b11c007 100644 --- a/docs/deployment-planning-guide/pom.xml +++ b/docs/deployment-planning-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/distribution/pom.xml b/docs/distribution/pom.xml index 237fd99327a..a42e34b4451 100644 --- a/docs/distribution/pom.xml +++ b/docs/distribution/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.docs distribution diff --git a/docs/embedded-server-guide/pom.xml b/docs/embedded-server-guide/pom.xml index 50e0e8adb3a..e39a27af35d 100644 --- a/docs/embedded-server-guide/pom.xml +++ b/docs/embedded-server-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/error-messages-reference/pom.xml b/docs/error-messages-reference/pom.xml index 20c639bdb6a..058420dfd89 100644 --- a/docs/error-messages-reference/pom.xml +++ b/docs/error-messages-reference/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/ha-administration-guide/pom.xml b/docs/ha-administration-guide/pom.xml index 9cfb42db10e..7286d468554 100644 --- a/docs/ha-administration-guide/pom.xml +++ b/docs/ha-administration-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/installation-guide/pom.xml b/docs/installation-guide/pom.xml index 25d617045c2..98881c26974 100644 --- a/docs/installation-guide/pom.xml +++ b/docs/installation-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/parent/pom.xml b/docs/parent/pom.xml index c31f3215a58..39e75c9e417 100644 --- a/docs/parent/pom.xml +++ b/docs/parent/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.docs parent diff --git a/docs/performance-tuning-guide/pom.xml b/docs/performance-tuning-guide/pom.xml index f114ee0488c..5c5a9b6a866 100644 --- a/docs/performance-tuning-guide/pom.xml +++ b/docs/performance-tuning-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/pom.xml b/docs/pom.xml index 25cf63a22c1..134f9e375c6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT ../nucleus/parent org.glassfish.docs diff --git a/docs/publish/pom.xml b/docs/publish/pom.xml index d05d338f137..0a79a88fa3f 100644 --- a/docs/publish/pom.xml +++ b/docs/publish/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.docs publish diff --git a/docs/quick-start-guide/pom.xml b/docs/quick-start-guide/pom.xml index c27952ff7c5..939fc4637bd 100644 --- a/docs/quick-start-guide/pom.xml +++ b/docs/quick-start-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/reference-manual/pom.xml b/docs/reference-manual/pom.xml index 81f9f87a4a6..a9bb9a60eef 100644 --- a/docs/reference-manual/pom.xml +++ b/docs/reference-manual/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/release-notes/pom.xml b/docs/release-notes/pom.xml index 0421f23601f..97dd441d878 100644 --- a/docs/release-notes/pom.xml +++ b/docs/release-notes/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/security-guide/pom.xml b/docs/security-guide/pom.xml index 78a79b8ded3..19e26588dcd 100644 --- a/docs/security-guide/pom.xml +++ b/docs/security-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/troubleshooting-guide/pom.xml b/docs/troubleshooting-guide/pom.xml index e4c4001488f..0fc3ec314b9 100644 --- a/docs/troubleshooting-guide/pom.xml +++ b/docs/troubleshooting-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/upgrade-guide/pom.xml b/docs/upgrade-guide/pom.xml index 82668160a6e..2995d7984b3 100644 --- a/docs/upgrade-guide/pom.xml +++ b/docs/upgrade-guide/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent org.glassfish.docs diff --git a/docs/website/pom.xml b/docs/website/pom.xml index 5f9ab5be617..baedbc311ac 100644 --- a/docs/website/pom.xml +++ b/docs/website/pom.xml @@ -22,7 +22,7 @@ org.glassfish.docs docs - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.docs website diff --git a/nucleus/admin/cli/pom.xml b/nucleus/admin/cli/pom.xml index fce2b686196..bfa0bf8468f 100755 --- a/nucleus/admin/cli/pom.xml +++ b/nucleus/admin/cli/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.6 + 6.2.6-SNAPSHOT admin-cli diff --git a/nucleus/admin/config-api/pom.xml b/nucleus/admin/config-api/pom.xml index 997f5933f07..2d0c07a30c8 100644 --- a/nucleus/admin/config-api/pom.xml +++ b/nucleus/admin/config-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.6 + 6.2.6-SNAPSHOT config-api diff --git a/nucleus/admin/launcher/pom.xml b/nucleus/admin/launcher/pom.xml index 9d7ad982d47..b2b55af3c96 100644 --- a/nucleus/admin/launcher/pom.xml +++ b/nucleus/admin/launcher/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.6 + 6.2.6-SNAPSHOT launcher diff --git a/nucleus/admin/monitor/pom.xml b/nucleus/admin/monitor/pom.xml index 42195312d92..b289449f848 100755 --- a/nucleus/admin/monitor/pom.xml +++ b/nucleus/admin/monitor/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.6 + 6.2.6-SNAPSHOT monitoring-core diff --git a/nucleus/admin/pom.xml b/nucleus/admin/pom.xml index f2e08ab842a..ecbf0821301 100755 --- a/nucleus/admin/pom.xml +++ b/nucleus/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.admin diff --git a/nucleus/admin/rest/gf-restadmin-connector/pom.xml b/nucleus/admin/rest/gf-restadmin-connector/pom.xml index dcd6872fb05..121c149f60e 100644 --- a/nucleus/admin/rest/gf-restadmin-connector/pom.xml +++ b/nucleus/admin/rest/gf-restadmin-connector/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.6 + 6.2.6-SNAPSHOT gf-restadmin-connector diff --git a/nucleus/admin/rest/pom.xml b/nucleus/admin/rest/pom.xml index b59cbbe5bd4..0ca4620ae3b 100644 --- a/nucleus/admin/rest/pom.xml +++ b/nucleus/admin/rest/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.6 + 6.2.6-SNAPSHOT rest-service-parent diff --git a/nucleus/admin/rest/rest-client/pom.xml b/nucleus/admin/rest/rest-client/pom.xml index a1117977d24..22a4e617081 100644 --- a/nucleus/admin/rest/rest-client/pom.xml +++ b/nucleus/admin/rest/rest-client/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.6 + 6.2.6-SNAPSHOT rest-client diff --git a/nucleus/admin/rest/rest-service/pom.xml b/nucleus/admin/rest/rest-service/pom.xml index 7bc1577dc5f..ade651e581e 100644 --- a/nucleus/admin/rest/rest-service/pom.xml +++ b/nucleus/admin/rest/rest-service/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.6 + 6.2.6-SNAPSHOT rest-service diff --git a/nucleus/admin/rest/rest-testing/pom.xml b/nucleus/admin/rest/rest-testing/pom.xml index 954be644775..2f487c29a1a 100644 --- a/nucleus/admin/rest/rest-testing/pom.xml +++ b/nucleus/admin/rest/rest-testing/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin rest-service-parent - 6.2.6 + 6.2.6-SNAPSHOT rest-testing diff --git a/nucleus/admin/server-mgmt/pom.xml b/nucleus/admin/server-mgmt/pom.xml index 70fbb4be89b..a76c169f6b3 100644 --- a/nucleus/admin/server-mgmt/pom.xml +++ b/nucleus/admin/server-mgmt/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.6 + 6.2.6-SNAPSHOT server-mgmt diff --git a/nucleus/admin/template/pom.xml b/nucleus/admin/template/pom.xml index 7c5ed54b230..ebcaf79d4da 100644 --- a/nucleus/admin/template/pom.xml +++ b/nucleus/admin/template/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.6 + 6.2.6-SNAPSHOT nucleus-domain diff --git a/nucleus/admin/util/pom.xml b/nucleus/admin/util/pom.xml index d70742aac31..654c94c867b 100755 --- a/nucleus/admin/util/pom.xml +++ b/nucleus/admin/util/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.admin nucleus-admin - 6.2.6 + 6.2.6-SNAPSHOT admin-util diff --git a/nucleus/cluster/admin/pom.xml b/nucleus/cluster/admin/pom.xml index b8cf445d53a..50398175b37 100644 --- a/nucleus/cluster/admin/pom.xml +++ b/nucleus/cluster/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.6 + 6.2.6-SNAPSHOT cluster-admin diff --git a/nucleus/cluster/cli/pom.xml b/nucleus/cluster/cli/pom.xml index 8c6cc6c9272..edca15350e8 100755 --- a/nucleus/cluster/cli/pom.xml +++ b/nucleus/cluster/cli/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.6 + 6.2.6-SNAPSHOT cluster-cli diff --git a/nucleus/cluster/common/pom.xml b/nucleus/cluster/common/pom.xml index 2a0fcf5195f..b1ca0d6ad30 100644 --- a/nucleus/cluster/common/pom.xml +++ b/nucleus/cluster/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.6 + 6.2.6-SNAPSHOT cluster-common diff --git a/nucleus/cluster/gms-adapter/pom.xml b/nucleus/cluster/gms-adapter/pom.xml index 8b0ab99fee3..a8a187b52f9 100644 --- a/nucleus/cluster/gms-adapter/pom.xml +++ b/nucleus/cluster/gms-adapter/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.6 + 6.2.6-SNAPSHOT gms-adapter diff --git a/nucleus/cluster/gms-bootstrap/pom.xml b/nucleus/cluster/gms-bootstrap/pom.xml index eb2316a6db8..3b557e0b13f 100644 --- a/nucleus/cluster/gms-bootstrap/pom.xml +++ b/nucleus/cluster/gms-bootstrap/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.6 + 6.2.6-SNAPSHOT gms-bootstrap diff --git a/nucleus/cluster/pom.xml b/nucleus/cluster/pom.xml index 97e91fbb81d..fc64f3022b6 100755 --- a/nucleus/cluster/pom.xml +++ b/nucleus/cluster/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.cluster diff --git a/nucleus/cluster/ssh/pom.xml b/nucleus/cluster/ssh/pom.xml index 52183ea7b1e..4d9a609a9ce 100644 --- a/nucleus/cluster/ssh/pom.xml +++ b/nucleus/cluster/ssh/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.cluster cluster - 6.2.6 + 6.2.6-SNAPSHOT cluster-ssh diff --git a/nucleus/common/amx-core/pom.xml b/nucleus/common/amx-core/pom.xml index 6bd78cb687f..e1cf748fe53 100755 --- a/nucleus/common/amx-core/pom.xml +++ b/nucleus/common/amx-core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.6 + 6.2.6-SNAPSHOT amx-core diff --git a/nucleus/common/common-util/pom.xml b/nucleus/common/common-util/pom.xml index b50b7363e1b..a9f2606a355 100755 --- a/nucleus/common/common-util/pom.xml +++ b/nucleus/common/common-util/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.6 + 6.2.6-SNAPSHOT common-util diff --git a/nucleus/common/glassfish-api/pom.xml b/nucleus/common/glassfish-api/pom.xml index 6c5cdf5ea0c..684d1febcf0 100644 --- a/nucleus/common/glassfish-api/pom.xml +++ b/nucleus/common/glassfish-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/nucleus/common/internal-api/pom.xml b/nucleus/common/internal-api/pom.xml index 2aee2349281..f6cfa0755e9 100644 --- a/nucleus/common/internal-api/pom.xml +++ b/nucleus/common/internal-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.6 + 6.2.6-SNAPSHOT internal-api diff --git a/nucleus/common/mbeanserver/pom.xml b/nucleus/common/mbeanserver/pom.xml index 56c2f9eb395..3e4c3a19f59 100755 --- a/nucleus/common/mbeanserver/pom.xml +++ b/nucleus/common/mbeanserver/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.6 + 6.2.6-SNAPSHOT glassfish-mbeanserver diff --git a/nucleus/common/pom.xml b/nucleus/common/pom.xml index e84d67f0b62..96d8a892007 100755 --- a/nucleus/common/pom.xml +++ b/nucleus/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.common diff --git a/nucleus/common/scattered-archive-api/pom.xml b/nucleus/common/scattered-archive-api/pom.xml index b88669e1061..aaa676a9710 100644 --- a/nucleus/common/scattered-archive-api/pom.xml +++ b/nucleus/common/scattered-archive-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT ../../pom.xml diff --git a/nucleus/common/simple-glassfish-api/pom.xml b/nucleus/common/simple-glassfish-api/pom.xml index 4ca2bded585..49f20bb9872 100644 --- a/nucleus/common/simple-glassfish-api/pom.xml +++ b/nucleus/common/simple-glassfish-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.6 + 6.2.6-SNAPSHOT simple-glassfish-api diff --git a/nucleus/core/api-exporter/pom.xml b/nucleus/core/api-exporter/pom.xml index 4ed6ead8c40..59b2cf91c30 100755 --- a/nucleus/core/api-exporter/pom.xml +++ b/nucleus/core/api-exporter/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.6 + 6.2.6-SNAPSHOT api-exporter diff --git a/nucleus/core/bootstrap/pom.xml b/nucleus/core/bootstrap/pom.xml index e337ba7627a..f40fcc678e0 100755 --- a/nucleus/core/bootstrap/pom.xml +++ b/nucleus/core/bootstrap/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.6 + 6.2.6-SNAPSHOT glassfish diff --git a/nucleus/core/context-propagation/pom.xml b/nucleus/core/context-propagation/pom.xml index 06b3b50bf8e..57422dc3cef 100644 --- a/nucleus/core/context-propagation/pom.xml +++ b/nucleus/core/context-propagation/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.6 + 6.2.6-SNAPSHOT context-propagation diff --git a/nucleus/core/extra-jre-packages/pom.xml b/nucleus/core/extra-jre-packages/pom.xml index 8ae0a7b145b..3b7a25de2fe 100755 --- a/nucleus/core/extra-jre-packages/pom.xml +++ b/nucleus/core/extra-jre-packages/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.6 + 6.2.6-SNAPSHOT glassfish-extra-jre-packages diff --git a/nucleus/core/kernel/pom.xml b/nucleus/core/kernel/pom.xml index ee3a87d923c..0103c3b1c26 100755 --- a/nucleus/core/kernel/pom.xml +++ b/nucleus/core/kernel/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.6 + 6.2.6-SNAPSHOT kernel diff --git a/nucleus/core/logging/pom.xml b/nucleus/core/logging/pom.xml index 175e82fa45f..6e37df48320 100755 --- a/nucleus/core/logging/pom.xml +++ b/nucleus/core/logging/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.core nucleus-core - 6.2.6 + 6.2.6-SNAPSHOT logging diff --git a/nucleus/core/pom.xml b/nucleus/core/pom.xml index b3b2685531a..d114a0d8542 100644 --- a/nucleus/core/pom.xml +++ b/nucleus/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.core diff --git a/nucleus/deployment/admin/pom.xml b/nucleus/deployment/admin/pom.xml index da954f9671d..d76bbf5d8b3 100755 --- a/nucleus/deployment/admin/pom.xml +++ b/nucleus/deployment/admin/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.6 + 6.2.6-SNAPSHOT deployment-admin diff --git a/nucleus/deployment/autodeploy/pom.xml b/nucleus/deployment/autodeploy/pom.xml index a3bf2b222e3..31fd716f5d3 100755 --- a/nucleus/deployment/autodeploy/pom.xml +++ b/nucleus/deployment/autodeploy/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.6 + 6.2.6-SNAPSHOT deployment-autodeploy diff --git a/nucleus/deployment/common/pom.xml b/nucleus/deployment/common/pom.xml index 8fc3384f065..48e2d269443 100755 --- a/nucleus/deployment/common/pom.xml +++ b/nucleus/deployment/common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.6 + 6.2.6-SNAPSHOT deployment-common diff --git a/nucleus/deployment/dtds/pom.xml b/nucleus/deployment/dtds/pom.xml index e020fa16bf3..a03a27c7559 100644 --- a/nucleus/deployment/dtds/pom.xml +++ b/nucleus/deployment/dtds/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.6 + 6.2.6-SNAPSHOT nucleus-dtds diff --git a/nucleus/deployment/pom.xml b/nucleus/deployment/pom.xml index a19d2119f0a..cb7c8105088 100755 --- a/nucleus/deployment/pom.xml +++ b/nucleus/deployment/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.deployment diff --git a/nucleus/deployment/schemas/pom.xml b/nucleus/deployment/schemas/pom.xml index 461c1a1b662..7cebb92d539 100644 --- a/nucleus/deployment/schemas/pom.xml +++ b/nucleus/deployment/schemas/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.deployment nucleus-deployment - 6.2.6 + 6.2.6-SNAPSHOT nucleus-schemas diff --git a/nucleus/diagnostics/context/pom.xml b/nucleus/diagnostics/context/pom.xml index fbb2b43e315..5a225dff437 100644 --- a/nucleus/diagnostics/context/pom.xml +++ b/nucleus/diagnostics/context/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.diagnostics nucleus-diagnostics - 6.2.6 + 6.2.6-SNAPSHOT diagnostics-context diff --git a/nucleus/diagnostics/diagnostics-api/pom.xml b/nucleus/diagnostics/diagnostics-api/pom.xml index 750ab0153de..2f34742c58f 100755 --- a/nucleus/diagnostics/diagnostics-api/pom.xml +++ b/nucleus/diagnostics/diagnostics-api/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.diagnostics nucleus-diagnostics - 6.2.6 + 6.2.6-SNAPSHOT diagnostics-api diff --git a/nucleus/diagnostics/pom.xml b/nucleus/diagnostics/pom.xml index abbfcaaef42..dad0e7ed4ff 100755 --- a/nucleus/diagnostics/pom.xml +++ b/nucleus/diagnostics/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.diagnostics diff --git a/nucleus/distributions/atomic/pom.xml b/nucleus/distributions/atomic/pom.xml index 90138981555..bc557be9b1e 100644 --- a/nucleus/distributions/atomic/pom.xml +++ b/nucleus/distributions/atomic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions nucleus-distributions - 6.2.6 + 6.2.6-SNAPSHOT atomic diff --git a/nucleus/distributions/nucleus-common/pom.xml b/nucleus/distributions/nucleus-common/pom.xml index 1f98ad5a434..b65737434ed 100644 --- a/nucleus/distributions/nucleus-common/pom.xml +++ b/nucleus/distributions/nucleus-common/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions nucleus-distributions - 6.2.6 + 6.2.6-SNAPSHOT nucleus-common diff --git a/nucleus/distributions/nucleus/pom.xml b/nucleus/distributions/nucleus/pom.xml index c8ad37b24c5..eb5e6e1e805 100644 --- a/nucleus/distributions/nucleus/pom.xml +++ b/nucleus/distributions/nucleus/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.distributions nucleus-distributions - 6.2.6 + 6.2.6-SNAPSHOT nucleus-new diff --git a/nucleus/distributions/pom.xml b/nucleus/distributions/pom.xml index 1a1a7709f6d..089540d320c 100644 --- a/nucleus/distributions/pom.xml +++ b/nucleus/distributions/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.distributions diff --git a/nucleus/featuresets/atomic/pom.xml b/nucleus/featuresets/atomic/pom.xml index 333a5425c82..64213062c86 100644 --- a/nucleus/featuresets/atomic/pom.xml +++ b/nucleus/featuresets/atomic/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets nucleus-featuresets - 6.2.6 + 6.2.6-SNAPSHOT atomic diff --git a/nucleus/featuresets/nucleus/pom.xml b/nucleus/featuresets/nucleus/pom.xml index 7e1bd80635f..635eb468325 100644 --- a/nucleus/featuresets/nucleus/pom.xml +++ b/nucleus/featuresets/nucleus/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.featuresets nucleus-featuresets - 6.2.6 + 6.2.6-SNAPSHOT nucleus diff --git a/nucleus/featuresets/pom.xml b/nucleus/featuresets/pom.xml index a4e6cdf99fa..40f74f79ec4 100644 --- a/nucleus/featuresets/pom.xml +++ b/nucleus/featuresets/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.featuresets diff --git a/nucleus/flashlight/agent/pom.xml b/nucleus/flashlight/agent/pom.xml index 625d04c6a84..524e2aac457 100755 --- a/nucleus/flashlight/agent/pom.xml +++ b/nucleus/flashlight/agent/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.6 + 6.2.6-SNAPSHOT ../../common/pom.xml diff --git a/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml b/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml index df5bbc20daa..8147157e605 100755 --- a/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml +++ b/nucleus/flashlight/flashlight-extra-jdk-packages/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.6 + 6.2.6-SNAPSHOT ../../common/pom.xml diff --git a/nucleus/flashlight/framework/pom.xml b/nucleus/flashlight/framework/pom.xml index d6ce05caeea..cf4e69c2c28 100755 --- a/nucleus/flashlight/framework/pom.xml +++ b/nucleus/flashlight/framework/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.common nucleus-common - 6.2.6 + 6.2.6-SNAPSHOT ../../common/pom.xml diff --git a/nucleus/flashlight/pom.xml b/nucleus/flashlight/pom.xml index 040051344c1..673b2f4e31e 100755 --- a/nucleus/flashlight/pom.xml +++ b/nucleus/flashlight/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.flashlight diff --git a/nucleus/grizzly/config/pom.xml b/nucleus/grizzly/config/pom.xml index 9e76d97e261..9787b07a52f 100644 --- a/nucleus/grizzly/config/pom.xml +++ b/nucleus/grizzly/config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly nucleus-grizzly - 6.2.6 + 6.2.6-SNAPSHOT grizzly-config diff --git a/nucleus/grizzly/nucleus-grizzly-all/pom.xml b/nucleus/grizzly/nucleus-grizzly-all/pom.xml index 9f52a4955d3..0afcde30883 100644 --- a/nucleus/grizzly/nucleus-grizzly-all/pom.xml +++ b/nucleus/grizzly/nucleus-grizzly-all/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.grizzly nucleus-grizzly - 6.2.6 + 6.2.6-SNAPSHOT nucleus-grizzly-all diff --git a/nucleus/grizzly/pom.xml b/nucleus/grizzly/pom.xml index ca7df9122b5..12a7267893d 100644 --- a/nucleus/grizzly/pom.xml +++ b/nucleus/grizzly/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.grizzly diff --git a/nucleus/hk2/config-generator/pom.xml b/nucleus/hk2/config-generator/pom.xml index 6f1339fb615..6e4870c9afc 100644 --- a/nucleus/hk2/config-generator/pom.xml +++ b/nucleus/hk2/config-generator/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.6 + 6.2.6-SNAPSHOT config-generator maven-plugin diff --git a/nucleus/hk2/config-types/pom.xml b/nucleus/hk2/config-types/pom.xml index 1bdd2fe2736..8bba78f3040 100644 --- a/nucleus/hk2/config-types/pom.xml +++ b/nucleus/hk2/config-types/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.6 + 6.2.6-SNAPSHOT config-types diff --git a/nucleus/hk2/hk2-config/pom.xml b/nucleus/hk2/hk2-config/pom.xml index c649dd24115..4873631cc79 100644 --- a/nucleus/hk2/hk2-config/pom.xml +++ b/nucleus/hk2/hk2-config/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.6 + 6.2.6-SNAPSHOT hk2-config diff --git a/nucleus/hk2/pom.xml b/nucleus/hk2/pom.xml index a3cb533e633..9d7f139a62d 100755 --- a/nucleus/hk2/pom.xml +++ b/nucleus/hk2/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT ../parent/pom.xml diff --git a/nucleus/hk2/tiger-types/pom.xml b/nucleus/hk2/tiger-types/pom.xml index 6d7acbaf071..2870f51dcf6 100644 --- a/nucleus/hk2/tiger-types/pom.xml +++ b/nucleus/hk2/tiger-types/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.hk2 glassfish-nucleus-hk2 - 6.2.6 + 6.2.6-SNAPSHOT tiger-types diff --git a/nucleus/osgi-platforms/felix/pom.xml b/nucleus/osgi-platforms/felix/pom.xml index dcdfab73dcd..57c52356195 100644 --- a/nucleus/osgi-platforms/felix/pom.xml +++ b/nucleus/osgi-platforms/felix/pom.xml @@ -22,7 +22,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.6 + 6.2.6-SNAPSHOT felix diff --git a/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml b/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml index 5f37a3abfdf..248f924a274 100644 --- a/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml +++ b/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.6 + 6.2.6-SNAPSHOT osgi-cli-interactive diff --git a/nucleus/osgi-platforms/osgi-cli-remote/pom.xml b/nucleus/osgi-platforms/osgi-cli-remote/pom.xml index 67b35735941..5aae8786d5d 100644 --- a/nucleus/osgi-platforms/osgi-cli-remote/pom.xml +++ b/nucleus/osgi-platforms/osgi-cli-remote/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.6 + 6.2.6-SNAPSHOT osgi-cli-remote diff --git a/nucleus/osgi-platforms/osgi-container/pom.xml b/nucleus/osgi-platforms/osgi-container/pom.xml index 8908c37bcae..7e78bd8cbba 100755 --- a/nucleus/osgi-platforms/osgi-container/pom.xml +++ b/nucleus/osgi-platforms/osgi-container/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.osgi-platforms osgi-platforms - 6.2.6 + 6.2.6-SNAPSHOT osgi-container diff --git a/nucleus/osgi-platforms/pom.xml b/nucleus/osgi-platforms/pom.xml index afbfb7f3d4a..97b99023646 100644 --- a/nucleus/osgi-platforms/pom.xml +++ b/nucleus/osgi-platforms/pom.xml @@ -28,7 +28,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT ../pom.xml diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index 49eebfff3f1..707c4ac091c 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -30,7 +30,7 @@ org.glassfish.main nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT pom GlassFish Nucleus Parent Project diff --git a/nucleus/pom.xml b/nucleus/pom.xml index c637dc6a490..cbd2417bc34 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -24,7 +24,7 @@ org.glassfish.main nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT parent/pom.xml diff --git a/nucleus/resources/pom.xml b/nucleus/resources/pom.xml index 900d73fd527..537f19e0a29 100755 --- a/nucleus/resources/pom.xml +++ b/nucleus/resources/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.resourcebase.resources diff --git a/nucleus/security/core/pom.xml b/nucleus/security/core/pom.xml index ad1400279b3..b8a5016b6ff 100644 --- a/nucleus/security/core/pom.xml +++ b/nucleus/security/core/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security nucleus-security - 6.2.6 + 6.2.6-SNAPSHOT security diff --git a/nucleus/security/pom.xml b/nucleus/security/pom.xml index 54381d2aa90..e80c91345c0 100644 --- a/nucleus/security/pom.xml +++ b/nucleus/security/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.security diff --git a/nucleus/security/services/pom.xml b/nucleus/security/services/pom.xml index 268aad7bece..e5011c46fb7 100644 --- a/nucleus/security/services/pom.xml +++ b/nucleus/security/services/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security nucleus-security - 6.2.6 + 6.2.6-SNAPSHOT security-services diff --git a/nucleus/security/ssl-impl/pom.xml b/nucleus/security/ssl-impl/pom.xml index 75adcaf7399..9bc0755b80d 100644 --- a/nucleus/security/ssl-impl/pom.xml +++ b/nucleus/security/ssl-impl/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main.security nucleus-security - 6.2.6 + 6.2.6-SNAPSHOT ssl-impl diff --git a/nucleus/test-utils/pom.xml b/nucleus/test-utils/pom.xml index 732567a8ed3..940ed924d45 100755 --- a/nucleus/test-utils/pom.xml +++ b/nucleus/test-utils/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT test-utils diff --git a/nucleus/tests/admin/pom.xml b/nucleus/tests/admin/pom.xml index 37952766d19..32310899e85 100644 --- a/nucleus/tests/admin/pom.xml +++ b/nucleus/tests/admin/pom.xml @@ -56,7 +56,7 @@ of COPY_LIB map constant.) org.glassfish.main.tests nucleus-tests - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.tests diff --git a/nucleus/tests/pom.xml b/nucleus/tests/pom.xml index cd12ea696fa..aa0dc2c1db0 100755 --- a/nucleus/tests/pom.xml +++ b/nucleus/tests/pom.xml @@ -23,7 +23,7 @@ org.glassfish.main glassfish-nucleus-parent - 6.2.6 + 6.2.6-SNAPSHOT org.glassfish.main.tests diff --git a/pom.xml b/pom.xml index a9946b9b5fa..f018f394bb5 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.glassfish.main glassfish-main-aggregator - 6.2.6 + 6.2.6-SNAPSHOT pom GlassFish Project diff --git a/qa/pom.xml b/qa/pom.xml index 8ac19b4f788..82cdc42e4e4 100644 --- a/qa/pom.xml +++ b/qa/pom.xml @@ -5,7 +5,7 @@ org.glassfish.main glassfish-main-aggregator - 6.2.6 + 6.2.6-SNAPSHOT glassfish-qa-config From e5a216958334068fd3cc3ae74d60e95a4db6771d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 20:21:04 +0100 Subject: [PATCH 04/33] #23507 Added another paths to .gitignore - generated by tests --- .gitignore | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b326fa78707..bb8bf990f36 100644 --- a/.gitignore +++ b/.gitignore @@ -18,8 +18,16 @@ appserver/security/jaspic-provider-framework/auth.conf appserver/tests/appserv-tests/devtests/web/JSESSIONID /bundles/ appserver/tests/appserv-tests/devtests/**/count.txt +appserver/tests/appserv-tests/devtests/**/errors.txt +appserver/tests/appserv-tests/devtests/**/*.log +appserver/tests/appserv-tests/devtests/**/*.out +appserver/tests/appserv-tests/devtests/**/build/ +appserver/tests/appserv-tests/**/results.html +appserver/tests/appserv-tests/**/tests-results.xml +appserver/tests/appserv-tests/security-gtest-results.xml +appserver/tests/appserv-tests/test_results_junit.xml +appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties appserver/tests/appserv-tests/devtests/connector/v3/testdb/ -appserver/tests/appserv-tests/devtests/connector/v3/**/*.log appserver/tests/appserv-tests/devtests/connector/v3/**/*.lck appserver/tests/appserv-tests/devtests/connector/v3/**/*.ctrl appserver/tests/appserv-tests/devtests/connector/v3/**/*.dat @@ -29,6 +37,27 @@ appserver/tests/appserv-tests/devtests/connector/**/*.[rj]ar appserver/tests/appserv-tests/devtests/connector/**/tmp-*/ appserver/tests/appserv-tests/devtests/connector/**/seg0/ +appserver/tests/appserv-tests/devtests/deployment/junit-4.12.jar +appserver/tests/appserv-tests/devtests/deployment/password.txt + appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java +appserver/tests/appserv-tests/devtests/security/jmac/soap/client/Client.java +appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/client/Client.java +appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/webclient/Servlet.java + +appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client-sun-web.xml +appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/sun-web.xml +appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client-sun-web.xml +appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/sun-web.xml +appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/sun-application-client.xml +appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/sun-web.xml +appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/passwordfile +appserver/tests/appserv-tests/devtests/webservice/security/*.cer +appserver/tests/appserv-tests/devtests/webservice/security/*.jks + +appserver/tests/appserv-tests/temppwd + +opendj-*.zip +/opendj/ From dd67475437c340985091f91e406c301a4ea6551b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 20:25:05 +0100 Subject: [PATCH 05/33] #23507 Remobed NetBeans files --- .gitignore | 1 + .../devtests/admin/cli/nbproject/project.xml | 94 -- .../war/appmgt/nbproject/project.xml | 129 --- .../SFSBDriver/nbproject/ant-deploy.xml | 103 -- .../SFSBDriver/nbproject/build-impl.xml | 979 ----------------- .../SFSBDriver/nbproject/genfiles.properties | 25 - .../nbproject/private/private.properties | 23 - .../SFSBDriver/nbproject/private/private.xml | 22 - .../SFSBDriver/nbproject/project.properties | 104 -- .../SFSBDriver/nbproject/project.xml | 36 - .../SFSBDriver/nbproject/ant-deploy.xml | 103 -- .../SFSBDriver/nbproject/build-impl.xml | 979 ----------------- .../SFSBDriver/nbproject/genfiles.properties | 25 - .../nbproject/private/private.properties | 22 - .../SFSBDriver/nbproject/private/private.xml | 22 - .../SFSBDriver/nbproject/project.properties | 104 -- .../ha-web/SFSBDriver/nbproject/project.xml | 36 - .../SFSBDriver/nbproject/ant-deploy.xml | 103 -- .../SFSBDriver/nbproject/build-impl.xml | 979 ----------------- .../SFSBDriver/nbproject/genfiles.properties | 25 - .../nbproject/private/private.properties | 23 - .../SFSBDriver/nbproject/private/private.xml | 22 - .../SFSBDriver/nbproject/project.properties | 104 -- .../SFSBDriver/nbproject/project.xml | 36 - .../nbproject/ant-deploy.xml | 103 -- .../nbproject/build-impl.xml | 979 ----------------- .../nbproject/genfiles.properties | 25 - .../nbproject/private/private.properties | 22 - .../nbproject/project.properties | 104 -- .../nbproject/project.xml | 36 - .../SFSBDriver/nbproject/ant-deploy.xml | 103 -- .../SFSBDriver/nbproject/build-impl.xml | 979 ----------------- .../SFSBDriver/nbproject/genfiles.properties | 25 - .../nbproject/private/private.properties | 23 - .../SFSBDriver/nbproject/private/private.xml | 22 - .../SFSBDriver/nbproject/project.properties | 104 -- .../SFSBDriver/nbproject/project.xml | 36 - .../SFSBDriver/nbproject/ant-deploy.xml | 103 -- .../SFSBDriver/nbproject/build-impl.xml | 987 ------------------ .../SFSBDriver/nbproject/genfiles.properties | 25 - .../nbproject/private/private.properties | 22 - .../SFSBDriver/nbproject/private/private.xml | 27 - .../SFSBDriver/nbproject/project.properties | 104 -- .../SFSBDriver/nbproject/project.xml | 36 - .../SimpleSFSBDriver/nbproject/ant-deploy.xml | 103 -- .../SimpleSFSBDriver/nbproject/build-impl.xml | 987 ------------------ .../nbproject/genfiles.properties | 25 - .../nbproject/private/private.properties | 22 - .../nbproject/private/private.xml | 22 - .../nbproject/project.properties | 104 -- .../SimpleSFSBDriver/nbproject/project.xml | 36 - .../nbproject/ant-deploy.xml | 78 -- .../nbproject/build-impl.xml | 810 -------------- .../nbproject/genfiles.properties | 24 - .../nbproject/private/private.properties | 18 - .../nbproject/private/private.xml | 21 - .../nbproject/project.properties | 90 -- .../v3_jdbc_dev_tests/nbproject/project.xml | 46 - .../SFSBDriver/nbproject/ant-deploy.xml | 103 -- .../SFSBDriver/nbproject/build-impl.xml | 979 ----------------- .../SFSBDriver/nbproject/genfiles.properties | 25 - .../nbproject/private/private.properties | 22 - .../SFSBDriver/nbproject/private/private.xml | 22 - .../SFSBDriver/nbproject/project.properties | 104 -- .../ha-web/SFSBDriver/nbproject/project.xml | 36 - .../nbproject/ant-deploy.xml | 103 -- .../nbproject/build-impl.xml | 979 ----------------- .../nbproject/genfiles.properties | 25 - .../nbproject/private/private.properties | 22 - .../nbproject/private/private.xml | 29 - .../nbproject/project.properties | 104 -- .../nbproject/project.xml | 36 - .../nbproject/ant-deploy.xml | 103 -- .../nbproject/build-impl.xml | 979 ----------------- .../nbproject/genfiles.properties | 25 - .../nbproject/private/private.properties | 22 - .../nbproject/private/private.xml | 26 - .../nbproject/project.properties | 104 -- .../SFSBModifiedSession/nbproject/project.xml | 36 - .../SFSBDriver/nbproject/ant-deploy.xml | 103 -- .../SFSBDriver/nbproject/build-impl.xml | 979 ----------------- .../SFSBDriver/nbproject/genfiles.properties | 25 - .../nbproject/private/private.properties | 22 - .../SFSBDriver/nbproject/private/private.xml | 22 - .../SFSBDriver/nbproject/project.properties | 104 -- .../SFSBDriver/nbproject/project.xml | 36 - .../EntApp-ejb/nbproject/ant-deploy.xml | 115 -- .../EntApp-ejb/nbproject/build-impl.xml | 532 ---------- .../EntApp-ejb/nbproject/genfiles.properties | 26 - .../EntApp/EntApp-ejb/nbproject/jax-ws.xml | 27 - .../nbproject/private/private.properties | 24 - .../EntApp-ejb/nbproject/private/private.xml | 22 - .../EntApp-ejb/nbproject/project.properties | 65 -- .../EntApp/EntApp-ejb/nbproject/project.xml | 34 - .../EntApp-war/nbproject/ant-deploy.xml | 115 -- .../EntApp-war/nbproject/build-impl.xml | 778 -------------- .../EntApp-war/nbproject/genfiles.properties | 26 - .../EntApp/EntApp-war/nbproject/jax-ws.xml | 27 - .../nbproject/private/private.properties | 25 - .../EntApp-war/nbproject/private/private.xml | 22 - .../EntApp-war/nbproject/project.properties | 86 -- .../EntApp/EntApp-war/nbproject/project.xml | 51 - .../EntApp/nbproject/ant-deploy.xml | 115 -- .../EntApp/nbproject/build-impl.xml | 375 ------- .../EntApp/nbproject/genfiles.properties | 24 - .../nbproject/private/private.properties | 25 - .../EntApp/nbproject/project.properties | 46 - .../EntApp/nbproject/project.xml | 57 - .../clustersetup/nbproject/project.xml | 84 -- .../clusterteardown/nbproject/project.xml | 84 -- .../cluster/helloworld/nbproject/project.xml | 84 -- .../community/nbproject/private/private.xml | 22 - .../community/nbproject/project.xml | 53 - .../debug/JmxUtils/nbproject/build-impl.xml | 559 ---------- .../JmxUtils/nbproject/project.properties | 72 -- .../debug/JmxUtils/nbproject/project.xml | 34 - .../ConfigViewer/nbproject/build-impl.xml | 559 ---------- .../nbproject/genfiles.properties | 24 - .../ConfigViewer/nbproject/project.properties | 80 -- .../ConfigViewer/nbproject/project.xml | 34 - .../devtests/admin/pe/nbproject/project.xml | 81 -- .../sqetests/admin/nbproject/project.xml | 75 -- 122 files changed, 1 insertion(+), 19986 deletions(-) delete mode 100644 appserver/tests/appserv-tests/devtests/admin/cli/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/appmgt/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/jax-ws.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/jax-ws.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/private/private.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/project.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/genfiles.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/private/private.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/project.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/project.xml delete mode 100644 appserver/tests/quicklook/cluster/clustersetup/nbproject/project.xml delete mode 100644 appserver/tests/quicklook/cluster/clusterteardown/nbproject/project.xml delete mode 100644 appserver/tests/quicklook/cluster/helloworld/nbproject/project.xml delete mode 100644 appserver/tests/v2-tests/appserv-tests/community/nbproject/private/private.xml delete mode 100644 appserver/tests/v2-tests/appserv-tests/community/nbproject/project.xml delete mode 100644 appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/build-impl.xml delete mode 100644 appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/project.properties delete mode 100644 appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/project.xml delete mode 100644 appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/build-impl.xml delete mode 100644 appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/genfiles.properties delete mode 100644 appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/project.properties delete mode 100644 appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/project.xml delete mode 100644 appserver/tests/v2-tests/appserv-tests/devtests/admin/pe/nbproject/project.xml delete mode 100644 appserver/tests/v2-tests/appserv-tests/sqetests/admin/nbproject/project.xml diff --git a/.gitignore b/.gitignore index bb8bf990f36..f425af11257 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ *.class target/ .idea +nbproject/ nbactions.xml nb-configuration.xml .classpath diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/admin/cli/nbproject/project.xml deleted file mode 100644 index ce8415be981..00000000000 --- a/appserver/tests/appserv-tests/devtests/admin/cli/nbproject/project.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - org.netbeans.modules.ant.freeform - - - - admin-devtests - - - - - C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java - - - - java - C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java - - - - java - src - - - - - build - - - clean - - - all - - - runtest - - - clean - build - - - - - - - C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java - - - - src - - - build.xml - - - - - - - - - - - - - - - C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java - src - ../../../util/reportbuilder/src/main/java;../../../lib/com-sun-commons-logging.jar;../../../lib/commons-logging.jar;../../../lib/filediff.jar;../../../lib/httpunit.jar;../../../lib/isql.jar;../../../lib/js.jar;../../../lib/junit.jar;../../../lib/ldapjdk.jar;../../../lib/nekohtml.jar;../../../lib/reportbuilder.jar;../../../lib/reporter.jar;../../../lib/selenium-java-client-driver-tests.jar;../../../lib/selenium-java-client-driver.jar;../../../lib/selenium-server-0.9.1-20070223.200626-116-standalone.jar;../../../lib/selenium-server.jar;../../../lib/sslutil.jar;../../../lib/testdriversecurity.jar;../../../lib/testng-5.5-jdk15.jar;../../../lib/testng.jar;../../../lib/Tidy.jar;../../../lib/webtest.jar;../../../lib/xercesImpl.jar;../../../lib/xmlParserAPIs.jar - 1.5 - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/nbproject/project.xml deleted file mode 100644 index a7268e3df09..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/nbproject/project.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - org.netbeans.modules.ant.freeform - - - appMgtTestApp - - - - appMgtTestApp - - - - - . - UTF-8 - - - - doc_root - . - - - - web_inf - . - - - - java - . - UTF-8 - - - ../../build - - - - - compile - - - clean - - - temprun - - - declare-test - - - deploy.asadmin - - - clean - compile - - - - folder - ../../build - compile - - - - - - . - - - - . - - - - . - - - build.xml - - - - - - - - - - - - - - - - . - ../../build - ../../build - 1.5 - - - - - . - - /war/appmgt - 1.5 - . - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml deleted file mode 100644 index c37d86114a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml deleted file mode 100644 index 8a631732e22..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml +++ /dev/null @@ -1,979 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/genfiles.properties deleted file mode 100644 index 5683af2aafe..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/genfiles.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -build.xml.data.CRC32=1dfa7d57 -build.xml.script.CRC32=ae5ae0a1 -build.xml.stylesheet.CRC32=651128d4@1.24.1.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1dfa7d57 -nbproject/build-impl.xml.script.CRC32=52fd083c -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/private/private.properties deleted file mode 100644 index 3fa2c6c77c3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/private/private.properties +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -deploy.ant.properties.file=/space/home/mk/.netbeans/6.9/gfv3-1235695917.properties -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/hibernate-validator.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/jsf-api.jar -j2ee.platform.is.jsr109=true -j2ee.server.home=/space/work/v3/trunk/glassfishv3/glassfish -j2ee.server.instance=[/space/work/v3/trunk/glassfishv3/glassfish]deployer:gfv3ee6:localhost:4848 -user.properties.file=/space/home/mk/.netbeans/6.9/build.properties diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/private/private.xml deleted file mode 100644 index bc911590f5d..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/private/private.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/project.properties deleted file mode 100644 index 56b3eb5a6a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath= -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SFSBDriver.war -war.name=SFSBDriver.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/project.xml deleted file mode 100644 index a2c6f67ab99..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - SFSBDriver - 1.6.5 - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml deleted file mode 100644 index c37d86114a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml deleted file mode 100644 index 8a631732e22..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml +++ /dev/null @@ -1,979 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/genfiles.properties deleted file mode 100644 index 5683af2aafe..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/genfiles.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -build.xml.data.CRC32=1dfa7d57 -build.xml.script.CRC32=ae5ae0a1 -build.xml.stylesheet.CRC32=651128d4@1.24.1.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1dfa7d57 -nbproject/build-impl.xml.script.CRC32=52fd083c -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.properties deleted file mode 100644 index 04bacf70236..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -deploy.ant.properties.file=/home/rajiv/.netbeans/6.9/gfv3704217205.properties -j2ee.platform.is.jsr109=true -j2ee.server.home=/usr/local/netbeans-containers/glassfish-3.0.1/glassfish -j2ee.server.instance=[/usr/local/netbeans-containers/glassfish-3.0.1/glassfish]deployer:gfv3ee6:localhost:4848 -user.properties.file=/home/rajiv/.netbeans/6.9/build.properties diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.xml deleted file mode 100644 index bc911590f5d..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/project.properties deleted file mode 100644 index a11b91c7a06..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/hibernate-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SFSBDriver.war -war.name=SFSBDriver.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/project.xml deleted file mode 100644 index a2c6f67ab99..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - SFSBDriver - 1.6.5 - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml deleted file mode 100644 index c37d86114a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml deleted file mode 100644 index 8a631732e22..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml +++ /dev/null @@ -1,979 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/genfiles.properties deleted file mode 100644 index 5683af2aafe..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/genfiles.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -build.xml.data.CRC32=1dfa7d57 -build.xml.script.CRC32=ae5ae0a1 -build.xml.stylesheet.CRC32=651128d4@1.24.1.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1dfa7d57 -nbproject/build-impl.xml.script.CRC32=52fd083c -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/private/private.properties deleted file mode 100644 index 92fb06c2bd5..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/private/private.properties +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -deploy.ant.properties.file=/home/mk/.netbeans/6.9/gfv31869305509.properties -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/hibernate-validator.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/mail.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/javax.servlet.jar -j2ee.platform.is.jsr109=true -j2ee.server.home=/space/tools/netbeans-6.9/glassfishv3/glassfish -j2ee.server.instance=[/space/tools/netbeans-6.9/glassfishv3/glassfish]deployer:gfv3ee6:localhost:4848 -user.properties.file=/home/mk/.netbeans/6.9/build.properties diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/private/private.xml deleted file mode 100644 index bc911590f5d..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/private/private.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/project.properties deleted file mode 100644 index 56b3eb5a6a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath= -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SFSBDriver.war -war.name=SFSBDriver.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/project.xml deleted file mode 100644 index a2c6f67ab99..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - SFSBDriver - 1.6.5 - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml deleted file mode 100644 index c37d86114a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml deleted file mode 100644 index e752213df1c..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml +++ /dev/null @@ -1,979 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/genfiles.properties deleted file mode 100644 index cae70d6f060..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/genfiles.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -build.xml.data.CRC32=d06c4330 -build.xml.script.CRC32=d503bafc -build.xml.stylesheet.CRC32=651128d4@1.24.1.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=d06c4330 -nbproject/build-impl.xml.script.CRC32=3290929d -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/private/private.properties deleted file mode 100644 index 7f300e9a705..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/private/private.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -deploy.ant.properties.file=/space/home/mk/.netbeans/6.9/gfv3-1235695917.properties -j2ee.platform.is.jsr109=true -j2ee.server.home=/space/work/v3/trunk/glassfishv3/glassfish -j2ee.server.instance=[/space/work/v3/trunk/glassfishv3/glassfish]deployer:gfv3ee6:localhost:4848 -user.properties.file=/space/home/mk/.netbeans/6.9/build.properties diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/project.properties deleted file mode 100644 index caba038573e..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/hibernate-validator.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/jsf-api.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SFSBMethodCheckpointDriver.war -war.name=SFSBMethodCheckpointDriver.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/project.xml deleted file mode 100644 index 63f041afcde..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - SFSBMethodCheckpointDriver - 1.6.5 - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml deleted file mode 100644 index c37d86114a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml deleted file mode 100644 index 8a631732e22..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml +++ /dev/null @@ -1,979 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/genfiles.properties deleted file mode 100644 index 5683af2aafe..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/genfiles.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -build.xml.data.CRC32=1dfa7d57 -build.xml.script.CRC32=ae5ae0a1 -build.xml.stylesheet.CRC32=651128d4@1.24.1.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1dfa7d57 -nbproject/build-impl.xml.script.CRC32=52fd083c -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/private/private.properties deleted file mode 100644 index 95dc1e5642a..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/private/private.properties +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -deploy.ant.properties.file=/space/home/mk/.netbeans/6.9/gfv3-1235695917.properties -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/hibernate-validator.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/jsf-api.jar -j2ee.platform.is.jsr109=true -j2ee.server.home=/space/work/v3/trunk/glassfishv3/glassfish -j2ee.server.instance=[/space/work/v3/trunk/glassfishv3/glassfish]deployer:gfv3ee6:localhost:4848 -user.properties.file=/space/home/mk/.netbeans/6.9/build.properties diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/private/private.xml deleted file mode 100644 index bc911590f5d..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/private/private.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/project.properties deleted file mode 100644 index 56b3eb5a6a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath= -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SFSBDriver.war -war.name=SFSBDriver.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/project.xml deleted file mode 100644 index a2c6f67ab99..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - SFSBDriver - 1.6.5 - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml deleted file mode 100644 index c37d86114a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml deleted file mode 100644 index 63ce435e056..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml +++ /dev/null @@ -1,987 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/genfiles.properties deleted file mode 100644 index f103a0ad58c..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/genfiles.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -build.xml.data.CRC32=1dfa7d57 -build.xml.script.CRC32=ae5ae0a1 -build.xml.stylesheet.CRC32=651128d4@1.24.2.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1dfa7d57 -nbproject/build-impl.xml.script.CRC32=01ab9074 -nbproject/build-impl.xml.stylesheet.CRC32=8419264d@1.24.2.1 diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.properties deleted file mode 100644 index 5740c6e4ce3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -deploy.ant.properties.file=/home/mk/.netbeans/6.9/gfv3-1235695917.properties -j2ee.platform.is.jsr109=true -j2ee.server.home=/space/work/v3/trunk/glassfishv3/glassfish -j2ee.server.instance=[/space/work/v3/trunk/glassfishv3/glassfish]deployer:gfv3ee6:localhost:4848 -user.properties.file=/home/mk/.netbeans/6.9/build.properties diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.xml deleted file mode 100644 index bd437290c01..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - file:/space/work/v3/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/web/WEB-INF/web.xml - file:/space/work/v3/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java - file:/space/work/v3/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/project.properties deleted file mode 100644 index aad24a45539..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/hibernate-validator.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/jsf-api.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SFSBDriver.war -war.name=SFSBDriver.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/project.xml deleted file mode 100644 index a2c6f67ab99..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - SFSBDriver - 1.6.5 - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml deleted file mode 100644 index c37d86114a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml deleted file mode 100644 index ccbe6045bbd..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml +++ /dev/null @@ -1,987 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/genfiles.properties deleted file mode 100644 index 2c2aab9986c..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/genfiles.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -build.xml.data.CRC32=006c5967 -build.xml.script.CRC32=2f795a44 -build.xml.stylesheet.CRC32=651128d4@1.24.2.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=006c5967 -nbproject/build-impl.xml.script.CRC32=c867f2cb -nbproject/build-impl.xml.stylesheet.CRC32=8419264d@1.24.2.1 diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/private/private.properties deleted file mode 100644 index 5740c6e4ce3..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/private/private.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -deploy.ant.properties.file=/home/mk/.netbeans/6.9/gfv3-1235695917.properties -j2ee.platform.is.jsr109=true -j2ee.server.home=/space/work/v3/trunk/glassfishv3/glassfish -j2ee.server.instance=[/space/work/v3/trunk/glassfishv3/glassfish]deployer:gfv3ee6:localhost:4848 -user.properties.file=/home/mk/.netbeans/6.9/build.properties diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/private/private.xml deleted file mode 100644 index bc911590f5d..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/private/private.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/project.properties deleted file mode 100644 index 2926753c2ed..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/hibernate-validator.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/jsf-api.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SimpleSFSBDriver.war -war.name=SimpleSFSBDriver.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/project.xml deleted file mode 100644 index c8fe4303a81..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - SimpleSFSBDriver - 1.6.5 - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/ant-deploy.xml deleted file mode 100644 index 70c8a74a846..00000000000 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/ant-deploy.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/build-impl.xml deleted file mode 100644 index 31e0e919153..00000000000 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/build-impl.xml +++ /dev/null @@ -1,810 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set platform.home - Must set platform.bootcp - Must set platform.java - Must set platform.javac - Platform is not correctly set up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/genfiles.properties deleted file mode 100644 index bacbff3de2a..00000000000 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/genfiles.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -build.xml.data.CRC32=001a0991 -build.xml.script.CRC32=c7ada0ab -build.xml.stylesheet.CRC32=cfd7ba16 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=001a0991 -nbproject/build-impl.xml.script.CRC32=657b3098 -nbproject/build-impl.xml.stylesheet.CRC32=432b6523 diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/private/private.properties deleted file mode 100644 index 35c9e820bd9..00000000000 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/private/private.properties +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -javac.debug=true -javadoc.preview=true diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/private/private.xml deleted file mode 100644 index 47110b2f52c..00000000000 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/private/private.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/project.properties deleted file mode 100644 index 3f26e2d3a48..00000000000 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/project.properties +++ /dev/null @@ -1,90 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -file.reference.amx-api-2.0-SNAPSHOT.jar=../../glassfish/modules/amx-api-2.0-SNAPSHOT.jar -file.reference.glassfish-api-10.0-SNAPSHOT.jar=../../../../../../workspaces/v3/feb10/v3/distributions/web/target/stage/glassfish/modules/glassfish-api-10.0-SNAPSHOT.jar -file.reference.glassfish-api-10.0-SNAPSHOT.jar-1=../../../../../../tmp/gfv3installation/glassfish/modules/glassfish-api-10.0-SNAPSHOT.jar -file.reference.glassfish-api-10.0-SNAPSHOT.jar-2=../../../../../../../tmp/gfv3installation/glassfish/modules/glassfish-api-10.0-SNAPSHOT.jar -file.reference.glassfish-api-10.0-SNAPSHOT.jar-3=../../glassfish/modules/glassfish-api-10.0-SNAPSHOT.jar -file.reference.glassfish-api-10.0-SNAPSHOT.jar-4=../../../glassfish/modules/glassfish-api-10.0-SNAPSHOT.jar -j2ee.platform=1.5 -j2ee.server.type=J2EE -jar.compress=false -javac.classpath=\ - ${file.reference.glassfish-api-10.0-SNAPSHOT.jar-3}:\ - ${file.reference.glassfish-api-10.0-SNAPSHOT.jar-4} -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -jspcompilation.classpath=${jspc.classpath}:${javac.classpath} -lib.dir=${web.docbase.dir}/WEB-INF/lib -platform.active=JDK_1.5 -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=v3_jdbc_dev_tests.war -war.name=v3_jdbc_dev_tests.war -war.package=true -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/project.xml deleted file mode 100644 index bfd6bbebbad..00000000000 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/project.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - v3_jdbc_dev_tests - 1.6 - - - ${file.reference.glassfish-api-10.0-SNAPSHOT.jar-3} - WEB-INF/lib - - - ${file.reference.glassfish-api-10.0-SNAPSHOT.jar-4} - WEB-INF/lib - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml deleted file mode 100644 index 0d4bfa14006..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml deleted file mode 100644 index 39049ec0eb4..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml +++ /dev/null @@ -1,979 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/genfiles.properties deleted file mode 100644 index 5683af2aafe..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/genfiles.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -build.xml.data.CRC32=1dfa7d57 -build.xml.script.CRC32=ae5ae0a1 -build.xml.stylesheet.CRC32=651128d4@1.24.1.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1dfa7d57 -nbproject/build-impl.xml.script.CRC32=52fd083c -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.properties deleted file mode 100644 index 04bacf70236..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -deploy.ant.properties.file=/home/rajiv/.netbeans/6.9/gfv3704217205.properties -j2ee.platform.is.jsr109=true -j2ee.server.home=/usr/local/netbeans-containers/glassfish-3.0.1/glassfish -j2ee.server.instance=[/usr/local/netbeans-containers/glassfish-3.0.1/glassfish]deployer:gfv3ee6:localhost:4848 -user.properties.file=/home/rajiv/.netbeans/6.9/build.properties diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.xml deleted file mode 100644 index aa6b0a65c7b..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/project.properties deleted file mode 100644 index a11b91c7a06..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/hibernate-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SFSBDriver.war -war.name=SFSBDriver.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/project.xml deleted file mode 100644 index 63298e74242..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - SFSBDriver - 1.6.5 - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml deleted file mode 100644 index c37d86114a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml deleted file mode 100644 index 4c682f27192..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml +++ /dev/null @@ -1,979 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/genfiles.properties deleted file mode 100644 index ece64ada68f..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/genfiles.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -build.xml.data.CRC32=67443db9 -build.xml.script.CRC32=71139c7d -build.xml.stylesheet.CRC32=651128d4@1.24.1.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=67443db9 -nbproject/build-impl.xml.script.CRC32=31d076f6 -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/private/private.properties deleted file mode 100644 index 04bacf70236..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/private/private.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -deploy.ant.properties.file=/home/rajiv/.netbeans/6.9/gfv3704217205.properties -j2ee.platform.is.jsr109=true -j2ee.server.home=/usr/local/netbeans-containers/glassfish-3.0.1/glassfish -j2ee.server.instance=[/usr/local/netbeans-containers/glassfish-3.0.1/glassfish]deployer:gfv3ee6:localhost:4848 -user.properties.file=/home/rajiv/.netbeans/6.9/build.properties diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/private/private.xml deleted file mode 100644 index 5476302c85c..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/private/private.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/web/WEB-INF/sun-web.xml - file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/web/WEB-INF/web.xml - file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/web/index.jsp - file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java - file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SimpleSessionBean.java - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/project.properties deleted file mode 100644 index 6d5edb3d6f6..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/hibernate-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SFSBModifiedAttribute.war -war.name=SFSBModifiedAttribute.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/project.xml deleted file mode 100644 index aba658b3807..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - SFSBModifiedAttribute - 1.6.5 - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml deleted file mode 100644 index c37d86114a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml deleted file mode 100644 index a20324992fb..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml +++ /dev/null @@ -1,979 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/genfiles.properties deleted file mode 100644 index 6b8eb730242..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/genfiles.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -build.xml.data.CRC32=66f55978 -build.xml.script.CRC32=c88af6b0 -build.xml.stylesheet.CRC32=651128d4@1.24.1.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=66f55978 -nbproject/build-impl.xml.script.CRC32=187b489a -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/private/private.properties deleted file mode 100644 index 04bacf70236..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/private/private.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -deploy.ant.properties.file=/home/rajiv/.netbeans/6.9/gfv3704217205.properties -j2ee.platform.is.jsr109=true -j2ee.server.home=/usr/local/netbeans-containers/glassfish-3.0.1/glassfish -j2ee.server.instance=[/usr/local/netbeans-containers/glassfish-3.0.1/glassfish]deployer:gfv3ee6:localhost:4848 -user.properties.file=/home/rajiv/.netbeans/6.9/build.properties diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/private/private.xml deleted file mode 100644 index 495effc59d7..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/private/private.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBDriver/web/WEB-INF/sun-web.xml - file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBDriver/web/WEB-INF/web.xml - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/project.properties deleted file mode 100644 index b42feb56d07..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/hibernate-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SFSBModifiedSession.war -war.name=SFSBModifiedSession.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/project.xml deleted file mode 100644 index 953f04ed45e..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - SFSBModifiedSession - 1.6.5 - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml deleted file mode 100644 index 0d4bfa14006..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml deleted file mode 100644 index 39049ec0eb4..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml +++ /dev/null @@ -1,979 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -This property must point to -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at -<netbeans_installation>/java<version>/ant/extra folder. -Either open the project in the IDE and make sure CopyLibs library -exists or setup the property manually. For example like this: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/genfiles.properties deleted file mode 100644 index 5683af2aafe..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/genfiles.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -build.xml.data.CRC32=1dfa7d57 -build.xml.script.CRC32=ae5ae0a1 -build.xml.stylesheet.CRC32=651128d4@1.24.1.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1dfa7d57 -nbproject/build-impl.xml.script.CRC32=52fd083c -nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1 diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.properties deleted file mode 100644 index 04bacf70236..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -deploy.ant.properties.file=/home/rajiv/.netbeans/6.9/gfv3704217205.properties -j2ee.platform.is.jsr109=true -j2ee.server.home=/usr/local/netbeans-containers/glassfish-3.0.1/glassfish -j2ee.server.instance=[/usr/local/netbeans-containers/glassfish-3.0.1/glassfish]deployer:gfv3ee6:localhost:4848 -user.properties.file=/home/rajiv/.netbeans/6.9/build.properties diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.xml deleted file mode 100644 index aa6b0a65c7b..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/project.properties deleted file mode 100644 index a11b91c7a06..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/project.properties +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${build.classes.dir}:${javac.classpath} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/hibernate-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -persistence.xml.dir=${conf.dir} -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=SFSBDriver.war -war.name=SFSBDriver.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/project.xml deleted file mode 100644 index 63298e74242..00000000000 --- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - SFSBDriver - 1.6.5 - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml deleted file mode 100644 index cb08385febb..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lefty}?xml version="1.0" encoding="UTF-8"?${righty} -${lefty}!DOCTYPE resources PUBLIC - "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN" - "${sjsas.root}/lib/dtds/sun-resources_1_2.dtd"${righty} -${lefty}resources${righty} -${lefty}/resources${righty} - - - - - - - -]]> - - - - -]]> - - - - - - - ]]> - - - - - - - - ]]> - ]]> - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml deleted file mode 100644 index 412852841ad..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml +++ /dev/null @@ -1,532 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set main.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/genfiles.properties deleted file mode 100644 index 2e75d09ae0a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/genfiles.properties +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -build.xml.data.CRC32=2b429b24 -build.xml.jax-ws.CRC32=11653f59 -build.xml.script.CRC32=6550ade5 -build.xml.stylesheet.CRC32=997c846c -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=2b429b24 -nbproject/build-impl.xml.jax-ws.CRC32=11653f59 -nbproject/build-impl.xml.script.CRC32=e441fb44 -nbproject/build-impl.xml.stylesheet.CRC32=5a2c94db diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/jax-ws.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/jax-ws.xml deleted file mode 100644 index 2eb3b7bd14a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/jax-ws.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - entapp.ejb.HelloEJB - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/private/private.properties deleted file mode 100644 index 1df9f9e73bc..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/private/private.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -deploy.ant.properties.file=/home/bhavani/.netbeans/dev/glassfish.properties -j2ee.platform.classpath=/workspace/appserver/publish/glassfish/lib/javaee.jar:/workspace/appserver/publish/glassfish/lib/jsf-impl.jar:/workspace/appserver/publish/glassfish/lib/activation.jar:/workspace/appserver/publish/glassfish/lib/appserv-tags.jar:/workspace/appserver/publish/glassfish/lib/mail.jar:/workspace/appserver/publish/glassfish/lib/appserv-jstl.jar:/workspace/appserver/publish/glassfish/lib/webservices-tools.jar:/workspace/appserver/publish/glassfish/lib/webservices-rt.jar:/workspace/appserver/publish/glassfish/lib/appserv-ws.jar -j2ee.platform.wscompile.classpath=/workspace/appserver/publish/glassfish/lib/j2ee.jar:/workspace/appserver/publish/glassfish/lib/saaj-api.jar:/workspace/appserver/publish/glassfish/lib/saaj-impl.jar:/workspace/appserver/publish/glassfish/lib/jaxrpc-api.jar:/workspace/appserver/publish/glassfish/lib/jaxrpc-impl.jar:/workspace/appserver/publish/glassfish/lib/endorsed/jaxp-api.jar:/workspace/appserver/publish/glassfish/lib/appserv-ws.jar:/workspace/appserver/publish/glassfish/lib/webservices-tools.jar:/workspace/appserver/publish/glassfish/lib/webservices-rt.jar -j2ee.platform.wsgen.classpath=/workspace/appserver/publish/glassfish/lib/webservices-tools.jar:/workspace/appserver/publish/glassfish/lib/webservices-rt.jar:/workspace/appserver/publish/glassfish/lib/tools.jar:/workspace/appserver/publish/glassfish/lib/appserv-jstl.jar:/workspace/appserver/publish/glassfish/lib/javaee.jar:/workspace/appserver/publish/glassfish/lib/appserv-ws.jar:/workspace/appserver/publish/glassfish/lib/mail.jar:/workspace/appserver/publish/glassfish/lib/activation.jar -j2ee.platform.wsimport.classpath=/workspace/appserver/publish/glassfish/lib/webservices-tools.jar:/workspace/appserver/publish/glassfish/lib/webservices-rt.jar:/workspace/appserver/publish/glassfish/lib/tools.jar:/workspace/appserver/publish/glassfish/lib/appserv-jstl.jar:/workspace/appserver/publish/glassfish/lib/javaee.jar:/workspace/appserver/publish/glassfish/lib/appserv-ws.jar:/workspace/appserver/publish/glassfish/lib/mail.jar:/workspace/appserver/publish/glassfish/lib/activation.jar -j2ee.platform.wsit.classpath= -j2ee.server.instance=[/workspace/appserver/publish/glassfish]deployer:Sun:AppServer::localhost:4848 -netbeans.user=/home/bhavani/.netbeans/dev diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/private/private.xml deleted file mode 100644 index bc911590f5d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/private/private.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/project.properties deleted file mode 100644 index ac01e9bc96d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/project.properties +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -build.classes.dir=${build.dir}/jar -build.classes.excludes=**/*.java,**/*.form,**/.nbattrs -build.dir=build -build.ear.classes.dir=${build.dir}/ear-module -build.generated.dir=${build.dir}/generated -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -debug.classpath=${javac.classpath}:${build.classes.dir} -debug.test.classpath=\ - ${run.test.classpath} -dist.dir=dist -dist.ear.jar=${dist.dir}/${jar.name} -dist.jar=${dist.dir}/${jar.name} -dist.javadoc.dir=${dist.dir}/javadoc -j2ee.platform=1.5 -j2ee.server.type=J2EE -jar.compress=false -jar.name=EntApp-ejb.jar -javac.classpath= -javac.debug=true -javac.deprecation=false -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding= -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -meta.inf=${source.root}/conf -meta.inf.excludes=sun-cmp-mappings.xml -platform.active=default_platform -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.root=src -src.dir=${source.root}/java -test.src.dir=test diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/project.xml deleted file mode 100644 index 680f973bacc..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/project.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - org.netbeans.modules.j2ee.ejbjarproject - - - EntApp-ejb - 1.6 - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml deleted file mode 100644 index cb08385febb..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lefty}?xml version="1.0" encoding="UTF-8"?${righty} -${lefty}!DOCTYPE resources PUBLIC - "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN" - "${sjsas.root}/lib/dtds/sun-resources_1_2.dtd"${righty} -${lefty}resources${righty} -${lefty}/resources${righty} - - - - - - - -]]> - - - - -]]> - - - - - - - ]]> - - - - - - - - ]]> - ]]> - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml deleted file mode 100644 index 7fe97b1f333..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml +++ /dev/null @@ -1,778 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.web.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.war - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.jsp.includes - - - - - - - - - - - - - - - - - - - - Must select a file in the IDE or set jsp.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/genfiles.properties deleted file mode 100644 index c812bbe9abb..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/genfiles.properties +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -build.xml.data.CRC32=7c117a6f -build.xml.jax-ws.CRC32=80988e3f -build.xml.script.CRC32=b6f73158 -build.xml.stylesheet.CRC32=e4ec34a3 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=7c117a6f -nbproject/build-impl.xml.jax-ws.CRC32=80988e3f -nbproject/build-impl.xml.script.CRC32=e0c8c369 -nbproject/build-impl.xml.stylesheet.CRC32=73308ca4 diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/jax-ws.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/jax-ws.xml deleted file mode 100644 index 2bfa333d630..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/jax-ws.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - entapp.web.HelloWeb - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/private/private.properties deleted file mode 100644 index 9af888ca4a0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/private/private.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -deploy.ant.properties.file=/home/bhavani/.netbeans/dev/glassfish.properties -j2ee.platform.classpath=/workspace/appserver/publish/glassfish/lib/javaee.jar:/workspace/appserver/publish/glassfish/lib/jsf-impl.jar:/workspace/appserver/publish/glassfish/lib/activation.jar:/workspace/appserver/publish/glassfish/lib/appserv-tags.jar:/workspace/appserver/publish/glassfish/lib/mail.jar:/workspace/appserver/publish/glassfish/lib/appserv-jstl.jar:/workspace/appserver/publish/glassfish/lib/webservices-tools.jar:/workspace/appserver/publish/glassfish/lib/webservices-rt.jar:/workspace/appserver/publish/glassfish/lib/appserv-ws.jar -j2ee.platform.is.jsr109=true -j2ee.platform.wscompile.classpath=/workspace/appserver/publish/glassfish/lib/j2ee.jar:/workspace/appserver/publish/glassfish/lib/saaj-api.jar:/workspace/appserver/publish/glassfish/lib/saaj-impl.jar:/workspace/appserver/publish/glassfish/lib/jaxrpc-api.jar:/workspace/appserver/publish/glassfish/lib/jaxrpc-impl.jar:/workspace/appserver/publish/glassfish/lib/endorsed/jaxp-api.jar:/workspace/appserver/publish/glassfish/lib/appserv-ws.jar:/workspace/appserver/publish/glassfish/lib/webservices-tools.jar:/workspace/appserver/publish/glassfish/lib/webservices-rt.jar -j2ee.platform.wsgen.classpath=/workspace/appserver/publish/glassfish/lib/webservices-tools.jar:/workspace/appserver/publish/glassfish/lib/webservices-rt.jar:/workspace/appserver/publish/glassfish/lib/tools.jar:/workspace/appserver/publish/glassfish/lib/appserv-jstl.jar:/workspace/appserver/publish/glassfish/lib/javaee.jar:/workspace/appserver/publish/glassfish/lib/appserv-ws.jar:/workspace/appserver/publish/glassfish/lib/mail.jar:/workspace/appserver/publish/glassfish/lib/activation.jar -j2ee.platform.wsimport.classpath=/workspace/appserver/publish/glassfish/lib/webservices-tools.jar:/workspace/appserver/publish/glassfish/lib/webservices-rt.jar:/workspace/appserver/publish/glassfish/lib/tools.jar:/workspace/appserver/publish/glassfish/lib/appserv-jstl.jar:/workspace/appserver/publish/glassfish/lib/javaee.jar:/workspace/appserver/publish/glassfish/lib/appserv-ws.jar:/workspace/appserver/publish/glassfish/lib/mail.jar:/workspace/appserver/publish/glassfish/lib/activation.jar -j2ee.platform.wsit.classpath= -j2ee.server.instance=[/workspace/appserver/publish/glassfish]deployer:Sun:AppServer::localhost:4848 -user.properties.file=/home/bhavani/.netbeans/dev/build.properties diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/private/private.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/private/private.xml deleted file mode 100644 index bc911590f5d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/private/private.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/project.properties deleted file mode 100644 index c6c1769d1ea..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/project.properties +++ /dev/null @@ -1,86 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -build.classes.dir=${build.web.dir}/WEB-INF/classes -build.classes.excludes=**/*.java,**/*.form -build.dir=build -build.ear.classes.dir=${build.ear.web.dir}/WEB-INF/classes -build.ear.web.dir=${build.dir}/ear-module -build.generated.dir=${build.dir}/generated -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -build.web.dir=${build.dir}/web -build.web.excludes=${build.classes.excludes} -client.urlPart= -compile.jsps=false -conf.dir=${source.root}/conf -debug.classpath=${javac.classpath}:${build.classes.dir}:${build.ear.classes.dir} -debug.test.classpath=\ - ${run.test.classpath} -display.browser=true -dist.dir=dist -dist.ear.war=${dist.dir}/${war.ear.name} -dist.javadoc.dir=${dist.dir}/javadoc -dist.war=${dist.dir}/${war.name} -j2ee.platform=1.5 -j2ee.server.type=J2EE -jar.compress=false -javac.classpath=\ - ${reference.EntApp-ejb.dist} -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding= -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -jspcompilation.classpath=${jspc.classpath}:${javac.classpath} -lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false -platform.active=default_platform -project.EntApp-ejb=../EntApp-ejb -reference.EntApp-ejb.dist=${project.EntApp-ejb}/dist/EntApp-ejb.jar -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running class with main method -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.root=src -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=EntApp-war.war -war.name=EntApp-war.war -war.package=true -web.docbase.dir=web -webinf.dir=${web.docbase.dir}/WEB-INF diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/project.xml deleted file mode 100644 index 4392f3a1f07..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/project.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - org.netbeans.modules.web.project - - - EntApp-war - 1.6 - - - ${reference.EntApp-ejb.dist} - WEB-INF/lib - - - - - - - - - - - - - EntApp-ejb - jar - - dist - clean - dist - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml deleted file mode 100644 index cb08385febb..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lefty}?xml version="1.0" encoding="UTF-8"?${righty} -${lefty}!DOCTYPE resources PUBLIC - "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN" - "${sjsas.root}/lib/dtds/sun-resources_1_2.dtd"${righty} -${lefty}resources${righty} -${lefty}/resources${righty} - - - - - - - -]]> - - - - -]]> - - - - - - - ]]> - - - - - - - - ]]> - ]]> - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml deleted file mode 100644 index 6917e5b6862..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml +++ /dev/null @@ -1,375 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set build.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. - - - Launching ${browse.url} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/genfiles.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/genfiles.properties deleted file mode 100644 index 9c84b253d85..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/genfiles.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -build.xml.data.CRC32=552f9222 -build.xml.script.CRC32=091afd04 -build.xml.stylesheet.CRC32=978fa8b5 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=552f9222 -nbproject/build-impl.xml.script.CRC32=458a01cd -nbproject/build-impl.xml.stylesheet.CRC32=ffbde67e diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/private/private.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/private/private.properties deleted file mode 100644 index 13b860e4edc..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/private/private.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -deploy.ant.properties.file=/home/bhavani/.netbeans/dev/glassfish.properties -j2ee.appclient.tool.args=-configxml "/workspace/appserver/publish/glassfish/domains/domain1/config/sun-acc.xml" -j2ee.appclient.tool.jvmoptions=-Dcom.sun.aas.configRoot="/workspace/appserver/publish/glassfish/config" -Dcom.sun.aas.installRoot="/workspace/appserver/publish/glassfish" -Dcom.sun.aas.imqLib="/workspace/appserver/publish/glassfish/imq/lib" -Djava.security.policy="/workspace/appserver/publish/glassfish/lib/appclient/client.policy" -Djava.security.auth.login.config="/workspace/appserver/publish/glassfish/lib/appclient/appclientlogin.conf" -Djava.endorsed.dirs="/workspace/appserver/publish/glassfish/lib/endorsed" -Djavax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl -Djavax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl -Dorg.xml.sax.parser=org.xml.sax.helpers.XMLReaderAdapter -Dorg.xml.sax.driver=com.sun.org.apache.xerces.internal.parsers.SAXParser -Djava.util.logging.manager=com.sun.enterprise.server.logging.ACCLogManager -j2ee.appclient.tool.mainclass=com.sun.enterprise.appclient.Main -j2ee.appclient.tool.runtime=/workspace/appserver/publish/glassfish/lib/dom.jar:/workspace/appserver/publish/glassfish/lib/xalan.jar:/workspace/appserver/publish/glassfish/lib/xercesImpl.jar:/workspace/appserver/publish/glassfish/lib/appserv-rt.jar:/workspace/appserver/publish/glassfish/lib/javaee.jar:/workspace/appserver/publish/glassfish/lib/j2ee.jar:/workspace/appserver/publish/glassfish/lib/jmac-api.jar:/workspace/appserver/publish/glassfish/lib/appserv-ext.jar:/workspace/appserver/publish/glassfish/lib/mail.jar:/workspace/appserver/publish/glassfish/lib/activation.jar:/workspace/appserver/publish/glassfish/lib/webservices-rt.jar:/workspace/appserver/publish/glassfish/lib/webservices-tools.jar:/workspace/appserver/publish/glassfish/lib/appserv-ws.jar:/workspace/appserver/publish/glassfish/lib/jaxrpc-impl.jar:/workspace/appserver/publish/glassfish/lib/saaj-impl.jar:/workspace/appserver/publish/glassfish/lib/jaxr-impl.jar:/workspace/appserver/publish/glassfish/lib/relaxngDatatype.jar:/workspace/appserver/publish/glassfish/lib/xsdlib.jar:/workspace/appserver/publish/glassfish/lib/appserv-cmp.jar:/workspace/appserver/publish/glassfish/javadb/lib/derbyclient.jar:/workspace/appserver/publish/glassfish/lib/toplink-essentials.jar:/workspace/appserver/publish/glassfish/lib/dbschema.jar:/workspace/appserver/publish/glassfish/lib/appserv-admin.jar:/workspace/appserver/publish/glassfish/lib/install/applications/jmsra/imqjmsra.jar:/workspace/appserver/publish/glassfish/lib/fscontext.jar:/workspace/appserver/publish/glassfish/lib/dtds:/workspace/appserver/publish/glassfish/lib/schemas -j2ee.platform.classpath=/workspace/appserver/publish/glassfish/lib/javaee.jar:/workspace/appserver/publish/glassfish/lib/jsf-impl.jar:/workspace/appserver/publish/glassfish/lib/activation.jar:/workspace/appserver/publish/glassfish/lib/appserv-tags.jar:/workspace/appserver/publish/glassfish/lib/mail.jar:/workspace/appserver/publish/glassfish/lib/appserv-jstl.jar:/workspace/appserver/publish/glassfish/lib/webservices-tools.jar:/workspace/appserver/publish/glassfish/lib/webservices-rt.jar:/workspace/appserver/publish/glassfish/lib/appserv-ws.jar -j2ee.server.instance=[/workspace/appserver/publish/glassfish]deployer:Sun:AppServer::localhost:4848 -netbeans.user=/home/bhavani/.netbeans/dev -wa.copy.client.jar.from=/workspace/appserver/publish/glassfish/domains/domain1/generated/xml/j2ee-apps diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/project.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/project.properties deleted file mode 100644 index 038980a11db..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/project.properties +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -build.classes.excludes=**/*.java,**/*.form,**/.nbattrs -build.dir=build -build.generated.dir=${build.dir}/generated -client.module.uri=EntApp-war -client.urlPart= -debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath} -display.browser=true -dist.dir=dist -dist.jar=${dist.dir}/EntApp.ear -j2ee.appclient.mainclass.args=-client ${dist.jar} ${j2ee.appclient.tool.args} -j2ee.platform=1.5 -j2ee.server.type=J2EE -jar.compress=false -jar.content.additional=\ - ${reference.EntApp-ejb.dist-ear}:\ - ${reference.EntApp-war.dist-ear} -jar.name=EntApp.ear -javac.debug=true -javac.deprecation=false -javac.source=1.5 -javac.target=1.5 -meta.inf=src/conf -no.dependencies=false -platform.active=default_platform -project.EntApp-ejb=EntApp-ejb -project.EntApp-war=EntApp-war -reference.EntApp-ejb.dist-ear=${project.EntApp-ejb}/dist/EntApp-ejb.jar -reference.EntApp-war.dist-ear=${project.EntApp-war}/dist/EntApp-war.war -resource.dir=setup -source.root=. diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/project.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/project.xml deleted file mode 100644 index 710ca1e5e9f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/project.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - org.netbeans.modules.j2ee.earproject - - - EntApp - 1.6 - - - - ${reference.EntApp-ejb.dist-ear} - / - - - ${reference.EntApp-war.dist-ear} - / - - - - - - EntApp-ejb - j2ee_ear_archive - - dist-ear - clean-ear - dist-ear - - - EntApp-war - j2ee_ear_archive - - dist-ear - clean-ear - dist-ear - - - - diff --git a/appserver/tests/quicklook/cluster/clustersetup/nbproject/project.xml b/appserver/tests/quicklook/cluster/clustersetup/nbproject/project.xml deleted file mode 100644 index b7ec4576255..00000000000 --- a/appserver/tests/quicklook/cluster/clustersetup/nbproject/project.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - org.netbeans.modules.ant.freeform - - - - cluster-setup - - - - - C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java - - - - java - src - - - - - build - - - clean - - - all - - - runtest - - - clean - build - - - - - - - src - - - build.xml - - - - - - - - - - - - - - - src - ../../classes/test:/.m2/repository/org/testng/testng/5.6/testng-5.6-jdk15.jar - 1.5 - - - - diff --git a/appserver/tests/quicklook/cluster/clusterteardown/nbproject/project.xml b/appserver/tests/quicklook/cluster/clusterteardown/nbproject/project.xml deleted file mode 100644 index f1c308860aa..00000000000 --- a/appserver/tests/quicklook/cluster/clusterteardown/nbproject/project.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - org.netbeans.modules.ant.freeform - - - - cluster-teardown - - - - - C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java - - - - java - src - - - - - build - - - clean - - - all - - - runtest - - - clean - build - - - - - - - src - - - build.xml - - - - - - - - - - - - - - - src - ../../classes/test:/.m2/repository/org/testng/testng/5.6/testng-5.6-jdk15.jar - 1.5 - - - - diff --git a/appserver/tests/quicklook/cluster/helloworld/nbproject/project.xml b/appserver/tests/quicklook/cluster/helloworld/nbproject/project.xml deleted file mode 100644 index dfe5168d336..00000000000 --- a/appserver/tests/quicklook/cluster/helloworld/nbproject/project.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - org.netbeans.modules.ant.freeform - - - - cluster-helloworld - - - - - C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java - - - - java - src - - - - - build - - - clean - - - all - - - runtest - - - clean - build - - - - - - - src - - - build.xml - - - - - - - - - - - - - - - src - ../../classes/test:/.m2/repository/org/testng/testng/5.6/testng-5.6-jdk15.jar - 1.5 - - - - diff --git a/appserver/tests/v2-tests/appserv-tests/community/nbproject/private/private.xml b/appserver/tests/v2-tests/appserv-tests/community/nbproject/private/private.xml deleted file mode 100644 index d98fde4743e..00000000000 --- a/appserver/tests/v2-tests/appserv-tests/community/nbproject/private/private.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/v2-tests/appserv-tests/community/nbproject/project.xml b/appserver/tests/v2-tests/appserv-tests/community/nbproject/project.xml deleted file mode 100644 index 63aa223573d..00000000000 --- a/appserver/tests/v2-tests/appserv-tests/community/nbproject/project.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - org.netbeans.modules.ant.freeform - - - - gf-community - - - - build - - - run - - - compile-tests - - - - - - build.xml - - - - - - - - - - - - diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/build-impl.xml b/appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/build-impl.xml deleted file mode 100644 index 6578df06701..00000000000 --- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/build-impl.xml +++ /dev/null @@ -1,559 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/project.properties b/appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/project.properties deleted file mode 100644 index a9ba6344c5a..00000000000 --- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/project.properties +++ /dev/null @@ -1,72 +0,0 @@ -# -# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -application.args= -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/JmxUtils.jar -dist.javadoc.dir=${dist.dir}/javadoc -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding= -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -main.class=org.gf.jmx.utils.ReadMe -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -src.dir=src -test.src.dir=test diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/project.xml b/appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/project.xml deleted file mode 100644 index c493646e246..00000000000 --- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/project.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - org.netbeans.modules.java.j2seproject - - - JmxUtils - 1.6.5 - - - - - - - - - diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/build-impl.xml b/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/build-impl.xml deleted file mode 100644 index 8fd69bb6e89..00000000000 --- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/build-impl.xml +++ /dev/null @@ -1,559 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/genfiles.properties b/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/genfiles.properties deleted file mode 100644 index 362f80ef385..00000000000 --- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/genfiles.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -build.xml.data.CRC32=3f6010b2 -build.xml.script.CRC32=5254f966 -build.xml.stylesheet.CRC32=d5b6853a -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=3f6010b2 -nbproject/build-impl.xml.script.CRC32=48819e92 -nbproject/build-impl.xml.stylesheet.CRC32=99b91518 diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/project.properties b/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/project.properties deleted file mode 100644 index ac25acf7c22..00000000000 --- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/project.properties +++ /dev/null @@ -1,80 +0,0 @@ -# -# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -application.args= -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/ConfigViewer.jar -dist.javadoc.dir=${dist.dir}/javadoc -file.reference.appserv-admin.jar=../../gfroot/publish/glassfish/lib/appserv-admin.jar -file.reference.appserv-rt.jar=../../gfroot/publish/glassfish/lib/appserv-rt.jar -file.reference.appserv-se.jar=../../gfroot/publish/glassfish/lib/appserv-se.jar -jar.compress=false -javac.classpath=\ - ${libs.swing-layout.classpath}:\ - ${file.reference.appserv-se.jar}:\ - ${file.reference.appserv-rt.jar}:\ - ${file.reference.appserv-admin.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding= -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -main.class=NodeViewFrame -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${file.reference.appserv-rt.jar} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -src.dir=src -test.src.dir=test diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/project.xml b/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/project.xml deleted file mode 100644 index 59e18f4f121..00000000000 --- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/project.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - org.netbeans.modules.java.j2seproject - - - ConfigViewer - 1.6.5 - - - - - - - - - diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/admin/pe/nbproject/project.xml b/appserver/tests/v2-tests/appserv-tests/devtests/admin/pe/nbproject/project.xml deleted file mode 100644 index d73d1f014f5..00000000000 --- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/pe/nbproject/project.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - org.netbeans.modules.ant.freeform - - - - Admin Infrastructure Devtests - - PATH TO YOUR GF_SOURCES/bootstrap/project.properties - ../../../lib/reporter.jar - - - - - java - src - - - - - build - - - clean - - - clean - build - - - - folder - classes - build - - - - - - src - - - build.xml - - - - - - - - - - - - - src/java - $appserv-ext.jar};${appserv-deployment-client.jar};../../../lib/reporter.jar;${appserv-rt.jar};${appserv-admin.jar};${j2ee.jar};../../../lib/testng.jar - classes - 1.5 - - - - diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/admin/nbproject/project.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/admin/nbproject/project.xml deleted file mode 100644 index 2f8482c6285..00000000000 --- a/appserver/tests/v2-tests/appserv-tests/sqetests/admin/nbproject/project.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - org.netbeans.modules.ant.freeform - - - - Admin Infrastructure Quicklook - - ../../../bootstrap/project.properties - ../../lib/reporter.jar - - - - - java - src - - - - - build - - - clean - - - clean - build - - - - - - - src - - - build.xml - - - - - - - - - - - - - src/java - ${reporter.jar}:${appserv-rt.jar}:${appserv-admin.jar};${j2ee.jar} - 1.5 - - - - From fd1b5a761f073094eb67ab8044060b8863300bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 20:27:38 +0100 Subject: [PATCH 06/33] #23507 Fixed CciInteraction's compatibility with JDK17+ --- .../java/com/sun/connector/cciblackbox/CciInteraction.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteraction.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteraction.java index 8e4d4a8fd9c..513a9016e05 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteraction.java +++ b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteraction.java @@ -56,7 +56,7 @@ public void close() throws ResourceException { } - public boolean execute(InteractionSpec ispec, Record input, Record output) + public boolean execute(InteractionSpec ispec, jakarta.resource.cci.Record input, jakarta.resource.cci.Record output) throws ResourceException { if (ispec == null || (!(ispec instanceof CciInteractionSpec))) { @@ -84,7 +84,7 @@ public boolean execute(InteractionSpec ispec, Record input, Record output) * {? = call proc_name()} * 3> execute the statement and return the output in an IndexedRecord object */ - Record exec(String procName, String schema, String catalog, Record input, Record output) + jakarta.resource.cci.Record exec(String procName, String schema, String catalog, jakarta.resource.cci.Record input, jakarta.resource.cci.Record output) throws ResourceException { try { java.sql.Connection conn = ((CciConnection) connection).getManagedConnection() @@ -228,7 +228,7 @@ Record exec(String procName, String schema, String catalog, Record input, Record } } - public Record execute(InteractionSpec ispec, Record input) throws ResourceException { + public jakarta.resource.cci.Record execute(InteractionSpec ispec, jakarta.resource.cci.Record input) throws ResourceException { if (ispec == null || (!(ispec instanceof CciInteractionSpec))) { throw new ResourceException("Invalid interaction spec"); From 05fb554e187bb3a2a3c803e81ca531907c7e86f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 20:32:57 +0100 Subject: [PATCH 07/33] #23507 Fixed connector tests + compatible with JDK17 --- .../SunRaXml/cci-embedded/ejb/CoffeeBean.java | 2 +- .../connector/SunRaXml/cci/ejb/CoffeeBean.java | 14 ++++++++++---- .../connector/config/das-config.properties | 4 ++-- .../devtests/connector/config/pe-config.properties | 6 +++--- .../v3/SunRaXml/cci-embedded/client/WebTest.java | 2 +- .../v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java | 2 +- .../connector/v3/SunRaXml/cci/client/WebTest.java | 2 +- .../connector/v3/SunRaXml/cci/ejb/CoffeeBean.java | 11 ++++++++--- .../app/src/client/WebTest.java | 2 +- .../app/src/client/WebTest.java | 2 +- .../app/src/client/WebTest.java | 2 +- .../client/WebTest.java | 2 +- .../v3/connector1.5/app/src/client/WebTest.java | 2 +- .../app/src/client/WebTest.java | 2 +- .../v3/connector1.6/app/src/client/WebTest.java | 2 +- .../app/src/client/WebTest.java | 2 +- .../app/src/client/WebTest.java | 2 +- .../v3/force-deploy-rar/client/WebTest.java | 2 +- .../client/WebTest.java | 2 +- .../v3/installed-libraries/client/WebTest.java | 2 +- .../app/src/client/WebTest.java | 2 +- .../app/src/client/WebTest.java | 2 +- .../v3/rar-accessibility/client/WebTest.java | 2 +- .../connector/v3/redeployRar/client/WebTest.java | 2 +- .../devtests/connector/v3/run_test.sh | 1 - .../devtests/connector/v3/securitymapweb/build.xml | 1 + .../v3/securitymapweb/client/WebTest.java | 5 +++-- .../v3/serializabletest/client/WebTest.java | 2 +- 28 files changed, 48 insertions(+), 36 deletions(-) diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java index 7ea274d3c36..a5789ea9fb4 100644 --- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java +++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java @@ -58,7 +58,7 @@ public int getCoffeeCount() { iSpec.setFunctionName("COUNTCOFFEE"); RecordFactory rf = cf.getRecordFactory(); IndexedRecord iRec = rf.createIndexedRecord("InputRecord"); - Record oRec = ix.execute(iSpec, iRec); + jakarta.resource.cci.Record oRec = ix.execute(iSpec, iRec); Iterator iterator = ((IndexedRecord)oRec).iterator(); while(iterator.hasNext()) { Object obj = iterator.next(); diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java index e07dd2dddd5..5cd1efb16f2 100644 --- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java +++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java @@ -17,11 +17,17 @@ package com.sun.s1peqe.connector.cci; import java.math.BigDecimal; -import java.util.*; +import java.util.Iterator; import jakarta.ejb.*; -import jakarta.resource.cci.*; +import jakarta.resource.cci.Connection; +import jakarta.resource.cci.ConnectionSpec; +import jakarta.resource.cci.ConnectionFactory; +import jakarta.resource.cci.IndexedRecord; +import jakarta.resource.cci.Interaction; +import jakarta.resource.cci.RecordFactory; import jakarta.resource.ResourceException; import javax.naming.*; + import com.sun.connector.cciblackbox.*; public class CoffeeBean implements SessionBean { @@ -38,7 +44,7 @@ public void ejbCreate() throws CreateException { public void setSessionContext(SessionContext sc) { try { this.sc = sc; - Context ic = new InitialContext(); + InitialContext ic = new InitialContext(); user = (String) ic.lookup("java:comp/env/user"); password = (String) ic.lookup("java:comp/env/password"); cf = (jakarta.resource.cci.ConnectionFactory) ic.lookup("java:comp/env/eis/CCIEIS"); @@ -58,7 +64,7 @@ public int getCoffeeCount() { iSpec.setFunctionName("COUNTCOFFEE"); RecordFactory rf = cf.getRecordFactory(); IndexedRecord iRec = rf.createIndexedRecord("InputRecord"); - Record oRec = ix.execute(iSpec, iRec); + jakarta.resource.cci.Record oRec = ix.execute(iSpec, iRec); Iterator iterator = ((IndexedRecord)oRec).iterator(); while(iterator.hasNext()) { Object obj = iterator.next(); diff --git a/appserver/tests/appserv-tests/devtests/connector/config/das-config.properties b/appserver/tests/appserv-tests/devtests/connector/config/das-config.properties index 0b878274259..4d24a5147bb 100644 --- a/appserver/tests/appserv-tests/devtests/connector/config/das-config.properties +++ b/appserver/tests/appserv-tests/devtests/connector/config/das-config.properties @@ -22,10 +22,10 @@ admin.domain=domain1 admin.domain.dir=${env.S1AS_HOME}/domains activeconsumer.maxnum=1 mail.host="ha21sca.sfbay.sun.com" -http.port=8080 +http.port=${env.PORT_HTTP} http.host=localhost https.host=localhost -https.port=8181 +https.port=${env.PORT_HTTPS} orb.port=3700 admin.password=admin123 master.password=admin123 diff --git a/appserver/tests/appserv-tests/devtests/connector/config/pe-config.properties b/appserver/tests/appserv-tests/devtests/connector/config/pe-config.properties index 90e71c6a3d7..fc287c0f9b3 100644 --- a/appserver/tests/appserv-tests/devtests/connector/config/pe-config.properties +++ b/appserver/tests/appserv-tests/devtests/connector/config/pe-config.properties @@ -15,17 +15,17 @@ # execution.mode=pe -admin.port=4848 +admin.port=${env.PORT_ADMIN} admin.user=admin admin.host=localhost admin.domain=domain1 admin.domain.dir=${env.S1AS_HOME}/domains activeconsumer.maxnum=1 mail.host="ha21sca.sfbay.sun.com" -http.port=8080 +http.port=${env.PORT_HTTP} http.host=localhost https.host=localhost -https.port=8181 +https.port=${env.PORT_HTTPS} orb.port=3700 admin.password=adminadmin master.password=changeit diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/client/WebTest.java index 5cb6dadce82..5d1039463b6 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java index 0709b154b2d..48a87b35eed 100755 --- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java @@ -59,7 +59,7 @@ public int getCoffeeCount() { iSpec.setFunctionName("COUNTCOFFEE"); RecordFactory rf = cf.getRecordFactory(); IndexedRecord iRec = rf.createIndexedRecord("InputRecord"); - Record oRec = ix.execute(iSpec, iRec); + jakarta.resource.cci.Record oRec = ix.execute(iSpec, iRec); Iterator iterator = ((IndexedRecord) oRec).iterator(); while (iterator.hasNext()) { Object obj = iterator.next(); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/client/WebTest.java index 7de5b08f1d2..a59b2999934 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java index c45dd70971b..80524ce1bd6 100755 --- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java @@ -17,9 +17,14 @@ package com.sun.s1peqe.connector.cci; import java.math.BigDecimal; -import java.util.*; +import java.util.Iterator; import jakarta.ejb.*; -import jakarta.resource.cci.*; +import jakarta.resource.cci.Connection; +import jakarta.resource.cci.ConnectionSpec; +import jakarta.resource.cci.ConnectionFactory; +import jakarta.resource.cci.IndexedRecord; +import jakarta.resource.cci.Interaction; +import jakarta.resource.cci.RecordFactory; import jakarta.resource.ResourceException; import javax.naming.*; @@ -59,7 +64,7 @@ public int getCoffeeCount() { iSpec.setFunctionName("COUNTCOFFEE"); RecordFactory rf = cf.getRecordFactory(); IndexedRecord iRec = rf.createIndexedRecord("InputRecord"); - Record oRec = ix.execute(iSpec, iRec); + jakarta.resource.cci.Record oRec = ix.execute(iSpec, iRec); Iterator iterator = ((IndexedRecord) oRec).iterator(); while (iterator.hasNext()) { Object obj = iterator.next(); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/client/WebTest.java index 517b43920e1..653cef5cc5c 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS).intValue(); + int port = Integer.parseInt(portS); goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); stat.printSummary(TEST_NAME); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/client/WebTest.java index cb8ebb02ef9..3b5e0457e34 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS).intValue(); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/client/WebTest.java index 4783e5a293c..296e9bc7253 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS).intValue(); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/client/WebTest.java index 993b4bfee46..c2e35ab15a0 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = Integer.valueOf(portS); + int port = Integer.parseInt(portS); goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); stat.printSummary(TEST_NAME); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/client/WebTest.java index 4eb1b812f90..343253591c6 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS).intValue(); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/client/WebTest.java index b1f2bdb738b..e88f546512b 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS).intValue(); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/client/WebTest.java index b1f2bdb738b..e88f546512b 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS).intValue(); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/client/WebTest.java index bd4ad5ac6ba..c58887f17e6 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS).intValue(); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/client/WebTest.java index ed347547dfd..5209d1c1da0 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS).intValue(); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/client/WebTest.java index fd6c34d9537..adeceb844a8 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/client/WebTest.java @@ -37,7 +37,7 @@ public static void main(String args[]) { String versionToTest = args[3]; versionToTest = versionToTest.trim(); - int port = new Integer(portS); + int port = Integer.parseInt(portS); String name; int testVersion = Integer.valueOf(versionToTest); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/client/WebTest.java index 024c7bf4293..fcbeba4e9fc 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/client/WebTest.java @@ -37,7 +37,7 @@ public static void main(String args[]) { stat.addDescription(TEST_NAME); - int port = Integer.valueOf(portS); + int port = Integer.parseInt(portS); goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); stat.printSummary(TEST_NAME); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/client/WebTest.java index 46a99ee15d9..cdd58edc432 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = Integer.valueOf(portS); + int port = Integer.parseInt(portS); goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); stat.printSummary(TEST_NAME); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/client/WebTest.java index 718af363086..ae091cb5349 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS).intValue(); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/client/WebTest.java index 718af363086..ae091cb5349 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS).intValue(); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/client/WebTest.java index da59637702f..8b5c439f20f 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/client/WebTest.java @@ -36,7 +36,7 @@ public static void main(String args[]) { String contextRoot = args[2]; String expectedCount = args[3]; - int port = Integer.valueOf(portS); + int port = Integer.parseInt(portS); goGet(host, port, "TEST", contextRoot + "/SimpleServlet", expectedCount); stat.printSummary(TEST_NAME); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/client/WebTest.java index 7f706d51c3c..b18c034e831 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/client/WebTest.java @@ -37,7 +37,7 @@ public static void main(String args[]) { String versionToTest = args[3]; versionToTest = versionToTest.trim(); - int port = new Integer(portS); + int port = Integer.parseInt(portS); String name; int testVersion = Integer.valueOf(versionToTest); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/run_test.sh b/appserver/tests/appserv-tests/devtests/connector/v3/run_test.sh index 27a3855a4f0..5ba32e776e6 100755 --- a/appserver/tests/appserv-tests/devtests/connector/v3/run_test.sh +++ b/appserver/tests/appserv-tests/devtests/connector/v3/run_test.sh @@ -29,7 +29,6 @@ test_run(){ echo Running target: ${TARGET} time ant clean-all start-record ${TARGET} stop-record report | tee ${TEST_RUN_LOG} antStatus=${?} - cp connector.output tests-run.log ant stopDomain stopDerby } diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml index 156f70bf20c..91b964a6d1f 100755 --- a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml +++ b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml @@ -447,6 +447,7 @@ fork="true" > + diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/client/WebTest.java index aa938d97559..eeadf56051e 100755 --- a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/client/WebTest.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -33,7 +34,7 @@ public class WebTest { static String host = "localhost"; - static int port = 8080; + static int port; private static SimpleReporterAdapter status = new SimpleReporterAdapter(); @@ -44,7 +45,7 @@ public class WebTest { public static void main(String[] args) { driver = args[0]; - + port = Integer.parseInt(args[1]); status.addDescription("SecurityMap WebTest"); try { runTests(); diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/client/WebTest.java index 882493d4929..2e682db6951 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/client/WebTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/client/WebTest.java @@ -35,7 +35,7 @@ public static void main(String args[]) { String portS = args[1]; String contextRoot = args[2]; - int port = new Integer(portS).intValue(); + int port = Integer.parseInt(portS); String name; goGet(host, port, "TEST", contextRoot + "/SimpleServlet"); From a21c7ae14ce96fd89317e68ba7d7cceb8d3830bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 20:39:37 +0100 Subject: [PATCH 08/33] #23507 Tests - using ports set from the environment --- .../devtests/cdi/config/das-config.properties | 4 ++-- .../appserv-tests/devtests/cdi/config/pe-config.properties | 7 +++---- .../devtests/jdbc/config/das-config.properties | 4 ++-- .../devtests/jdbc/config/pe-config.properties | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/appserver/tests/appserv-tests/devtests/cdi/config/das-config.properties b/appserver/tests/appserv-tests/devtests/cdi/config/das-config.properties index e0f75f71dab..6d9e55a5624 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/config/das-config.properties +++ b/appserver/tests/appserv-tests/devtests/cdi/config/das-config.properties @@ -23,10 +23,10 @@ admin.domain=domain1 admin.domain.dir=${env.S1AS_HOME}/domains activeconsumer.maxnum=1 mail.host="ha21sca.sfbay.sun.com" -http.port=8080 +http.port=${env.PORT_HTTP} http.host=localhost https.host=localhost -https.port=8181 +https.port=${env.PORT_HTTPS} orb.port=3700 admin.password=admin123 master.password=admin123 diff --git a/appserver/tests/appserv-tests/devtests/cdi/config/pe-config.properties b/appserver/tests/appserv-tests/devtests/cdi/config/pe-config.properties index 4e1e6fce3a0..fc287c0f9b3 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/config/pe-config.properties +++ b/appserver/tests/appserv-tests/devtests/cdi/config/pe-config.properties @@ -14,19 +14,18 @@ # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 # - execution.mode=pe -admin.port=4848 +admin.port=${env.PORT_ADMIN} admin.user=admin admin.host=localhost admin.domain=domain1 admin.domain.dir=${env.S1AS_HOME}/domains activeconsumer.maxnum=1 mail.host="ha21sca.sfbay.sun.com" -http.port=8080 +http.port=${env.PORT_HTTP} http.host=localhost https.host=localhost -https.port=8181 +https.port=${env.PORT_HTTPS} orb.port=3700 admin.password=adminadmin master.password=changeit diff --git a/appserver/tests/appserv-tests/devtests/jdbc/config/das-config.properties b/appserver/tests/appserv-tests/devtests/jdbc/config/das-config.properties index 44a25aea95f..23a83e935c1 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/config/das-config.properties +++ b/appserver/tests/appserv-tests/devtests/jdbc/config/das-config.properties @@ -22,10 +22,10 @@ admin.domain=domain1 admin.domain.dir=${env.S1AS_HOME}/domains activeconsumer.maxnum=1 mail.host="ha21sca.sfbay.sun.com" -http.port=8080 +http.port=${env.PORT_HTTP} http.host=localhost https.host=localhost -https.port=8181 +https.port=${env.PORT_HTTPS} orb.port=3700 admin.password=admin123 appserver.instance.name=server diff --git a/appserver/tests/appserv-tests/devtests/jdbc/config/pe-config.properties b/appserver/tests/appserv-tests/devtests/jdbc/config/pe-config.properties index 0d510ba87b6..86bb74115b8 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/config/pe-config.properties +++ b/appserver/tests/appserv-tests/devtests/jdbc/config/pe-config.properties @@ -15,17 +15,17 @@ # execution.mode=pe -admin.port=4848 +admin.port=${env.PORT_ADMIN} admin.user=admin admin.host=localhost admin.domain=domain1 admin.domain.dir=${env.S1AS_HOME}/domains activeconsumer.maxnum=1 mail.host="ha21sca.sfbay.sun.com" -http.port=8080 +http.port=${env.PORT_HTTP} http.host=localhost https.host=localhost -https.port=8181 +https.port=${env.PORT_HTTPS} orb.port=3700 admin.password=admin123 appserver.instance.name=server From 7aea3814f8ebd90abccb41b9c875e9248aba1f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 20:46:40 +0100 Subject: [PATCH 09/33] #23507 Using wsgen instead of wscompile --- appserver/tests/appserv-tests/config/properties.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appserver/tests/appserv-tests/config/properties.xml b/appserver/tests/appserv-tests/config/properties.xml index 547ce79141c..fd0f4928b72 100644 --- a/appserver/tests/appserv-tests/config/properties.xml +++ b/appserver/tests/appserv-tests/config/properties.xml @@ -171,7 +171,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password} - + @@ -196,7 +196,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password} - + From ab3f59c259a85c08b1198db4882032584ef07597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 20:50:47 +0100 Subject: [PATCH 10/33] #23507 CDI Tests: Removed generated classes --- .../deployment-option/client/Client.java | 75 --------------- .../simple-ejb-cdi/client/Client.java | 93 ------------------- 2 files changed, 168 deletions(-) delete mode 100644 appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java deleted file mode 100644 index 94cf55ec294..00000000000 --- a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2008, 2021 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - - -import java.io.*; -import java.util.*; -import jakarta.ejb.EJB; -import javax.naming.InitialContext; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public static void main (String[] args) { - - stat.addDescription("simple-ejb-implicit-cdi-deployment-opt"); - Client client = new Client(args); - client.doTest(); - stat.printSummary("simple-ejb-implicit-cdi-deployment-opt"); - } - - public Client (String[] args) { - } - - private static @EJB(mappedName="Sless") Sless sless; - - public void doTest() { - - try { - - System.out.println("Creating InitialContext()"); - InitialContext ic = new InitialContext(); - org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) ic.lookup("java:comp/ORB"); - Sless sless = (Sless) ic.lookup("Sless"); - - String response = null; - - response = sless.hello(); - testResponse("invoking stateless", response); - - System.out.println("test complete"); - - stat.addStatus("local main", stat.PASS); - - } catch(Exception e) { - e.printStackTrace(); - stat.addStatus("local main" , stat.FAIL); - } - - return; - } - - private void testResponse(String testDescription, String response){ - // Expecting a null response because the injection should fail since implicit bean discovery - // is disabled by the deployment property implicitCdiEnabled=false - stat.addStatus(testDescription, (response == null ? stat.PASS : stat.FAIL)); - } - -} - diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java deleted file mode 100644 index c266aa3e232..00000000000 --- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2008, 2021 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ -import test.*; -import java.io.*; -import java.util.*; -import jakarta.ejb.EJB; -import javax.naming.InitialContext; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class Client { - - private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests"); - - public static void main(String[] args) { - stat.addDescription("simple-ejb-implicit-cdi"); - Client client = new Client(args); - client.doTest(); - stat.printSummary("simple-ejb-implicit-cdi"); - } - - public Client(String[] args) { - } - - @EJB(mappedName = "test.Foo#test.Foo") - private static Foo sless; - - // - // NOTE: Token 3700 will be replaced in @EJB annotations below - // with the value of the port from config.properties during the build - // - @EJB(mappedName = "corbaname:iiop:localhost:3700#test.Foo") - private static Foo sless2; - - @EJB(mappedName = "corbaname:iiop:localhost:3700#java:global/simple-ejb-implicit-cdiApp/simple-ejb-implicit-cdi-ejb/SlessEJB!test.Foo") - private static Foo sless3; - - public void doTest() { - - try { - System.out.println("Creating InitialContext()"); - InitialContext initialContext = new InitialContext(); - org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) initialContext.lookup("java:comp/ORB"); - Foo sless = (Foo) initialContext.lookup("test.Foo#test.Foo"); - - String response = sless.hello(); - testResponse("invoking stateless", response); - - response = sless2.hello(); - testResponse("invoking stateless2", response); - - System.out.println("ensuring that sless1 and sless2 are not equal"); - if (!sless.equals(sless2)) { - stat.addStatus("ensuring that sless1 and sless2 are not equal", stat.FAIL); - throw new Exception("invalid equality checks on same " + "sless session beans"); - } - - response = sless3.hello(); - testResponse("invoking stateless3", response); - - System.out.println("test complete"); - - stat.addStatus("local main", stat.PASS); - - } catch (Exception e) { - e.printStackTrace(); - stat.addStatus("local main", stat.FAIL); - } - - return; - } - - private void testResponse(String testDescription, String response) { - if (response.equals("hello")) { - stat.addStatus(testDescription, stat.PASS); - } else { - stat.addStatus(testDescription, stat.FAIL); - } - } - -} From d7afb80a8dab1a6039dd98e9d886bbd4b287f651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 21:15:11 +0100 Subject: [PATCH 11/33] #23507 Deployment tests reenabled + deleted tests not easily repairable --- .../simple-wab-with-cdi/build.properties | 26 - .../devtests/deployment/annotation/README | 74 -- .../deployment/annotation/appclient/build.xml | 73 -- .../goldenfiles/application-client.xml | 39 - .../src/AppClientAnnotationTest.java | 29 - .../annotation/appclient/src/Client.java | 29 - .../annotation/appclient/src/SFHello.java | 23 - .../devtests/deployment/annotation/build.xml | 46 - .../deployment/annotation/ejb/build.xml | 73 -- .../annotation/ejb/goldenfiles/ejb-jar.xml | 312 ------- .../annotation/ejb/src/EjbAnnotationTest.java | 23 - .../annotation/ejb/src/InterceptorA.java | 38 - .../annotation/ejb/src/InterceptorB.java | 36 - .../annotation/ejb/src/SFHello.java | 23 - .../annotation/ejb/src/SLHello.java | 26 - .../annotation/ejb/src/StatefulTest1.java | 39 - .../annotation/ejb/src/StatefulTest2.java | 31 - .../annotation/ejb/src/StatelessTest1.java | 56 -- .../annotation/ejb/src/StatelessTest2.java | 52 -- .../annotation/inheritance/build.xml | 72 -- .../inheritance/goldenfiles/ejb-jar.xml | 433 ---------- .../src/InheritanceAnnotationTest.java | 23 - .../annotation/inheritance/src/SFHello.java | 27 - .../annotation/inheritance/src/SFHello1.java | 27 - .../inheritance/src/StatefulTest.java | 79 -- .../inheritance/src/StatefulTest1.java | 65 -- .../inheritance/src/StatefulTest2.java | 62 -- .../devtests/deployment/annotation/web/README | 9 - .../deployment/annotation/web/build.xml | 80 -- .../annotation/web/goldenfiles/web.xml | 57 -- .../annotation/web/src/SFHello.java | 23 - .../annotation/web/src/ServletTest.java | 48 -- .../annotation/web/src/WebAnnotationTest.java | 29 - .../devtests/deployment/autodeploy/build.xml | 68 -- .../deployment/autodeploy/simple/build.xml | 134 --- .../deployment/autodeploy/slowCopy/build.xml | 211 ----- .../autodeploy/util/AutoDeployMonitor.java | 257 ------ .../deployment/autodeploy/util/SlowCopy.java | 155 ---- .../deployment/autodeploy/util/build.xml | 50 -- .../deployment/autodeploy/util/util.xml | 158 ---- .../autodeploy/withEJB/AutoDeployMonitor.java | 257 ------ .../deployment/autodeploy/withEJB/build.xml | 366 -------- .../devtests/deployment/build.xml | 105 +-- .../devtests/deployment/config/common.xml | 92 +- .../descriptor_free_zone/ear/build.xml | 6 - .../descriptor_free_zone/ear/no_appxml/README | 5 - .../ear/no_appxml/build.xml | 180 ---- .../ear/no_appxml/client/Client.java | 65 -- .../ear/no_appxml/client/MANIFEST.MF | 3 - .../ear/no_appxml/ejb/MANIFEST.MF | 3 - .../ear/no_appxml/ejb/Sful.java | 24 - .../ear/no_appxml/ejb/SfulEJB.java | 31 - .../ear/no_appxml/ejb/Sless.java | 24 - .../ear/no_appxml/ejb/SlessEJB.java | 32 - .../ear/no_appxml/util/Util.java | 23 - .../ear/no_appxml_2/README | 7 - .../ear/no_appxml_2/build.xml | 190 ----- .../ear/no_appxml_2/client/Client.java | 90 -- .../ear/no_appxml_2/client/MANIFEST.MF | 3 - .../ear/no_appxml_2/ejb/MANIFEST.MF | 3 - .../ear/no_appxml_2/ejb/Sful.java | 24 - .../ear/no_appxml_2/ejb/SfulEJB.java | 31 - .../ear/no_appxml_2/ejb/Sless.java | 24 - .../ear/no_appxml_2/ejb/SlessEJB.java | 32 - .../ear/no_appxml_2/util/Util.java | 23 - .../ear/no_appxml_2/web/index.html | 30 - .../ear/no_appxml_2/web/web.xml | 22 - .../deployment/ear/appmgt/application.xml | 29 - .../devtests/deployment/ear/appmgt/build.xml | 408 --------- .../devtests/deployment/ear/appmgt/web.xml | 48 -- .../devtests/deployment/ear/build.xml | 50 +- .../deployment/ear/earwithall/application.xml | 32 - .../deployment/ear/earwithall/build.xml | 254 ------ .../ear/earwithall/config-interface.xml | 29 - .../deployment/ear/earwithall/ejb-jar.xml | 45 - .../ear/earwithall/helloservice/SayHello.java | 33 - .../earwithall/helloservice/SayHelloImpl.java | 55 -- .../ear/earwithall/portable-app.xml | 32 - .../statelesshello/Statelesshello.java | 27 - .../statelesshello/StatelesshelloEJB.java | 50 -- .../statelesshello/StatelesshelloHome.java | 31 - .../staticstubclient/SayHelloClient.java | 53 -- .../deployment/ear/earwithall/sun-ejb-jar.xml | 29 - .../deployment/ear/earwithall/sun-web.xml | 26 - .../deployment/ear/earwithall/web.xml | 41 - .../deployment/ear/earwithall/webservices.xml | 40 - .../ear/earwithall2/TestClient.java | 102 --- .../ear/earwithall2/TestDeplOrder.java | 92 -- .../ear/earwithall2/TestDeplOrder2.java | 99 --- .../ear/earwithall2/application-client.xml | 29 - .../ear/earwithall2/application.xml | 39 - .../deployment/ear/earwithall2/build.xml | 559 ------------- .../deployment/ear/earwithall2/ejb-jar.xml | 112 --- .../glassfish-application-client.xml | 26 - .../ear/earwithall2/glassfish-application.xml | 23 - .../ear/earwithall2/glassfish-ejb-jar.xml | 29 - .../ear/earwithall2/glassfish-web.xml | 27 - .../ear/earwithall2/justbean/JustBean.java | 31 - .../earwithall2/justbean/JustBeanHome.java | 29 - .../earwithall2/justbean/JustSessionBean.java | 98 --- .../ear/earwithall2/justbean/Log.java | 26 - .../earwithall2/justclient/JustClient.java | 52 -- .../earwithall2/justweb/JustWebServlet.java | 89 -- .../ear/earwithall2/portable.application.xml | 39 - .../deployment/ear/earwithall2/web.xml | 38 - .../ear/earwithall2/weba/glassfish-web.xml | 27 - .../deployment/ear/earwithall2/weba/web.xml | 38 - .../ear/earwithall2/webb/glassfish-web.xml | 27 - .../deployment/ear/earwithall2/webb/web.xml | 38 - .../ear/earwithall2/webc/glassfish-web.xml | 27 - .../deployment/ear/earwithall2/webc/web.xml | 38 - .../deployment/ear/earwithejb/alt-ejbjar.xml | 71 -- .../deployment/ear/earwithejb/application.xml | 27 - .../deployment/ear/earwithejb/build.xml | 267 ------ .../deployment/ear/earwithejb/ejb-jar.xml | 71 -- .../ear/earwithejb/portable-app.xml | 26 - .../ear/earwithejb/sun-alt-ejbjar.xml | 29 - .../deployment/ear/earwithejb/sun-ejb-jar.xml | 29 - .../ear/earwithwar/altapplication.xml | 29 - .../deployment/ear/earwithwar/application.xml | 29 - .../deployment/ear/earwithwar/build.xml | 276 ------ .../ear/earwithwar/portable-app.xml | 29 - .../deployment/ear/earwithwar/sun-web.xml | 28 - .../deployment/ear/libClassPath/build.xml | 2 +- .../ear/libClassPath/misc/build.xml | 2 +- .../ear/manifestClassPath/build.xml | 2 +- .../ear/manifestClassPath/misc/build.xml | 2 +- .../deployment/ear/uniquecr/application.xml | 29 - .../deployment/ear/uniquecr/build.xml | 202 ----- .../deployment/ear/uniquecr/portable-app.xml | 29 - .../deployment/ear/uniquecr/sun-web.xml | 28 - .../wstoejb/appclient/application-client.xml | 34 - .../ear/wstoejb/appclient/build.xml | 67 -- .../appclient/sun-application-client.xml | 26 - .../wstoejb/appclient/wscompile_config.xml | 25 - .../ear/wstoejb/appclient/wstoejb/Client.java | 54 -- .../deployment/ear/wstoejb/application.xml | 35 - .../devtests/deployment/ear/wstoejb/build.xml | 204 ----- .../deployment/ear/wstoejb/ejb/build.xml | 52 -- .../deployment/ear/wstoejb/ejb/ejb-jar.xml | 35 - .../ear/wstoejb/ejb/sun-ejb-jar.xml | 29 - .../ejb/wstoejb/StatefulSessionBean.java | 36 - .../ejb/wstoejb/StatefulSessionBeanEJB.java | 56 -- .../ejb/wstoejb/StatefulSessionBeanHome.java | 32 - .../deployment/ear/wstoejb/portable-app.xml | 35 - .../deployment/ear/wstoejb/war/build.xml | 69 -- .../ear/wstoejb/war/config-interface.xml | 29 - .../deployment/ear/wstoejb/war/sun-web.xml | 23 - .../deployment/ear/wstoejb/war/web.xml | 41 - .../ear/wstoejb/war/webservices.xml | 40 - .../war/wstoejb/WebServiceToEjbSEI.java | 35 - .../war/wstoejb/WebServiceToEjbServlet.java | 65 -- .../devtests/deployment/ejb/build.xml | 36 - .../statelesshello/StatelessHelloTest.java | 166 ---- .../deployment/ejb/statelesshello/build.xml | 228 ----- .../deployment/ejb/statelesshello/ejb-jar.xml | 71 -- .../standaloneclient/HelloClient.java | 104 --- .../statelesshello/Statelesshello.java | 28 - .../statelesshello/StatelesshelloEJB.java | 98 --- .../StatelesshelloException.java | 27 - .../statelesshello/StatelesshelloHome.java | 31 - .../ejb/statelesshello/sun-ejb-jar.xml | 29 - .../deployment/ejb/webservice/build.xml | 224 ----- .../ejb/webservice/config-interface.xml | 29 - .../deployment/ejb/webservice/ejb-jar.xml | 32 - .../ejb/webservice/helloservice/SayHello.java | 25 - .../webservice/helloservice/SayHelloEJB.java | 41 - .../staticstubclient/SayHelloClient.java | 48 -- .../deployment/ejb/webservice/sun-ejb-jar.xml | 33 - .../deployment/ejb/webservice/webservices.xml | 40 - .../ejb30/ear/mdb/webclient/build.xml | 2 +- .../deployment/jsr88/apitests/TestClient.java | 290 ------- .../jsr88/apitests/TestJSR88Concurrency.java | 408 --------- .../deployment/jsr88/apitests/build.xml | 211 ----- .../devtests/deployment/jsr88/build.xml | 41 - .../jsr88/deploymentmanager/build.xml | 38 - .../deploymentmanager/distribute/build.xml | 41 - .../DeployTargetModuleIDTester.java | 189 ----- .../distribute/childtargetmoduleid/build.xml | 63 -- .../ClientConfigurationTester.java | 175 ---- .../distribute/clientconfiguration/build.xml | 63 -- .../getweburl/DeployGetWebUrlTester.java | 177 ---- .../distribute/getweburl/build.xml | 63 -- .../deploymentmanager/getXModules/build.xml | 34 - .../childtmid/ChildTargetModuleIDTester.java | 240 ------ .../getXModules/childtmid/build.xml | 63 -- .../devtests/deployment/jsr88/ear/build.xml | 34 - .../misc/META-INF/application-client.xml | 22 - .../misc/META-INF/sun-application-client.xml | 21 - .../jsr88/misc/SimpleJSR88Client.java | 198 ----- .../jsr88/misc/TestOpenJarFileWorkaround.java | 182 ---- .../jsr88/misc/TestProgressObjectImpl.java | 173 ---- .../devtests/deployment/jsr88/misc/build.xml | 232 ------ .../cb/common/build.xml | 53 -- .../cb/common/src/com/sun/cb/AddressBean.java | 72 -- .../src/com/sun/cb/CoffeeBreak.properties | 22 - .../src/com/sun/cb/ConfirmationBean.java | 50 -- .../common/src/com/sun/cb/CustomerBean.java | 72 -- .../cb/common/src/com/sun/cb/DateHelper.java | 212 ----- .../common/src/com/sun/cb/LineItemBean.java | 62 -- .../cb/common/src/com/sun/cb/OrderBean.java | 82 -- .../common/src/com/sun/cb/PriceItemBean.java | 51 -- .../common/src/com/sun/cb/PriceListBean.java | 63 -- .../cb/common/src/com/sun/cb/URLHelper.java | 70 -- .../cb/jaxrpc/build.properties | 55 -- .../cb/jaxrpc/build.xml | 289 ------- .../cb/jaxrpc/conf/client-start-wsdl.xml | 24 - .../cb/jaxrpc/conf/server-start-wsdl.xml | 24 - .../cb/jaxrpc/conf/start-interface.xml | 35 - .../cb/jaxrpc/config-interface.xml | 35 - .../cb/jaxrpc/config-wsdl.xml | 24 - .../src/client/com/sun/cb/OrderCaller.java | 50 -- .../src/client/com/sun/cb/PriceFetcher.java | 40 - .../client/com/sun/cb/TestOrderCaller.java | 49 -- .../client/com/sun/cb/TestPriceFetcher.java | 44 - .../com/sun/cb/CoffeeRegistry.properties | 32 - .../registry/com/sun/cb/JAXRPublisher.java | 223 ----- .../src/registry/com/sun/cb/JAXRRemover.java | 175 ---- .../src/registry/com/sun/cb/OrgPublisher.java | 54 -- .../src/registry/com/sun/cb/OrgRemover.java | 60 -- .../server/com/sun/cb/ContextListener.java | 86 -- .../src/server/com/sun/cb/PriceLoader.java | 53 -- .../src/server/com/sun/cb/SupplierIF.java | 27 - .../src/server/com/sun/cb/SupplierImpl.java | 54 -- .../com/sun/cb/SupplierPrices.properties | 21 - .../src/server/com/sun/cb/TestText.txt.txt | 1 - .../cb/provided-wars/cbserver.war | Bin 85925 -> 0 bytes .../jaxrpc-coffee-distributor.war | Bin 20802 -> 0 bytes .../cb/provided-wars/saaj-coffee-supplier.war | Bin 5494 -> 0 bytes .../cb/saaj/build.properties | 26 - .../exampleFromJ2EETutorial/cb/saaj/build.xml | 123 --- .../cb/saaj/dtds/coffee-order.dtd | 42 - .../cb/saaj/dtds/coffee-order.xml | 75 -- .../cb/saaj/dtds/confirm.dtd | 24 - .../cb/saaj/dtds/confirm.xml | 31 - .../cb/saaj/dtds/price-list.dtd | 25 - .../cb/saaj/dtds/price-list.xml | 44 - .../cb/saaj/dtds/request-prices.dtd | 22 - .../cb/saaj/dtds/request-prices.xml | 27 - .../src/com/sun/cb/ConfirmationServlet.java | 193 ----- .../cb/saaj/src/com/sun/cb/OrderRequest.java | 159 ---- .../saaj/src/com/sun/cb/PriceListRequest.java | 122 --- .../saaj/src/com/sun/cb/PriceListServlet.java | 204 ----- .../saaj/src/com/sun/cb/TestOrderRequest.java | 156 ---- .../src/com/sun/cb/TestPriceListRequest.java | 90 -- .../cb/server/build.properties | 22 - .../cb/server/build.xml | 79 -- .../src/com/sun/cb/CheckoutFormBean.java | 328 -------- .../cb/server/src/com/sun/cb/Dispatcher.java | 149 ---- .../src/com/sun/cb/JAXRQueryByName.java | 198 ----- .../src/com/sun/cb/OrderConfirmation.java | 38 - .../src/com/sun/cb/OrderConfirmations.java | 45 - .../src/com/sun/cb/RetailPriceItem.java | 76 -- .../src/com/sun/cb/RetailPriceList.java | 120 --- .../com/sun/cb/RetailPriceListServlet.java | 47 -- .../server/src/com/sun/cb/ShoppingCart.java | 69 -- .../src/com/sun/cb/ShoppingCartItem.java | 69 -- .../src/com/sun/cb/messages/CBMessages.java | 74 -- .../com/sun/cb/messages/CBMessages_en.java | 74 -- .../server/src/com/sun/cb/template/Debug.java | 55 -- .../src/com/sun/cb/template/Definition.java | 29 - .../com/sun/cb/template/DefinitionTag.java | 65 -- .../src/com/sun/cb/template/InsertTag.java | 70 -- .../src/com/sun/cb/template/Parameter.java | 41 - .../src/com/sun/cb/template/ParameterTag.java | 60 -- .../src/com/sun/cb/template/ScreenTag.java | 51 -- .../cb/server/web/banner.jsp | 29 - .../cb/server/web/banner.txt | 29 - .../cb/server/web/checkoutAck.jsp | 54 -- .../cb/server/web/checkoutAck.txt | 54 -- .../cb/server/web/checkoutForm.jsp | 127 --- .../cb/server/web/checkoutForm.txt | 128 --- .../cb/server/web/errorpage.jsp | 42 - .../cb/server/web/errorpage.txt | 42 - .../cb/server/web/orderForm.jsp | 74 -- .../cb/server/web/orderForm.txt | 73 -- .../cb/server/web/template/banner.jsp | 29 - .../cb/server/web/template/banner.txt | 29 - .../cb/server/web/template/coffeebean.jpg | Bin 2554 -> 0 bytes .../cb/server/web/template/errorinclude.jsp | 36 - .../cb/server/web/template/prelude.jspf | 22 - .../server/web/template/screendefinitions.jsp | 45 - .../server/web/template/screendefinitions.txt | 45 - .../cb/server/web/template/template.jsp | 31 - .../cb/server/web/template/template.txt | 32 - .../cb/server/web/tutorial-template.tld | 87 -- .../common/build.properties | 45 - .../common/targets.xml | 70 -- .../deployment/jsr88/tester/Deployer.java | 101 --- .../deployment/jsr88/tester/build.xml | 41 - .../devtests/deployment/jsr88/war/build.xml | 34 - .../jsr88/war/simple/Simple_Page.html | 35 - .../deployment/jsr88/war/simple/build.xml | 114 --- .../deployment/jsr88/war/simple/sun-web.xml | 23 - .../deployment/jsr88/war/simple/web.xml | 25 - .../devtests/deployment/osgi/simple/build.xml | 2 +- .../deployment/util/JSR88Deployer.java | 787 ------------------ .../deployment/util/AnnotationTest.java | 238 ------ .../util/DescriptorContentComparator.java | 380 --------- .../deployment/util/LogFormatter.java | 42 - .../util/StandaloneErrorHandler.java | 63 -- .../deployment/util/StandaloneProcessor.java | 294 ------- .../util/devtests/deployment/util/Utils.java | 59 -- .../deployment/versioning/basic-scenarios.xml | 64 -- .../META-INF/glassfish-application-client.xml | 2 +- .../META-INF/glassfish-application.xml | 2 +- .../versioning/simple-versioned-ear/build.xml | 107 ++- .../META-INF/glassfish-ejb-jar.xml | 2 +- .../versioning/versioning-common.xml | 39 - .../war/appmgt/appmgttest/EnvEntryInfo.java | 117 --- .../war/appmgt/appmgttest/ParamInfo.java | 114 --- .../war/appmgt/appmgttest/TestClient.java | 180 ---- .../war/appmgt/appmgttest/TestServlet.java | 119 --- .../devtests/deployment/war/appmgt/build.xml | 405 --------- .../deployment/war/appmgt/sun-web.xml | 29 - .../devtests/deployment/war/appmgt/web.xml | 48 -- .../devtests/deployment/war/build.xml | 22 +- .../deployment/war/deploydir/build.xml | 2 +- .../deployment/war/htmlonly/TestClient.java | 102 --- .../deployment/war/htmlonly/build.xml | 238 ------ .../deployment/war/htmlonly/index.html | 30 - .../deployment/war/htmlonly/sun-web.xml | 28 - .../devtests/deployment/war/htmlonly/web.xml | 28 - .../deployment/war/jsponly/TestClient.java | 102 --- .../devtests/deployment/war/jsponly/build.xml | 218 ----- .../deployment/war/jsponly/glassfish-web.xml | 28 - .../deployment/war/jsponly/header.jsp | 27 - .../devtests/deployment/war/jsponly/index.jsp | 31 - .../devtests/deployment/war/jsponly/web.xml | 28 - .../war/nojarexpansion/TestClient.java | 102 --- .../war/nojarexpansion/TestProp.xml | 40 - .../war/nojarexpansion/TestServlet.java | 63 -- .../deployment/war/nojarexpansion/build.xml | 271 ------ .../war/nojarexpansion/dummylib/DummyLib.java | 26 - .../deployment/war/nojarexpansion/sun-web.xml | 28 - .../deployment/war/nojarexpansion/web.xml | 37 - .../deployment/war/rollingupgrade/README | 37 - .../war/servletonly/META-INF/MANIFEST.MF | 4 - .../war/servletonly/TestClient.java | 124 --- .../war/servletonly/TestServlet.java | 86 -- .../war/servletonly/alt-glassfish-web.xml | 28 - .../deployment/war/servletonly/build.xml | 404 --------- .../war/servletonly/glassfish-web.xml | 28 - .../deployment/war/servletonly/sun-web.xml | 28 - .../deployment/war/servletonly/web.xml | 47 -- .../deployment/war/virtualserver/build.xml | 2 +- .../deployment/war/webinflib/TestClient.java | 102 --- .../deployment/war/webinflib/TestServlet.java | 63 -- .../deployment/war/webinflib/build.xml | 235 ------ .../war/webinflib/dummylib/DummyLib.java | 26 - .../deployment/war/webinflib/sun-web.xml | 28 - .../devtests/deployment/war/webinflib/web.xml | 37 - .../deployment/war/webservices/build.xml | 34 - .../war/webservices/helloservice/build.xml | 219 ----- .../helloservice/config-interface.xml | 29 - .../helloservice/helloservice/SayHello.java | 33 - .../helloservice/SayHelloImpl.java | 28 - .../staticstubclient/SayHelloClient.java | 53 -- .../war/webservices/helloservice/sun-web.xml | 23 - .../war/webservices/helloservice/web.xml | 34 - .../webservices/helloservice/webservices.xml | 40 - .../webservices/annotations-common.xml | 197 ++--- .../webservices/noinf/client/Client.java | 3 +- 363 files changed, 229 insertions(+), 27504 deletions(-) delete mode 100644 appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/README delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/goldenfiles/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/AppClientAnnotationTest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/SFHello.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/EjbAnnotationTest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/SFHello.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/SLHello.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/InheritanceAnnotationTest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/SFHello.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/SFHello1.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/web/README delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/web/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/web/goldenfiles/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/SFHello.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/WebAnnotationTest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/autodeploy/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/autodeploy/simple/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/autodeploy/slowCopy/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/AutoDeployMonitor.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/SlowCopy.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/util.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/AutoDeployMonitor.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/README delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/Sful.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/Sless.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/util/Util.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/README delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/Sful.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/Sless.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/util/Util.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/web/index.html delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/web/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHello.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/portable-app.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/staticstubclient/SayHelloClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder2.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/Log.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justclient/JustClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justweb/JustWebServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/portable.application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/weba/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/weba/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webb/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webb/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webc/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webc/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/alt-ejbjar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/portable-app.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/sun-alt-ejbjar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/altapplication.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/portable-app.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/portable-app.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wscompile_config.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wstoejb/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/portable-app.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbSEI.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/StatelessHelloTest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloException.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHello.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/staticstubclient/SayHelloClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestJSR88Concurrency.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/DeployTargetModuleIDTester.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/ClientConfigurationTester.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/DeployGetWebUrlTester.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/ChildTargetModuleIDTester.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/ear/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/META-INF/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/META-INF/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/SimpleJSR88Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestOpenJarFileWorkaround.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestProgressObjectImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/AddressBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CoffeeBreak.properties delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/ConfirmationBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CustomerBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/DateHelper.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/LineItemBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/OrderBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/PriceItemBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/PriceListBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/URLHelper.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/client-start-wsdl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/server-start-wsdl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/start-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-wsdl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/OrderCaller.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/PriceFetcher.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestOrderCaller.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestPriceFetcher.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/CoffeeRegistry.properties delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRPublisher.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRRemover.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgPublisher.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgRemover.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/ContextListener.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/PriceLoader.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierIF.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierPrices.properties delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/TestText.txt.txt delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/cbserver.war delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/jaxrpc-coffee-distributor.war delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/saaj-coffee-supplier.war delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.dtd delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.dtd delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.dtd delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.dtd delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/ConfirmationServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/OrderRequest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListRequest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestOrderRequest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestPriceListRequest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/CheckoutFormBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/Dispatcher.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/JAXRQueryByName.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmation.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmations.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceItem.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceList.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceListServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCart.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCartItem.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/messages/CBMessages.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/messages/CBMessages_en.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Debug.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Definition.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/DefinitionTag.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/InsertTag.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Parameter.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ParameterTag.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ScreenTag.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/banner.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/banner.txt delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutAck.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutAck.txt delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutForm.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutForm.txt delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/errorpage.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/errorpage.txt delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/orderForm.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/orderForm.txt delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/banner.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/banner.txt delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/coffeebean.jpg delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/errorinclude.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/prelude.jspf delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/screendefinitions.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/screendefinitions.txt delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/template.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/template.txt delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/tutorial-template.tld delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/targets.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/Deployer.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/war/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/Simple_Page.html delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/util/JSR88Deployer.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/AnnotationTest.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/DescriptorContentComparator.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/LogFormatter.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneErrorHandler.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneProcessor.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/Utils.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/EnvEntryInfo.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/ParamInfo.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/appmgt/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/appmgt/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/appmgt/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/TestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/index.html delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/jsponly/TestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/jsponly/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/jsponly/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/jsponly/header.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/jsponly/index.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/jsponly/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestProp.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/dummylib/DummyLib.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/rollingupgrade/README delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/servletonly/META-INF/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/servletonly/alt-glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/servletonly/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/servletonly/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/servletonly/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/servletonly/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webinflib/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webinflib/dummylib/DummyLib.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webinflib/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webinflib/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webservices/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHello.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHelloImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/staticstubclient/SayHelloClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/webservices.xml diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties deleted file mode 100644 index 0f8adf8dc87..00000000000 --- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/README b/appserver/tests/appserv-tests/devtests/deployment/annotation/README deleted file mode 100644 index aa903d8f75d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/README +++ /dev/null @@ -1,74 +0,0 @@ -How to add a new annotation test using Junit -============================================ -There are two ways to add new tests to annotation: -A. Add a new test by using golden files comparison: --------------------------------------------------- -1. make a new dir appserv-tests/deployment/annotation/ -2. cp annotation/ejb/build.xml -3. modify ant project name in build.xml and test name under junit -4. create java files (ejbs, etc) for annotation testing in - /src -5. create a java files under devtests.util.AnnotationTest - import devtests.deployment.util.AnnotationTest; - - public class InheritanceAnnotationTest extends AnnotationTest { - public InheritanceAnnotationTest(String name) { - super(name); - // you may need override ModuleType type here - } - } - Please make sure that the test class name is unique among these - annotation test. In general, I will prepend directory name. -6. put golden files for ejb-jar.xml, webservices.xml,etc under - /goldenfiles -7. update build.xml if necessary for classpath in targets: compile, test -8. update appserv-tests/deployment/annotation/build.xml to include your new test - -B. Add a new test by testing explicit annotation info: ------------------------------------------------------- -1. make a new dir appserv-tests/deployment/annotation/ -2. cp annotation/webservice/build.xml -3. modify ant project name in build.xml -4. create java files (ejbs, etc) for annotation testing in - /src -5. create your new JUnit TestCase java class by - i) subclassing devtests.deployment.util.AnnotationTest - ii) include the following import statements: - import junit.framework.Assert; - import devtests.deployment.util.AnnotationTest; - iii) put all testing codes in one or more public methods with no parameter - method name starting with "test" - If you want your class compare golden files in addition to your - new tests, then please use a test name other than "testDescriptor". - If you don't want your class compare golden files, then please - have overrided the "testDescriptor" method. - iv) Inside the testing method, one can invoke the test assertion by - invoking static methods in Assert class. - For instance, - Assert.assertTrue(String errMsg, boolean condition); - Assert.assertNull(String errMsg, Object obj); - Assert.assertNotNull(String errMsg, Object obj); - Assert.assertEquals(int expected, int actual); - One find more details in junit javadoc. -6. update build.xml - i) classpath in targets: compile, test - ii) update the name attribute in test target to your new class: - -7. update appserv-tests/deployment/annotation/build.xml to include your new test - -How to run the test: --------------------- -1. *** Due to an issue in ant - (http://ant.apache.org/faq.html#delegating-classloader), - we need to set CLASSPATH explicitly to include junit.jar in your environment - before running the test. -2. If you are using ant 1.5.4, then please also include xalan.jar version 2.0 - or later in your classpath. -3. cd appserv-tests/deployment/annotation/ -4. ant - -How to view the result: ------------------------ -A short summary can be found in results.html. -The detailed test results can be found in - appserv-tests/deployment/annotation/report/html/index.html diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/build.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/build.xml deleted file mode 100644 index 3fd6d56af59..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/build.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - -]> - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/goldenfiles/application-client.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/goldenfiles/application-client.xml deleted file mode 100644 index d9d9cdb565d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/goldenfiles/application-client.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - test.Client/sful1 - Session - test.ejb.stateful.SFHello - - test.Client - sful1 - - - - ejb/sfhello - Session - test.ejb.stateful.SFHello - - test.Client - sful2 - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/AppClientAnnotationTest.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/AppClientAnnotationTest.java deleted file mode 100644 index ebf2219635f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/AppClientAnnotationTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -import java.util.HashSet; -import java.util.Set; -import javax.enterprise.deploy.shared.ModuleType; - -import devtests.deployment.util.AnnotationTest; - -public class AppClientAnnotationTest extends AnnotationTest { - public AppClientAnnotationTest(String name) { - super(name); - type = ModuleType.CAR; - componentClassNames.add("test.Client"); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java deleted file mode 100644 index 73c84d25404..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test; - -import jakarta.ejb.EJB; - -import test.ejb.stateful.SFHello; - -public class Client { - private static @EJB SFHello sful1; - private static @EJB(name="ejb/sfhello") SFHello sful2; - - public void main(String[] args) { - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/SFHello.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/SFHello.java deleted file mode 100644 index c50eaf26401..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/SFHello.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb.stateful; - -/** - * @author Shing Wai Chan - */ -public interface SFHello { -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/build.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/build.xml deleted file mode 100644 index 6fb8aa0999e..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/build.xml deleted file mode 100644 index 60df51fb65f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/build.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - -]> - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml deleted file mode 100644 index b349c3c9a5d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml +++ /dev/null @@ -1,312 +0,0 @@ - - - - - - - myStatefulTest1 - myStatefulTest1 - test.ejb.stateful.SFHello - test.ejb.stateful.StatefulTest1 - Stateful - Container - Bean - - test.ejb.stateful.StatefulTest1/slHello1 - Session - test.ejb.stateless.SLHello - myStatelessTest1 - - test.ejb.stateful.StatefulTest1 - slHello1 - - - - test.ejb.stateful.StatefulTest1/slHello2 - Session - test.ejb.stateless.SLHello - myStatelessTest1 - - test.ejb.stateful.StatefulTest1 - slHello2 - - - - - - true - - - StatefulTest2 - StatefulTest2 - test.ejb.stateful.SFHello - StatefulTest2 - Stateful - Container - Container - - - - true - - - myStatelessTest1 - myStatelessTest1 - test.ejb.stateless.SLHello - test.ejb.stateless.StatelessTest1 - Stateless - Container - - test.ejb.stateless.InterceptorA/slHello - Session - test.ejb.stateless.SLHello - myStatelessTest1 - - test.ejb.stateless.InterceptorA - slHello - - - - jdbc/myDS - javax.sql.DataSource - Container - Shareable - java:comp/DefaultDataSource - - - test.ejb.stateless.InterceptorB/sessionCtx - jakarta.ejb.SessionContext - - test.ejb.stateless.InterceptorB - sessionCtx - - - - - user - - - - - StatelessTest2 - StatelessTest2 - test.ejb.stateless.SLHello - test.ejb.stateless.StatelessTest2 - Stateless - Container - - - - - - - - test.ejb.stateless.InterceptorB - - test.ejb.stateless.InterceptorB - aroundInvokeB - - - test.ejb.stateless.InterceptorA - aroundInvokeA - - - test.ejb.stateless.InterceptorA - postConstruct - - - test.ejb.stateless.InterceptorB - preDestroy - - - - - - j2ee - - - staff - - - user - - - staff - - myStatelessTest1 - Local - sayGoodAfternoon - - java.lang.String - - - - myStatelessTest1 - Local - sayHello - - java.lang.String - - - - - j2ee - - myStatelessTest1 - Local - sayHello - - java.lang.String - - - - - - - myStatelessTest1 - Local - sayGoodMorning - - java.lang.String - - - - - staff - - StatelessTest2 - Local - sayHello - - java.lang.String - - - - - j2ee - - StatelessTest2 - Local - sayHello - - java.lang.String - - - - - - - StatelessTest2 - Local - sayGoodMorning - - java.lang.String - - - - - Required - - myStatelessTest1 - Local - sayGoodAfternoon - - java.lang.String - - - Required - - - Required - - myStatelessTest1 - Local - sayHello - - java.lang.String - - - Required - - - RequiresNew - - myStatelessTest1 - Local - sayGoodMorning - - java.lang.String - - - RequiresNew - - - Mandatory - - StatelessTest2 - Local - sayGoodAfternoon - - java.lang.String - - - Mandatory - - - Mandatory - - StatelessTest2 - Local - sayHello - - java.lang.String - - - Mandatory - - - RequiresNew - - StatelessTest2 - Local - sayGoodMorning - - java.lang.String - - - RequiresNew - - - myStatelessTest1 - - test.ejb.stateless.InterceptorB - - - - - StatelessTest2 - Local - sayGoodAfternoon - - java.lang.String - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/EjbAnnotationTest.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/EjbAnnotationTest.java deleted file mode 100644 index 2ed4674a931..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/EjbAnnotationTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -import devtests.deployment.util.AnnotationTest; - -public class EjbAnnotationTest extends AnnotationTest { - public EjbAnnotationTest(String name) { - super(name); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java deleted file mode 100644 index 85cb042cd91..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb.stateless; - -import jakarta.annotation.PostConstruct; -import jakarta.annotation.Resource; -import jakarta.ejb.EJB; -import jakarta.interceptor.AroundInvoke; -import jakarta.interceptor.InvocationContext; -import javax.sql.DataSource; - -@Resource(name="jdbc/myDS", type=DataSource.class) -public class InterceptorA { - @EJB(beanName="myStatelessTest1") private SLHello slHello; - - @AroundInvoke - Object aroundInvokeA(InvocationContext ctx) { - return null; - } - - @PostConstruct - void postConstruct() { - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java deleted file mode 100644 index c8bdc0aa0e6..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb.stateless; - -import jakarta.annotation.PreDestroy; -import jakarta.annotation.Resource; -import jakarta.ejb.SessionContext; -import jakarta.interceptor.AroundInvoke; -import jakarta.interceptor.InvocationContext; - -public class InterceptorB extends InterceptorA { - @Resource SessionContext sessionCtx; - - @AroundInvoke - Object aroundInvokeB(InvocationContext ctx) { - return null; - } - - @PreDestroy - void preDestroy() { - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/SFHello.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/SFHello.java deleted file mode 100644 index c50eaf26401..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/SFHello.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb.stateful; - -/** - * @author Shing Wai Chan - */ -public interface SFHello { -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/SLHello.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/SLHello.java deleted file mode 100644 index 8a11bc787d6..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/SLHello.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb.stateless; - -/** - * @author Shing Wai Chan - */ -public interface SLHello { - public String sayHello(String message); - public String sayGoodMorning(String message); - public String sayGoodAfternoon(String message); -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java deleted file mode 100644 index dcca8b232c7..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb.stateful; - -import jakarta.ejb.EJB; -import jakarta.ejb.Remote; -import jakarta.ejb.Stateful; -import jakarta.ejb.TransactionManagement; -import jakarta.ejb.TransactionManagementType; - -import test.ejb.stateless.*; - -/** - * @author Shing Wai Chan - */ -@TransactionManagement(value=TransactionManagementType.BEAN) -@Stateful(name="myStatefulTest1") -@Remote({SFHello.class}) -public class StatefulTest1 implements SFHello { - @EJB(beanName="myStatelessTest1") private SLHello slHello1; - @EJB(beanName="myStatelessTest1") private SLHello slHello2; - - public StatefulTest1() { - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java deleted file mode 100644 index c870de78e37..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -import jakarta.ejb.Stateful; -import jakarta.ejb.Remote; -import jakarta.ejb.TransactionManagementType; - -import test.ejb.stateful.SFHello; - -/** - * @author Shing Wai Chan - */ -@Remote({SFHello.class}) -@Stateful -public class StatefulTest2 implements SFHello { - public StatefulTest2() { - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java deleted file mode 100644 index d4708a563da..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb.stateless; - -import jakarta.annotation.security.PermitAll; -import jakarta.annotation.security.RolesAllowed; -import jakarta.annotation.security.RunAs; -import jakarta.ejb.Local; -import jakarta.ejb.Stateless; -import jakarta.ejb.TransactionAttribute; -import jakarta.ejb.TransactionAttributeType; -import jakarta.ejb.TransactionManagementType; -import jakarta.interceptor.Interceptors; - -/** - * @author Shing Wai Chan - */ -@Stateless(name="myStatelessTest1") -@Local({SLHello.class}) -@TransactionAttribute(value=TransactionAttributeType.REQUIRED) -@RolesAllowed(value={"staff"}) -@RunAs(value="user") -@Interceptors(InterceptorB.class) -public class StatelessTest1 implements SLHello { - public StatelessTest1() { - } - - @RolesAllowed(value={"j2ee", "staff"}) - public String sayHello(String message) { - return "Hello, " + message + "!"; - } - - @PermitAll - @TransactionAttribute(value=TransactionAttributeType.REQUIRES_NEW) - public String sayGoodMorning(String message) { - return "Good morning, " + message + "!"; - } - - public String sayGoodAfternoon(String message) { - return "Good afternoon, " + message + "!"; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java deleted file mode 100644 index 79165d6c5bb..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb.stateless; - -import jakarta.annotation.security.DenyAll; -import jakarta.annotation.security.PermitAll; -import jakarta.annotation.security.RolesAllowed; -import jakarta.ejb.Local; -import jakarta.ejb.Stateless; -import jakarta.ejb.TransactionAttribute; -import jakarta.ejb.TransactionAttributeType; - -/** - * @author Shing Wai Chan - */ -@Stateless -@Local({SLHello.class}) -@TransactionAttribute(value=TransactionAttributeType.MANDATORY) -public class StatelessTest2 implements SLHello { - public StatelessTest2() { - } - - @RolesAllowed(value={"j2ee", "staff"}) - public String sayHello(String message) { - return null; - } - - @PermitAll - @TransactionAttribute(value=TransactionAttributeType.REQUIRES_NEW) - public String sayGoodMorning(String message) { - return null; - } - - @DenyAll - public String sayGoodAfternoon(String message) { - return null; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/build.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/build.xml deleted file mode 100644 index 436f08258ce..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/build.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - -]> - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml deleted file mode 100644 index 482ed70ba09..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml +++ /dev/null @@ -1,433 +0,0 @@ - - - - - - - StatefulTest2 - StatefulTest2 - test.ejb.SFHello1 - StatefulTest2 - Stateful - Container - Container - - test.ejb.StatefulTest/mySfHello - Session - test.ejb.SFHello - StatefulTest - - test.ejb.StatefulTest - mySfHello - - - - myDataSource - javax.sql.DataSource - Container - Shareable - java:comp/DefaultDataSource - - - testing - test.ejb.StatefulTest/ejbContext - jakarta.ejb.EJBContext - - test.ejb.StatefulTest - ejbContext - - - - sfContext - jakarta.ejb.EJBContext - - StatefulTest2 - ejbContext - - - - test.ejb.StatefulTest/ejbContext2 - jakarta.ejb.EJBContext - - test.ejb.StatefulTest - ejbContext2 - - - - sfContext2 - jakarta.ejb.EJBContext - - StatefulTest2 - ejbContext2 - - - - test.ejb.StatefulTest/ejbContext3 - jakarta.ejb.EJBContext - - test.ejb.StatefulTest - ejbContext3 - - - - - staff - - - true - - - myStatefulTest - myStatefulTest - test.ejb.SFHello1 - test.ejb.StatefulTest1 - Stateful - Container - Container - - test.ejb.StatefulTest1/sfHello - Session - test.ejb.SFHello - StatefulTest - - test.ejb.StatefulTest1 - sfHello - - - - test.ejb.StatefulTest/mySfHello - Session - test.ejb.SFHello - StatefulTest - - test.ejb.StatefulTest - mySfHello - - - - myDataSource - javax.sql.DataSource - Container - Shareable - java:comp/DefaultDataSource - - - myDataSource1 - javax.sql.DataSource - Container - Shareable - java:comp/DefaultDataSource - - - testing - test.ejb.StatefulTest/ejbContext - jakarta.ejb.EJBContext - - test.ejb.StatefulTest - ejbContext - - - - sfEjbContext - jakarta.ejb.EJBContext - - test.ejb.StatefulTest1 - ejbContext - - - - sfEjbContext2 - jakarta.ejb.EJBContext - - test.ejb.StatefulTest1 - ejbContext2 - - - - sfEjbContext3 - jakarta.ejb.EJBContext - - test.ejb.StatefulTest1 - ejbContext3 - - - - - - true - - - StatefulTest - StatefulTest - test.ejb.SFHello - test.ejb.StatefulTest - Stateful - Container - Container - - test.ejb.StatefulTest/mySfHello - Session - test.ejb.SFHello - StatefulTest - - test.ejb.StatefulTest - mySfHello - - - - myDataSource - javax.sql.DataSource - Container - Shareable - java:comp/DefaultDataSource - - - testing - test.ejb.StatefulTest/ejbContext - jakarta.ejb.EJBContext - - test.ejb.StatefulTest - ejbContext - - - - test.ejb.StatefulTest/ejbContext2 - jakarta.ejb.EJBContext - - test.ejb.StatefulTest - ejbContext2 - - - - test.ejb.StatefulTest/ejbContext3 - jakarta.ejb.EJBContext - - test.ejb.StatefulTest - ejbContext3 - - - - - guest - - - true - - - - - staff - - - member - - - guest - - - - - StatefulTest2 - Remote - sayGoodAfternoon - - java.lang.String - - - - StatefulTest2 - Remote - sayGoodMorning - - java.lang.String - - - - - member - - StatefulTest2 - Remote - sayBye - - java.lang.String - - - - - - - myStatefulTest - Remote - sayGoodAfternoon - - java.lang.String - - - - myStatefulTest - Remote - sayGoodMorning - - java.lang.String - - - - - - - StatefulTest - Local - * - - - - Required - - StatefulTest2 - Remote - sayGoodAfternoon - - java.lang.String - - - Required - - - Mandatory - - StatefulTest2 - Remote - sayHello - - java.lang.String - - - Mandatory - - - Supports - - StatefulTest2 - Remote - sayBye - - java.lang.String - - - Supports - - - Supports - - StatefulTest2 - Remote - sayGoodMorning - - java.lang.String - - - Supports - - - Required - - myStatefulTest - Remote - sayGoodAfternoon - - java.lang.String - - - Required - - - Mandatory - - myStatefulTest - Remote - sayHello - - java.lang.String - - - Mandatory - - - Supports - - myStatefulTest - Remote - sayGoodMorning - - java.lang.String - - - Supports - - - Required - - StatefulTest - Local - sayGoodAfternoon - - java.lang.String - - - Required - - - RequiresNew - - StatefulTest - Local - sayHello - - java.lang.String - - - RequiresNew - - - Required - - StatefulTest - Local - sayGoodNight - - java.lang.String - - - Required - - - Supports - - StatefulTest - Local - sayGoodMorning - - java.lang.String - - - Supports - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/InheritanceAnnotationTest.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/InheritanceAnnotationTest.java deleted file mode 100644 index 4ff866e5494..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/InheritanceAnnotationTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -import devtests.deployment.util.AnnotationTest; - -public class InheritanceAnnotationTest extends AnnotationTest { - public InheritanceAnnotationTest(String name) { - super(name); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/SFHello.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/SFHello.java deleted file mode 100644 index d845a028b00..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/SFHello.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb; - -/** - * @author Shing Wai Chan - */ -public interface SFHello { - public String sayHello(String message); - public String sayGoodMorning(String message); - public String sayGoodAfternoon(String message); - public String sayGoodNight(String message); -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/SFHello1.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/SFHello1.java deleted file mode 100644 index 0a515bc0b9b..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/SFHello1.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb; - -/** - * @author Shing Wai Chan - */ -public interface SFHello1 { - public String sayHello(String message); - public String sayGoodMorning(String message); - public String sayGoodAfternoon(String message); - public String sayBye(String message); -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java deleted file mode 100644 index 78c03f51825..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb; - -import jakarta.annotation.Resource; -import jakarta.annotation.security.PermitAll; -import jakarta.annotation.security.RunAs; -import jakarta.ejb.EJB; -import jakarta.ejb.EJBContext; -import jakarta.ejb.Local; -import jakarta.ejb.Local; -import jakarta.ejb.Stateful; -import jakarta.ejb.TransactionAttribute; -import jakarta.ejb.TransactionAttributeType; -import javax.sql.DataSource; - -/** - * @author Shing Wai Chan - */ -@Stateful -@Local({SFHello.class}) -@Resource(name="myDataSource", type=DataSource.class) -@TransactionAttribute(value=TransactionAttributeType.REQUIRED) -@RunAs("guest") -@PermitAll -public class StatefulTest implements SFHello { - @EJB private SFHello mySfHello; - private EJBContext ejbContext; - private EJBContext ejbContext2; - - public StatefulTest() { - } - - @TransactionAttribute(value=TransactionAttributeType.REQUIRES_NEW) - public String sayHello(String message) { - return "Hello, " + message + "!"; - } - - @TransactionAttribute(value=TransactionAttributeType.SUPPORTS) - public String sayGoodMorning(String message) { - return "Good morning, " + message + "!"; - } - - public String sayGoodAfternoon(String message) { - return "Good afternoon, " + message + "!"; - } - - public String sayGoodNight(String message) { - return "Good night, " + message + "!"; - } - - @Resource(description="testing") - private void setEjbContext(EJBContext context) { - ejbContext = context; - } - - @Resource - void setEjbContext2(EJBContext context) { - ejbContext2 = context; - } - - @Resource - void setEjbContext3(EJBContext context) { - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java deleted file mode 100644 index 8a30968a6a4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb; - -import jakarta.annotation.Resource; -import jakarta.ejb.EJB; -import jakarta.ejb.EJBContext; -import jakarta.ejb.Remote; -import jakarta.ejb.Stateful; -import jakarta.ejb.TransactionAttribute; -import jakarta.ejb.TransactionAttributeType; -import javax.sql.DataSource; - -/** - * @author Shing Wai Chan - */ -@Stateful(name="myStatefulTest") -@Resource(name="myDataSource1", type=DataSource.class) -@Remote({SFHello1.class}) -public class StatefulTest1 extends StatefulTest implements SFHello1 { - @EJB private SFHello sfHello; - private EJBContext ejbContext; - private EJBContext ejbContext2; - - public StatefulTest1() { - } - - @TransactionAttribute(value=TransactionAttributeType.MANDATORY) - public String sayHello(String message) { - return super.sayHello(message); - } - - public String sayBye(String message) { - return "Good bye, " + message + "!"; - } - - @Resource(name="sfEjbContext") - private void setEjbContext(EJBContext context) { - ejbContext = context; - } - - @Resource(name="sfEjbContext2") - void setEjbContext2(EJBContext context) { - ejbContext = context; - } - - @Resource(name="sfEjbContext3") - public void setEjbContext3(EJBContext context) { - ejbContext = context; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java deleted file mode 100644 index 0f804bd1d24..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -import jakarta.annotation.Resource; -import jakarta.annotation.security.RolesAllowed; -import jakarta.annotation.security.RunAs; -import jakarta.ejb.EJBContext; -import jakarta.ejb.Remote; -import jakarta.ejb.Stateful; -import jakarta.ejb.TransactionAttribute; -import jakarta.ejb.TransactionAttributeType; - -import test.ejb.SFHello1; -import test.ejb.StatefulTest; - -/** - * @author Shing Wai Chan - */ -@TransactionAttribute(value=TransactionAttributeType.SUPPORTS) -@Stateful -@Remote({SFHello1.class}) -@RunAs("staff") -public class StatefulTest2 extends StatefulTest implements SFHello1 { - private EJBContext ejbContext; - private EJBContext ejbContext2; - - public StatefulTest2() { - } - - @TransactionAttribute(value=TransactionAttributeType.MANDATORY) - public String sayHello(String message) { - return super.sayHello(message); - } - - @RolesAllowed("member") - public String sayBye(String message) { - return "Good bye, " + message + "!"; - } - - @Resource(name="sfContext") - private void setEjbContext(EJBContext context) { - ejbContext = context; - } - - @Resource(name="sfContext2") - void setEjbContext2(EJBContext context) { - ejbContext = context; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/README b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/README deleted file mode 100644 index ff6f4fe87e3..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/README +++ /dev/null @@ -1,9 +0,0 @@ -Note that we see the following in standout log: -Line 4 Column 20 -- cvc-complex-type.2.4.a: Invalid content was found starting with element 'servlet-class'. One of '{"http://java.sun.com/xml/ns/javaee":description, "http://java.sun.com/xml/ns/javaee":display-name, "http://java.sun.com/xml/ns/javaee":icon, "http://java.sun.com/xml/ns/javaee":servlet-name}' is expected." - -This is due to is not iLine 4 Column 16 -- cvc-complex-type.2.4.a: Invalid content was found starting with element 'servlet-class'. One of '{"http://java.sun.com/xml/ns/javaee":description, "http://java.sun.com/xml/ns/javaee":display-name, "http://java.sun.com/xml/ns/javaee":icon, "http://java.sun.com/xml/ns/javaee":servlet-name}' is expected." -n web.xml. - -This is due to missing in web.xml. -This is the limitation of the test as is going to be specified -by user in web.xml. diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/build.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/build.xml deleted file mode 100644 index b957c4eee87..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/build.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - -]> - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/goldenfiles/web.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/goldenfiles/web.xml deleted file mode 100644 index 11fb31ccd8f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/goldenfiles/web.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - test.ServletTest - -1 - true - false - - - staff - - - test.ServletTest/sful1 - Session - test.ejb.stateful.SFHello - - test.ServletTest - sful1 - - - - ejb/sfhello - Session - test.ejb.stateful.SFHello - - test.ServletTest - sful2 - - - - test.ServletTest - preconstruct - - - test.ServletTest - predestroy - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/SFHello.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/SFHello.java deleted file mode 100644 index c50eaf26401..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/SFHello.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.ejb.stateful; - -/** - * @author Shing Wai Chan - */ -public interface SFHello { -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java deleted file mode 100644 index c98feba30fd..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test; - -import java.io.IOException; - -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; -import jakarta.annotation.security.DeclareRoles; -import jakarta.ejb.EJB; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import test.ejb.stateful.SFHello; - -@DeclareRoles({"staff"}) -public class ServletTest { - private @EJB SFHello sful1; - private @EJB(name="ejb/sfhello") SFHello sful2; - - public void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - } - - @PostConstruct - private void preconstruct() { - } - - @PreDestroy - private void predestroy() { - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/WebAnnotationTest.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/WebAnnotationTest.java deleted file mode 100644 index 09668d01213..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/WebAnnotationTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -import java.util.HashSet; -import java.util.Set; -import javax.enterprise.deploy.shared.ModuleType; - -import devtests.deployment.util.AnnotationTest; - -public class WebAnnotationTest extends AnnotationTest { - public WebAnnotationTest(String name) { - super(name); - type = ModuleType.WAR; - componentClassNames.add("test.ServletTest"); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/build.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/build.xml deleted file mode 100644 index 951c018c583..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/build.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - -]> - - - - &commonBuild; - - - - - - &autodeployUtil; - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/simple/build.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/simple/build.xml deleted file mode 100644 index 17cef4fcf4f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/simple/build.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - -]> - - - - - &commonBuild; - &autodeployUtil; - - - - - -in simple/build.xml and build is ${build} - - - - - - - Using previously-built ${autodeploy.archive} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/slowCopy/build.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/slowCopy/build.xml deleted file mode 100644 index b62226bb8b2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/slowCopy/build.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - - - -]> - - - - - &commonBuild; - &autodeployUtil; - - - - - - - - - - - - - - - - - Using previously-built ${inputArchive} - - - - - - - - - - - - - - - - - - - Copying ${inputArchive} slowly to the autodeploy directory - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${resultPropertyName}=${autodeployResult} - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/AutoDeployMonitor.java b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/AutoDeployMonitor.java deleted file mode 100644 index 5320364923d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/AutoDeployMonitor.java +++ /dev/null @@ -1,257 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * AutoDeployMonitor.java - * - * Created on May 11, 2004, 3:08 PM - */ - -package autodeploy.test; - -import java.util.Date; -import java.text.SimpleDateFormat; -import java.text.ParseException; -import java.io.File; -import java.io.FileFilter; -import java.io.FileNotFoundException; - -import org.glassfish.deployment.autodeploy.AutoDeployConstants; - -/** - *Autodeploys an archive to the specified autodeploy directory. - *

- *To autodeploy the app, follow these steps: - *1. Record the modification time of the archive file in the autodeploy directory as the start time. - *2. Copy the archive to the autodeploy directory. - *3. Monitor the autodeploy directory until it contains a marker file (for either success or - * failure) with a creation date and time later than the earlier-recorded timestamp. - *4. Choose whether to return success or failure based on which kind of marker file has appeared - * in the autodeploy directory. - * - * @author tjquinn - */ -public class AutoDeployMonitor { - - private static boolean DEBUG = Boolean.getBoolean("monitor.debug"); - - private static int ITERATION_LIMIT = Integer.getInteger("monitor.iterationLimit", 60 * 2 /* default = two minutes */).intValue(); - - private String archiveName = null; - -// private String autodeployDirSpec = null; - - private File autodeployDir = null; - -// private String timestampFormat = null; - -// private String timestampString = null; - - private long timestamp; - - private Date startTime = null; - - private final static String LINE_SEP = System.getProperty("line.separator"); - - /** Creates a new instance of AutoDeployer */ - public AutoDeployMonitor() { - } - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - int result = new AutoDeployMonitor().run(args); - System.exit(result); - } - - private void processArguments(String[] args) { - if (args.length < 4) { - usage(); - System.exit(1); - } - - archiveName = args[0]; - String autodeployDirSpec = args[1]; - String timestampFormat = args[2]; - String timestampString = args[3]; - - autodeployDir = new File(autodeployDirSpec); - - debug("Archive to autodeploy: " + archiveName); - debug("Autodeploy directory: " + autodeployDir.getAbsolutePath()); - - StringBuffer result = new StringBuffer(); - - /* - *Check auto-deploy directory. - */ - if ( ! autodeployDir.exists()) { - result.append(LINE_SEP).append("Autodeploy directory " + autodeployDir.getAbsolutePath() + " does not exist but should."); - } - - /* - *Check archive file name. - */ - if (archiveName.length() == 0) { - result.append(LINE_SEP).append("Archive file name must not be empty but is."); - } - - /* - *Check the timestamp format and value. - */ - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(timestampFormat); - Date timestampDate = null; - try { - timestampDate = simpleDateFormat.parse(timestampString); - timestamp = timestampDate.getTime(); - debug("Timestamp to use for filtering autodeploy status files: " + timestampDate.toString()); - } catch (ParseException pe) { - result.append(LINE_SEP).append("Could not interpret timestamp " + timestampString + " using format " + timestampFormat).append(LINE_SEP).append(" ").append(pe.getMessage()); - } - - if (result.length() > 0) { - throw new IllegalArgumentException(result.toString()); - } - } - - private int run(String[] args) { - /* - *The calling script should pass these command line arguments: - * - *arg[0] archive file name and type - *arg[1] auto-deploy directory spec - *arg[2] SimpleDateFormat pattern to use in parsing the timestamp string - *arg[3] timestamp string - * - */ - - try { - processArguments(args); - - /* - *The timestamp handling allows the logic below to identify a marker file (..._deployed, - *..._undeployed, ..._deployFailed, ..._undeployFailed) that was created after the - *archive was deposited into (for autodeploy) or removed from (for autoundeploy) the - *autodeploy directory. We need to do this to make sure we do not accidentally take - *action on an old marker file that is still there because the autodeployer has not - *yet acted on the new file. - */ - - /* - *For auto-deploy, the archive will have just been copied into the autodeploy directory. - *For auto-undeploy, the archive will have just been deleted from there. The file filter - *below uses both the file name and also a timestamp to make sure it accepts - *marker files created after the archive itself. - * - *Note that the following is both a declaration of the filter and its initialization by - *invoking its init method. - */ - - FileFilter filter = new FileFilter () { - - private long timestamp; - private String archiveName = null; - - public boolean accept(File candidateFile) { - /* - *Make sure the name of the candidate starts with the name of the archive and that - *the candidate is no older than the archive file. Make sure it's one of the marker - *file types we're interested in. - */ - String candidateFileSpec = candidateFile.getAbsolutePath(); - long candidateTimestamp = candidateFile.lastModified(); - String candidateNameAndType = candidateFileSpec.substring(candidateFileSpec.lastIndexOf(File.separator) + 1); - String candidateType = candidateFileSpec.substring(candidateFileSpec.lastIndexOf('.') + 1); - - boolean answer = (candidateTimestamp > this.timestamp) - && (candidateNameAndType.equals(archiveName + AutoDeployConstants.DEPLOYED) || - candidateNameAndType.equals(archiveName + AutoDeployConstants.UNDEPLOYED) || - candidateNameAndType.equals(archiveName + AutoDeployConstants.DEPLOY_FAILED) || - candidateNameAndType.equals(archiveName + AutoDeployConstants.UNDEPLOY_FAILED) - ); - if (DEBUG) { - Date candidateTimestampDate = new Date(candidateTimestamp); - debug("Result of filtering file " + candidateFileSpec + " with modification date " + candidateTimestampDate.toString() + " : " + answer); - } - return answer; - } - - public FileFilter init(String archiveName, long timestamp) { - this.archiveName = archiveName; - this.timestamp = timestamp; - return this; - } - }.init(archiveName, timestamp); - - File [] matches = null; - - /* - *Begin waiting for a new marker file to appear in the autodeploy directory. Don't wait longer than - *two minutes (by default) in case there is some problem. - */ - int iterationCount = 0; - do { - debug("Starting polling iteration " + iterationCount + "..."); - Thread.currentThread().sleep(1000); - /* - *List the files that have the same name as the archive but are not the archive itself. - *This should mean we get only the marker file(s) for this archive. - */ - matches = autodeployDir.listFiles(filter); - - } while ( (matches.length == 0) && (iterationCount++ < ITERATION_LIMIT)); - - /* - *Return 0 if the marker file found ends with _deployed, 1 if the marker ends with - *_deployFailed, and -1 otherwise. - */ - if (DEBUG) { - System.out.println("Matched files:"); - for (int i = 0; i < matches.length; i++) { - System.out.println(" " + matches[i].getAbsolutePath()); - } - } - String matchFileSpec = matches[0].getAbsolutePath(); - int answer = -1; - if (matchFileSpec.endsWith(AutoDeployConstants.DEPLOYED) || matchFileSpec.endsWith(AutoDeployConstants.UNDEPLOYED)) { - answer = 0; - debug("Found successful marker file: " + matchFileSpec); - } else if (matchFileSpec.endsWith(AutoDeployConstants.DEPLOY_FAILED) || matchFileSpec.endsWith(AutoDeployConstants.UNDEPLOY_FAILED)) { - answer = 1; - debug("Found unsuccessful marker file: " + matchFileSpec); - } else { - debug("Found no marker file at all"); - } - return answer; - } catch (Throwable thr) { - System.err.println("Error monitoring autodeployment/autoundeployment"); - thr.printStackTrace(); - return -1; - } - } - - private void usage() { - System.err.println("Usage:"); - System.err.println(" autodeploy.loader.client.AutoDeployMonitor "); - } - - private void debug(String msg) { - if (DEBUG) { - System.out.println(msg); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/SlowCopy.java b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/SlowCopy.java deleted file mode 100644 index 99fe50e53aa..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/SlowCopy.java +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package autodeploy.slowtest; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Arrays; -import java.util.Date; -import java.util.Scanner; -/* - * SlowCopy.java - * - * Created on November 23, 2004, 12:39 PM - */ - -/** - *Provides a way to test autodeployer's behavior when an autodeployed file is - *copied into the autodeploy directory slowly. - * - *Usage: - * - * java -classpath ... SlowCopy timed existing-file target-file-spec [delay-in-ms] - * - *where - *

    - *"timed" is a keyword - *existing-file is the existing archive to be copied - *target-file-spec is the file spec of the copy to be created - *delay-in-ms is the optional time delay (in ms) to wait between writes - *
- * - * @author tjquinn - */ -public class SlowCopy { - - /** Creates a new instance of SlowCopy */ - public SlowCopy() { - } - - /** default delay between successive writes of data to the output file */ - private static final long DEFAULT_DELAY = 200; // milliseconds - - /** size of read and write buffer */ - private static final int BUFFER_SIZE = 1024; - - public static void main(String[] args) { - try { - new SlowCopy().run(args); - System.exit(0); - } catch (Throwable thr) { - thr.printStackTrace(System.err); - System.exit(1); - } - } - - private void run(String [] args) throws FileNotFoundException, IOException, InterruptedException { - System.out.println(Arrays.toString(args)); - if (args.length < 3) { - throw new IllegalArgumentException("Command line args must specify prompt/timed, the original file, and the target file"); - } - - /* - *Get delay from default and override the default if the delay is - *specified on the command line. - */ - long delay = DEFAULT_DELAY; - if (args.length > 3) { - delay = Integer.decode(args[3]); - } - - /* - *For interactive use, the tool would like to let the user press a - *key each time a read/write is to occur. This doesn't yet work and - *is not used in the devtests anyway. - */ - boolean usePromptDelay = args[0].equalsIgnoreCase("prompt"); - File oldF = new File(args[1]); - File newF = new File(args[2]); - - System.out.println("Slow copy starting\n" + - " mode: " + args[0] + "\n" + - " input file: " + oldF.getAbsolutePath() + "\n" + - " output file: " + newF.getAbsolutePath() + "\n" + - " delay (if mode=timed): " + delay + "\n" + - " starting time: " + new Date().toString() - ); - - FileOutputStream fos = new FileOutputStream(newF); - FileInputStream fis = new FileInputStream(oldF); - byte [] data = new byte [BUFFER_SIZE]; - int bytesRead; - - Scanner scanner = null; - boolean continuePrompting = usePromptDelay; - String lineSep = System.getProperty("line.separator"); - - if (usePromptDelay) { - scanner = new Scanner(System.in); - } - - int totalBytesRead = 0; - /* - *Repeat the cycle of reading from the input file and writing to the - *output file, stalling for either a key press or the timed delay - *between successive cycles. - */ - try { - while ((bytesRead = fis.read(data)) != -1) { - totalBytesRead += bytesRead; - fos.write(data, 0, bytesRead); - if (usePromptDelay) { - if (scanner.hasNext(".")) { - String input = scanner.next("."); - continuePrompting = ! input.equals("q"); // just like Unix utilities - q ends - System.out.println("Continue prompting is now set to " + continuePrompting); - } - } else { - /* - *The user wants to use timed delays, so wait for the - *delay period before continuing the loop. - */ - Thread.currentThread().sleep(delay); - } - } - System.out.println("Finished copying " + totalBytesRead + " bytes at " + new Date().toString()); - - } finally { - if (fos != null) { - fos.close(); - fos = null; - } - if (fis != null) { - fis.close(); - fis = null; - } - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/build.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/build.xml deleted file mode 100644 index a857bf1f8bd..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/build.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -]> - - - &commonBuild; - &autodeployUtil; - - - - - - - - - - - - - - - - - Autodeploy util common tools are ready - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/util.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/util.xml deleted file mode 100644 index f528529b6c2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/util.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ${resultPropertyName}=${autodeployResult} - - - - - - - - - - - - - - - - - - - - - - - - Waiting for autodeployment to complete... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Waiting for autoundeployment to complete... - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/AutoDeployMonitor.java b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/AutoDeployMonitor.java deleted file mode 100644 index c388ed6584d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/AutoDeployMonitor.java +++ /dev/null @@ -1,257 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * AutoDeployMonitor.java - * - * Created on May 11, 2004, 3:08 PM - */ - -package autodeploy.test; - -import java.util.Date; -import java.text.SimpleDateFormat; -import java.text.ParseException; -import java.io.File; -import java.io.FileFilter; -import java.io.FileNotFoundException; - -import com.sun.enterprise.deployment.autodeploy.AutoDeployConstants; - -/** - *Autodeploys an archive to the specified autodeploy directory. - *

- *To autodeploy the app, follow these steps: - *1. Record the modification time of the archive file in the autodeploy directory as the start time. - *2. Copy the archive to the autodeploy directory. - *3. Monitor the autodeploy directory until it contains a marker file (for either success or - * failure) with a creation date and time later than the earlier-recorded timestamp. - *4. Choose whether to return success or failure based on which kind of marker file has appeared - * in the autodeploy directory. - * - * @author tjquinn - */ -public class AutoDeployMonitor { - - private static boolean DEBUG = Boolean.getBoolean("monitor.debug"); - - private static int ITERATION_LIMIT = Integer.getInteger("monitor.iterationLimit", 60 * 2 /* default = two minutes */).intValue(); - - private String archiveName = null; - -// private String autodeployDirSpec = null; - - private File autodeployDir = null; - -// private String timestampFormat = null; - -// private String timestampString = null; - - private long timestamp; - - private Date startTime = null; - - private final static String LINE_SEP = System.getProperty("line.separator"); - - /** Creates a new instance of AutoDeployer */ - public AutoDeployMonitor() { - } - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - int result = new AutoDeployMonitor().run(args); - System.exit(result); - } - - private void processArguments(String[] args) { - if (args.length < 4) { - usage(); - System.exit(1); - } - - archiveName = args[0]; - String autodeployDirSpec = args[1]; - String timestampFormat = args[2]; - String timestampString = args[3]; - - autodeployDir = new File(autodeployDirSpec); - - debug("Archive to autodeploy: " + archiveName); - debug("Autodeploy directory: " + autodeployDir.getAbsolutePath()); - - StringBuffer result = new StringBuffer(); - - /* - *Check auto-deploy directory. - */ - if ( ! autodeployDir.exists()) { - result.append(LINE_SEP).append("Autodeploy directory " + autodeployDir.getAbsolutePath() + " does not exist but should."); - } - - /* - *Check archive file name. - */ - if (archiveName.length() == 0) { - result.append(LINE_SEP).append("Archive file name must not be empty but is."); - } - - /* - *Check the timestamp format and value. - */ - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(timestampFormat); - Date timestampDate = null; - try { - timestampDate = simpleDateFormat.parse(timestampString); - timestamp = timestampDate.getTime(); - debug("Timestamp to use for filtering autodeploy status files: " + timestampDate.toString()); - } catch (ParseException pe) { - result.append(LINE_SEP).append("Could not interpret timestamp " + timestampString + " using format " + timestampFormat).append(LINE_SEP).append(" ").append(pe.getMessage()); - } - - if (result.length() > 0) { - throw new IllegalArgumentException(result.toString()); - } - } - - private int run(String[] args) { - /* - *The calling script should pass these command line arguments: - * - *arg[0] archive file name and type - *arg[1] auto-deploy directory spec - *arg[2] SimpleDateFormat pattern to use in parsing the timestamp string - *arg[3] timestamp string - * - */ - - try { - processArguments(args); - - /* - *The timestamp handling allows the logic below to identify a marker file (..._deployed, - *..._undeployed, ..._deployFailed, ..._undeployFailed) that was created after the - *archive was deposited into (for autodeploy) or removed from (for autoundeploy) the - *autodeploy directory. We need to do this to make sure we do not accidentally take - *action on an old marker file that is still there because the autodeployer has not - *yet acted on the new file. - */ - - /* - *For auto-deploy, the archive will have just been copied into the autodeploy directory. - *For auto-undeploy, the archive will have just been deleted from there. The file filter - *below uses both the file name and also a timestamp to make sure it accepts - *marker files created after the archive itself. - * - *Note that the following is both a declaration of the filter and its initialization by - *invoking its init method. - */ - - FileFilter filter = new FileFilter () { - - private long timestamp; - private String archiveName = null; - - public boolean accept(File candidateFile) { - /* - *Make sure the name of the candidate starts with the name of the archive and that - *the candidate is no older than the archive file. Make sure it's one of the marker - *file types we're interested in. - */ - String candidateFileSpec = candidateFile.getAbsolutePath(); - long candidateTimestamp = candidateFile.lastModified(); - String candidateNameAndType = candidateFileSpec.substring(candidateFileSpec.lastIndexOf(File.separator) + 1); - String candidateType = candidateFileSpec.substring(candidateFileSpec.lastIndexOf('.') + 1); - - boolean answer = (candidateTimestamp > this.timestamp) - && (candidateNameAndType.equals(archiveName + AutoDeployConstants.DEPLOYED) || - candidateNameAndType.equals(archiveName + AutoDeployConstants.UNDEPLOYED) || - candidateNameAndType.equals(archiveName + AutoDeployConstants.DEPLOY_FAILED) || - candidateNameAndType.equals(archiveName + AutoDeployConstants.UNDEPLOY_FAILED) - ); - if (DEBUG) { - Date candidateTimestampDate = new Date(candidateTimestamp); - debug("Result of filtering file " + candidateFileSpec + " with modification date " + candidateTimestampDate.toString() + " : " + answer); - } - return answer; - } - - public FileFilter init(String archiveName, long timestamp) { - this.archiveName = archiveName; - this.timestamp = timestamp; - return this; - } - }.init(archiveName, timestamp); - - File [] matches = null; - - /* - *Begin waiting for a new marker file to appear in the autodeploy directory. Don't wait longer than - *two minutes (by default) in case there is some problem. - */ - int iterationCount = 0; - do { - debug("Starting polling iteration " + iterationCount + "..."); - Thread.currentThread().sleep(1000); - /* - *List the files that have the same name as the archive but are not the archive itself. - *This should mean we get only the marker file(s) for this archive. - */ - matches = autodeployDir.listFiles(filter); - - } while ( (matches.length == 0) && (iterationCount < ITERATION_LIMIT)); - - /* - *Return 0 if the marker file found ends with _deployed, 1 if the marker ends with - *_deployFailed, and -1 otherwise. - */ - if (DEBUG) { - System.out.println("Matched files:"); - for (int i = 0; i < matches.length; i++) { - System.out.println(" " + matches[i].getAbsolutePath()); - } - } - String matchFileSpec = matches[0].getAbsolutePath(); - int answer = -1; - if (matchFileSpec.endsWith(AutoDeployConstants.DEPLOYED) || matchFileSpec.endsWith(AutoDeployConstants.UNDEPLOYED)) { - answer = 0; - debug("Found successful marker file: " + matchFileSpec); - } else if (matchFileSpec.endsWith(AutoDeployConstants.DEPLOY_FAILED) || matchFileSpec.endsWith(AutoDeployConstants.UNDEPLOY_FAILED)) { - answer = 1; - debug("Found unsuccessful maker file: " + matchFileSpec); - } else { - debug("Found no marker file at all"); - } - return answer; - } catch (Throwable thr) { - System.err.println("Error monitoring autodeployment/autoundeployment"); - thr.printStackTrace(); - return -1; - } - } - - private void usage() { - System.err.println("Usage:"); - System.err.println(" autodeploy.loader.client.AutoDeployMonitor "); - } - - private void debug(String msg) { - if (DEBUG) { - System.out.println(msg); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/build.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/build.xml deleted file mode 100644 index 89d42361255..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/build.xml +++ /dev/null @@ -1,366 +0,0 @@ - - - - -]> - - - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - Building ear - - - - - - - - - - - - - - - - - - - - - - - - - ${resultPropertyName}=${autodeployResult} - - - - - - - - - - - - - - - - Waiting for autodeployment to complete... - - - - - - - - - - - - - - - - - - - - Waiting for autoundeployment to complete... - - - - - - - - - - - - - - - - - - - - - ${statusMessage} - - ${grepOutput} - ${resultPropertyName}=${grepResult} - - - - - ${fileMatchError} - -The string "${exceptionText}" was found, implying that the bug is present. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/build.xml b/appserver/tests/appserv-tests/devtests/deployment/build.xml index 76ddb5ba5ee..63819855b6f 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/build.xml @@ -22,69 +22,48 @@ ]> + &commonBuild; - &commonBuild; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/deployment/config/common.xml b/appserver/tests/appserv-tests/devtests/deployment/config/common.xml index 40443343dcf..7920b96560f 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/config/common.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/config/common.xml @@ -138,7 +138,7 @@ - + @@ -705,34 +705,6 @@ AS_ADMIN_MASTERPASSWORD=changeit - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -784,62 +756,6 @@ AS_ADMIN_MASTERPASSWORD=changeit - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1242,13 +1158,13 @@ AS_ADMIN_MASTERPASSWORD=changeit - + - + @@ -1268,7 +1184,7 @@ AS_ADMIN_MASTERPASSWORD=changeit - + diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/build.xml b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/build.xml index aee49e9ec53..f4f46858db2 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/build.xml @@ -26,14 +26,8 @@ &commonBuild; - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/README b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/README deleted file mode 100644 index 2593df74ccb..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/README +++ /dev/null @@ -1,5 +0,0 @@ -This test verifies the following functionalities: - -1. deployment of an ear without application.xml -2. the correct identification of the type of the jar file if the - application.xml does not exist diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/build.xml b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/build.xml deleted file mode 100644 index 9d1145162ff..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/build.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java deleted file mode 100644 index d6480041590..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.client; - -import jakarta.ejb.EJB; -import com.sun.s1asdev.deployment.noappxml.ejb.Sful; -import com.sun.s1asdev.deployment.noappxml.ejb.Sless; - -public class Client { - - public static void main (String[] args) { - Client client = new Client(args); - client.doTest(); - } - - public Client (String[] args) {} - - @EJB - private static Sful sful; - - @EJB - private static Sless sless; - - public void doTest() { - try { - - System.err.println("invoking stateful"); - sful.hello(); - - System.err.println("invoking stateless"); - sless.hello(); - - pass(); - } catch(Exception e) { - e.printStackTrace(); - fail(); - } - - return; - } - - private void pass() { - System.err.println("PASSED: descriptor_free_zone/ear/no_appxml"); - System.exit(0); - } - - private void fail() { - System.err.println("FAILED: descriptor_free_zone/ear/no_appxml"); - System.exit(-1); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/MANIFEST.MF deleted file mode 100644 index cd5be569f0a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Created-By: 1.4.0-beta3 (Sun Microsystems Inc.) -Main-Class: com.sun.s1asdev.deployment.noappxml.client.Client diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/MANIFEST.MF deleted file mode 100644 index 37e42804773..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Created-By: 1.4.0-beta3 (Sun Microsystems Inc.) -Class-Path: util.jar diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/Sful.java deleted file mode 100644 index 840e35e7530..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/Sful.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.ejb; - -// Remote business interface - -public interface Sful -{ - public String hello(); -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java deleted file mode 100644 index 36a9bff1e0a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.ejb; - -import com.sun.s1asdev.deployment.noappxml.util.Util; -import jakarta.ejb.Stateful; -import jakarta.ejb.Remote; - -@Stateful -@Remote({Sful.class}) -public class SfulEJB implements Sful -{ - public String hello() { - Util.log("In SfulEJB:hello()"); - return "hello"; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/Sless.java deleted file mode 100644 index 844a124b1dd..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/Sless.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.ejb; - -// Remote business interface - -public interface Sless -{ - public String hello(); -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java deleted file mode 100644 index fbec4fb62a4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.ejb; - -import com.sun.s1asdev.deployment.noappxml.util.Util; -import jakarta.ejb.Stateless; -import jakarta.ejb.Remote; - -@Stateless -@Remote({Sless.class}) -public class SlessEJB implements Sless -{ - public String hello() { - Util.log("In SlessEJB:hello()"); - return "hello"; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/util/Util.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/util/Util.java deleted file mode 100644 index 06b605b68b5..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/util/Util.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.util; - -public class Util { - public static void log(String message) { - System.out.println(message); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/README b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/README deleted file mode 100644 index 17f84d05ffb..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/README +++ /dev/null @@ -1,7 +0,0 @@ -This test verifies the following functionalities: - -1. deployment of an ear without application.xml -2. the correct identification of the type of the jar file if the - application.xml does not exist -3. this test also makes sure that the war can be located anywhere in the package, - whereas the ejbs are only under directories not named "lib" diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/build.xml b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/build.xml deleted file mode 100644 index d256a641e9c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/build.xml +++ /dev/null @@ -1,190 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java deleted file mode 100644 index 2b1b624ae96..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.client; - -import java.net.*; -import java.io.*; -import jakarta.ejb.EJB; -import com.sun.s1asdev.deployment.noappxml.ejb.Sful; -import com.sun.s1asdev.deployment.noappxml.ejb.Sless; - -public class Client { - - public static void main (String[] args) { - Client client = new Client(args); - client.doTest(args); - } - - public Client (String[] args) {} - - @EJB - private static Sful sful; - - @EJB - private static Sless sless; - - public void doTest(String args[]) { - try { - - System.err.println("invoking stateful"); - sful.hello(); - - System.err.println("invoking stateless"); - sless.hello(); - - System.err.println("argument = " + args[0]); - String url = args[0]; - int code = invokeServlet(url); - if (code != 200) { - System.err.println("Incorrect return code = " + code); - fail(); - return; - } - - pass(); - } catch(Exception e) { - e.printStackTrace(); - fail(); - } - - return; - } - - private void pass() { - System.err.println("PASSED: descriptor_free_zone/ear/no_appxml_2"); - System.exit(0); - } - - private void fail() { - System.err.println("FAILED: descriptor_free_zone/ear/no_appxml_2"); - System.exit(-1); - } - - private int invokeServlet(String url) throws Exception { - System.err.println("Invoking URL = " + url); - URL u = new URL(url); - HttpURLConnection c1 = (HttpURLConnection)u.openConnection(); - int code = c1.getResponseCode(); - InputStream is = c1.getInputStream(); - BufferedReader input = new BufferedReader (new InputStreamReader(is)); - String line = null; - while ((line = input.readLine()) != null) { - System.err.println(line); - } - return code; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/MANIFEST.MF deleted file mode 100644 index cd5be569f0a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Created-By: 1.4.0-beta3 (Sun Microsystems Inc.) -Main-Class: com.sun.s1asdev.deployment.noappxml.client.Client diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/MANIFEST.MF deleted file mode 100644 index 452ecc33e80..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Created-By: 1.4.0-beta3 (Sun Microsystems Inc.) -Class-Path: lib/util.jar diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/Sful.java deleted file mode 100644 index 840e35e7530..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/Sful.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.ejb; - -// Remote business interface - -public interface Sful -{ - public String hello(); -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java deleted file mode 100644 index 36a9bff1e0a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.ejb; - -import com.sun.s1asdev.deployment.noappxml.util.Util; -import jakarta.ejb.Stateful; -import jakarta.ejb.Remote; - -@Stateful -@Remote({Sful.class}) -public class SfulEJB implements Sful -{ - public String hello() { - Util.log("In SfulEJB:hello()"); - return "hello"; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/Sless.java deleted file mode 100644 index 844a124b1dd..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/Sless.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.ejb; - -// Remote business interface - -public interface Sless -{ - public String hello(); -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java deleted file mode 100644 index fbec4fb62a4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.ejb; - -import com.sun.s1asdev.deployment.noappxml.util.Util; -import jakarta.ejb.Stateless; -import jakarta.ejb.Remote; - -@Stateless -@Remote({Sless.class}) -public class SlessEJB implements Sless -{ - public String hello() { - Util.log("In SlessEJB:hello()"); - return "hello"; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/util/Util.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/util/Util.java deleted file mode 100644 index 06b605b68b5..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/util/Util.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.deployment.noappxml.util; - -public class Util { - public static void log(String message) { - System.out.println(message); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/web/index.html b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/web/index.html deleted file mode 100644 index 27361f8a59f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/web/index.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - -HTML Only Test - - -

-This is a simple HTML page used for HTML only deployment unit test -

-What else can be put ? - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/web/web.xml b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/web/web.xml deleted file mode 100644 index bc28b27b240..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/web/web.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - dummy web xml - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/application.xml deleted file mode 100644 index 81160c98c60..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/application.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Application description - EARwithWAROnly - - - appmgt-web.war - appmgt/war - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/build.xml deleted file mode 100644 index cc6ce95a30c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/build.xml +++ /dev/null @@ -1,408 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/web.xml deleted file mode 100644 index a13ed51585c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/web.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - This context-param was defined in the web app itself. - builtin - in-app - - - TestServlet - appmgttest.TestServlet - - - TestServlet - /* - - - - 30 - - - - index.jsp - - - This env-entry was defined in the web app app itself. - builtin - java.lang.String - in-app - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/build.xml index cbf597a4b3b..2cce55a44a6 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/ear/build.xml @@ -23,40 +23,18 @@ - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + &commonBuild; + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/application.xml deleted file mode 100644 index 42328d5b517..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/application.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Application description - EARwithEverything - - - sayhello.war - HelloService - - - - statelesshello.jar - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/build.xml deleted file mode 100644 index e99995cab54..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/build.xml +++ /dev/null @@ -1,254 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/config-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/config-interface.xml deleted file mode 100644 index 894789a180a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/config-interface.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/ejb-jar.xml deleted file mode 100644 index 254e84faf82..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/ejb-jar.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - Ejb1 - - - MyStatelesshelloEJB - statelesshello.StatelesshelloHome - statelesshello.Statelesshello - statelesshello.StatelesshelloEJB - Stateless - Container - - - - - - - - - MyStatelesshelloEJB - Remote - sayStatelesshello - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHello.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHello.java deleted file mode 100644 index d715c4ff28b..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHello.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - - package helloservice; - -import java.rmi.Remote; -import java.rmi.RemoteException; - - /* - * This is a minimum WebService interface - */ - public interface SayHello extends Remote { - - /* - * @return a hello string - */ - public String sayHello(String name) throws RemoteException; - - } - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java deleted file mode 100644 index 51bf9b42ff7..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package helloservice; - -import javax.rmi.*; -import java.rmi.*; -import javax.naming.*; -import jakarta.ejb.*; -import statelesshello.*; - -public class SayHelloImpl implements SayHello { - - public String message ="Message from servlet is : Bonjour "; - - public String sayHello(String s) throws RemoteException { - try { - - Context ic = new InitialContext(); - - // create EJB using factory from container - java.lang.Object objref = ic.lookup("java:comp/env/ejb/MyStatelesshello"); - System.out.println("Looked up home!!"); - - StatelesshelloHome home = - (StatelesshelloHome) PortableRemoteObject.narrow( - objref, StatelesshelloHome.class); - System.out.println("Narrowed home!!"); - - Statelesshello hr = home.create(); - System.out.println("Got the EJB!!"); - - // invoke method on the EJB - message = hr.sayStatelesshello() + ";" + message + s; - } catch (Exception e) { - System.out.println("Servlet sayHelloImpl recd exception : " + - e.getMessage()); - e.printStackTrace(); - } - return message; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/portable-app.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/portable-app.xml deleted file mode 100644 index c6d7c89091a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/portable-app.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Application description - EARwithEverything - - - sayhello-portable.war - HelloService - - - - statelesshello-portable.jar - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java deleted file mode 100644 index 1b087673d6d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package statelesshello; - -import jakarta.ejb.*; -import java.rmi.Remote; -import java.rmi.RemoteException; -import java.io.Serializable; - -public interface Statelesshello extends EJBObject { - - public String sayStatelesshello() throws RemoteException; -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java deleted file mode 100644 index 1c0363a2b49..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package statelesshello; - -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; - -public class StatelesshelloEJB implements SessionBean { - private SessionContext sc; - - public StatelesshelloEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In ejbCreate !!"); - } - - public String sayStatelesshello() throws EJBException { - System.out.println("StatelesshelloEJB is saying hello to user\n"); - return("A Big hello from stateless HELLO"); - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java deleted file mode 100644 index 1513c0b8dda..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package statelesshello; - - -import java.io.Serializable; -import java.rmi.Remote; -import java.rmi.RemoteException; -import jakarta.ejb.EJBHome; -import jakarta.ejb.CreateException; - - -public interface StatelesshelloHome extends EJBHome { - - public Statelesshello create () throws RemoteException, CreateException; - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/staticstubclient/SayHelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/staticstubclient/SayHelloClient.java deleted file mode 100644 index d65a7ea738d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/staticstubclient/SayHelloClient.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package staticstubclient; - -import javax.xml.rpc.Stub; -import helloservice.*; - -public class SayHelloClient { - - private String endpointAddress; - - public static void main(String[] args) { - - System.out.println("Endpoint address = " + args[0]); - boolean testPositive = (Boolean.valueOf(args[1])).booleanValue(); - try { - Stub stub = createProxy(); - stub._setProperty - (javax.xml.rpc.Stub.ENDPOINT_ADDRESS_PROPERTY, - args[0]); - SayHello hello = (SayHello)stub; - System.out.println(hello.sayHello("Jerome !")); - } catch (Exception ex) { - if(testPositive) { - ex.printStackTrace(); - System.exit(-1); - } else { - System.out.println("Exception recd as expected"); - } - } - System.exit(0); - } - - private static Stub createProxy() { - // Note: MyHelloService_Impl is implementation-specific. - return - (Stub) (new SayHelloService_Impl().getSayHelloPort()); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-ejb-jar.xml deleted file mode 100644 index 6e45b93de78..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-ejb-jar.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - 0 - - MyStatelesshelloEJB - ejb/MyStatelesshello - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-web.xml deleted file mode 100644 index 77052c43db8..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-web.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - ejb/MyStatelesshello - ejb/MyStatelesshello - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/web.xml deleted file mode 100644 index bc32ab0ab3d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/web.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - HelloServiceWS - - HelloService - helloservice.SayHelloImpl - 0 - - - HelloService - /HelloService - - - 54 - - - ejb/MyStatelesshello - Session - statelesshello.StatelesshelloHome - statelesshello.Statelesshello - MyStatelesshelloEJB - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/webservices.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/webservices.xml deleted file mode 100644 index e4ea4b154d5..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/webservices.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - Very simple web services - - A WebService Servlet that says Hello - WEB-INF/wsdl/SayHelloService.wsdl - mapping.xml - - port component description - SayHelloPort - tns:SayHelloPort - helloservice.SayHello - - HelloService - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestClient.java deleted file mode 100644 index 3f72699685e..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestClient.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package ear.earwithall2; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - -public class TestClient { - - public static void main (String[] args) { - TestClient client = new TestClient(); - client.doTest(args); - } - - public void doTest(String[] args) { - - String url = args[0]; - boolean testPositive = (Boolean.valueOf(args[1])).booleanValue(); - try { - log("Test: devtests/deployment/ear/earwithall2"); - int code = invokeServlet(url); - report(code, testPositive); - } catch (IOException ex) { - if (testPositive) { - ex.printStackTrace(); - fail(); - } else { - log("Caught EXPECTED IOException: " + ex); - pass(); - } - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private int invokeServlet(String url) throws Exception { - log("Invoking URL = " + url); - URL u = new URL(url); - HttpURLConnection c1 = (HttpURLConnection)u.openConnection(); - int code = c1.getResponseCode(); - InputStream is = c1.getInputStream(); - BufferedReader input = new BufferedReader (new InputStreamReader(is)); - String line = null; - while ((line = input.readLine()) != null) { - log(line); - } - return code; - } - - private void report(int code, boolean testPositive) { - if (testPositive) { //expect return code 200 - if(code != 200) { - log("Incorrect return code: " + code); - fail(); - } else { - log("Correct return code: " + code); - pass(); - } - } else { - if(code != 200) { //expect return code !200 - log("Correct return code: " + code); - pass(); - } else { - log("Incorrect return code: " + code); - fail(); - } - } - } - - private void log(String message) { - System.err.println("[ear.earwithall2.Client]:: " + message); - } - - private void pass() { - log("PASSED: devtests/deployment/ear/earwithall2"); - System.exit(0); - } - - private void fail() { - log("FAILED: devtests/deployment/ear/earwithall2"); - System.exit(-1); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder.java deleted file mode 100644 index 9c60aac0697..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package ear.earwithall2; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; - -public class TestDeplOrder { - - public static void main (String[] args) { - TestDeplOrder client = new TestDeplOrder(); - client.doTest(args); - } - - public void doTest(String[] args) { - - String path = args[0]; - try { - log("Test: devtests/deployment/ear/earwithall2"); - log("looking at " + path); - boolean success = readFile(path, "Loading application WebNBean_ejb", "Loading application WebNBean_war"); - if (success) { - pass(); - } else { - fail(); - } - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private boolean readFile(String path, String first, String second) - throws IOException, FileNotFoundException { - int firstLine = -1; - int secondLine = -1; - BufferedReader reader = - new BufferedReader(new FileReader(new File(path))); - String line = reader.readLine(); - int totalLines = 0; - while (line != null) { - ++totalLines; - if ((firstLine < 0) && (line.contains(first))) { - firstLine = totalLines; - } - if ((secondLine < 0) && (line.contains(second))) { - secondLine = totalLines; - } - line = reader.readLine(); - } - reader.close(); - log("first line: " + firstLine); - log("second line: " + secondLine); - if ((firstLine < 0) || - (secondLine < 0)) - return false; - if (firstLine < secondLine) { - return true; - } - return false; - } - private void log(String message) { - System.err.println("[ear.earwithall2.TestDeplOrder]:: " + message); - } - - private void pass() { - log("PASSED: devtests/deployment/ear/earwithall2"); - System.exit(0); - } - - private void fail() { - log("FAILED: devtests/deployment/ear/earwithall2"); - System.exit(-1); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder2.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder2.java deleted file mode 100644 index 9dea1a5f8fe..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder2.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package ear.earwithall2; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; - -public class TestDeplOrder2 { - - public static void main (String[] args) { - TestDeplOrder2 client = new TestDeplOrder2(); - client.doTest(args); - } - - public void doTest(String[] args) { - - String path = args[0]; - try { - log("Test: devtests/deployment/ear/earwithall2"); - log("looking at " + path); - boolean success = readFile(path, "Loading application WebNBeanA", "Loading application WebNBeanC", "Loading application WebNBeanB"); - if (success) { - pass(); - } else { - fail(); - } - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private boolean readFile(String path, String first, String second, String third) - throws IOException, FileNotFoundException { - int firstLine = -1; - int secondLine = -1; - int thirdLine = -1; - BufferedReader reader = - new BufferedReader(new FileReader(new File(path))); - String line = reader.readLine(); - int totalLines = 0; - while (line != null) { - ++totalLines; - if ((firstLine < 0) && (line.contains(first))) { - firstLine = totalLines; - } - if ((secondLine < 0) && (line.contains(second))) { - secondLine = totalLines; - } - if ((thirdLine < 0) && (line.contains(third))) { - thirdLine = totalLines; - } - line = reader.readLine(); - } - reader.close(); - log("first line: " + firstLine); - log("second line: " + secondLine); - log("third line: " + thirdLine); - if ((firstLine < 0) || - (secondLine < 0) || - (thirdLine < 0)) - return false; - if ((firstLine < secondLine) && - (secondLine < thirdLine)) { - return true; - } - return false; - } - private void log(String message) { - System.err.println("[ear.earwithall2.TestDeplOrder2]:: " + message); - } - - private void pass() { - log("PASSED: devtests/deployment/ear/earwithall2"); - System.exit(0); - } - - private void fail() { - log("FAILED: devtests/deployment/ear/earwithall2"); - System.exit(-1); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application-client.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application-client.xml deleted file mode 100644 index ca151d2a9e2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application-client.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - justclient - - ejb/JustBean - Session - justbean.JustBeanHome - justbean.JustBean - JustSessionBean - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application.xml deleted file mode 100644 index f31c63ca9f9..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - foo - Application description - WebNBean - - WebNBean.jar - - - - - WebNBean.war - /webnbean - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/build.xml deleted file mode 100644 index e96bb205e4c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/build.xml +++ /dev/null @@ -1,559 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml deleted file mode 100644 index fb0f874117e..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - -justbean.jar - - -JustSessionBean -justbean.JustBeanHome -justbean.JustBean -justbean.JustSessionBean -Stateless -Bean - - - - - - - - - -JustSessionBean -Home -remove - -java.lang.Object - - - -JustSessionBean -Home -getHomeHandle - - -JustSessionBean -Remote -isIdentical - -jakarta.ejb.EJBObject - - - -JustSessionBean -Home -create - - -JustSessionBean -Home -remove - -jakarta.ejb.Handle - - - -JustSessionBean -Remote -log - -java.lang.String - - - -JustSessionBean -Remote -getHandle - - -JustSessionBean -Remote -findAllMarbles - - -JustSessionBean -Home -getEJBMetaData - - -JustSessionBean -Remote -getPrimaryKey - - -JustSessionBean -Remote -remove - - -JustSessionBean -Remote -getEJBHome - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-application-client.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-application-client.xml deleted file mode 100644 index 1ae5934fd51..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-application-client.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - ejb/JustBean - ejb/JustBean - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-application.xml deleted file mode 100644 index 7fc8d8d215b..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-application.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - false - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-ejb-jar.xml deleted file mode 100644 index b1e3f94f6bb..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-ejb-jar.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - justbean.jar - - JustSessionBean - JustSessionBean - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-web.xml deleted file mode 100644 index 689f296cc86..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-web.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - /webnbean - - ejb/JustBean - ejb/JustBean - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java deleted file mode 100644 index d00efe9ca3b..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package justbean; - -import java.rmi.RemoteException; -import jakarta.ejb.EJBObject; - -public interface JustBean extends EJBObject { - - public void - log(String message) - throws RemoteException; - - public String[] - findAllMarbles() - throws RemoteException; -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java deleted file mode 100644 index 3c97ab6d796..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package justbean; - -import java.rmi.RemoteException; -import jakarta.ejb.EJBHome; -import jakarta.ejb.CreateException; - -public interface JustBeanHome extends EJBHome { - - public JustBean - create() - throws RemoteException, CreateException; - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java deleted file mode 100644 index 713efbfe79f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package justbean; - -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; - -public class JustSessionBean implements SessionBean { - - private SessionContext ctx; - - public void - ejbCreate() - throws RemoteException - { - log("JustSessionBean.ejbCreate()..."); - } - - public void - ejbRemove() - throws RemoteException - { - log("JustSessionBean.ejbRemove()..."); - } - - public void - log(String message) - { - Log.log(message); - } - - public String[] - findAllMarbles() - { - System.out.println("JustSessionBean.findAllMarbles()..."); - String[] strArray = new String[2]; - strArray[0] = "This is a test."; - strArray[1] = "You have lost all your marbles."; - return strArray; - } - - - /** - * ejbDestroy - called by the Container before this bean is destroyed. - */ - public void - ejbDestroy() - { - log("JustSessionBean.ejbDestroy()..."); - } - - /** - * ejbActivate - called by the Container after this bean instance - * is activated from its passive state. - */ - public void - ejbActivate() - { - log("JustSessionBean.ejbActivate()..."); - } - - /** - * ejbPassivate - called by the Container before this bean instance - * is put in passive state. - */ - public void - ejbPassivate() - { - log("JustSessionBean.ejbPassivate()..."); - } - - /** - * setSessionContext - called by the Container after creation of this - * bean instance. - */ - public void - setSessionContext(SessionContext context) - { - log("JustSessionBean.setSessionContext(ctx)... ctx = " + ctx); - ctx = context; - } -} - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/Log.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/Log.java deleted file mode 100644 index 34aa4f478b8..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/Log.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package justbean; - -public class Log implements java.io.Serializable -{ - public static void - log (String message) - { - System.out.println(message); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justclient/JustClient.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justclient/JustClient.java deleted file mode 100644 index 66b10c61706..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justclient/JustClient.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package justclient; - -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import justbean.JustBean; -import justbean.JustBeanHome; - -public class JustClient { - public static void main(String[] args) { - JustClient client = new JustClient(); - client.run(args); - } - - private void run(String[] args) { - System.out.println("JustClient.run()... enter"); - - JustBean bean = null; - try { - Object o = (new InitialContext()).lookup("java:comp/env/ejb/JustBean"); - JustBeanHome home = (JustBeanHome) - PortableRemoteObject.narrow(o, JustBeanHome.class); - bean = home.create(); - - String[] marbles = bean.findAllMarbles(); - for (int i = 0; i < marbles.length; i++) { - System.out.println(marbles[i]); - } - } - catch (Exception ex) { - ex.printStackTrace(); - } - - System.out.println("JustClient.run()... exit"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justweb/JustWebServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justweb/JustWebServlet.java deleted file mode 100644 index e0b7896bb4c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justweb/JustWebServlet.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package justweb; - -import justbean.JustBean; -import justbean.JustBeanHome; -import java.io.IOException; -import java.io.PrintWriter; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -public class JustWebServlet extends HttpServlet -{ - public void - init () - throws ServletException - { - super.init(); - System.out.println("JustWebServlet : init()"); - } - - public void - service (HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException - { - System.out.println("JustWebServlet : service()"); - - JustBean bean = null; - try { - Object o = (new InitialContext()).lookup("java:comp/env/ejb/JustBean"); - JustBeanHome home = (JustBeanHome) - PortableRemoteObject.narrow(o, JustBeanHome.class); - bean = home.create(); - } - catch (Exception ex) { - ex.printStackTrace(); - } - - System.out.println("JustWebServlet.service()... JustBean created."); - System.out.println("USERNAME = " + getInitParameter("USERNAME")); - System.out.println("PASSWORD = " + getInitParameter("PASSWORD")); - - String[] marbles = bean.findAllMarbles(); - for (int i = 0; i < marbles.length; i++) { - System.out.println(marbles[i]); - } - - sendResponse(request, response); - } - - private void - sendResponse (HttpServletRequest request, HttpServletResponse response) - throws IOException - { - PrintWriter out = response.getWriter(); - response.setContentType("text/html"); - - out.println(""); - out.println(""); - out.println("Just Web Test"); - out.println(""); - out.println(""); - out.println("

"); - out.println("Check log information on the server side."); - out.println("
"); - out.println("Isn't this a wonderful life?"); - out.println("

"); - out.println(""); - out.println(""); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/portable.application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/portable.application.xml deleted file mode 100644 index cfa0e9744f7..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/portable.application.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - foo - Application description - WebNBean-DisplayName - - WebNBean-portable.jar - - - - - WebNBean-portable.war - /webnbean - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/web.xml deleted file mode 100644 index fc9209f5a47..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/web.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - JustWeb - - JustWebServlet - JustWebServlet - justweb.JustWebServlet - - - JustWebServlet - /justweb - - - ejb/JustBean - Session - justbean.JustBeanHome - justbean.JustBean - JustSessionBean - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/weba/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/weba/glassfish-web.xml deleted file mode 100644 index b7c1dff36dd..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/weba/glassfish-web.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - /webnbeana - - ejb/JustBean - ejb/JustBean - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/weba/web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/weba/web.xml deleted file mode 100644 index 61ac09437e5..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/weba/web.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - JustWeb - - JustWebServlet - JustWebServlet - justweb.JustWebServlet - - - JustWebServlet - /justweba - - - ejb/JustBean - Session - justbean.JustBeanHome - justbean.JustBean - JustSessionBean - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webb/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webb/glassfish-web.xml deleted file mode 100644 index 1a482ad75c6..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webb/glassfish-web.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - /webnbeanb - - ejb/JustBean - ejb/JustBean - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webb/web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webb/web.xml deleted file mode 100644 index 39d612c89cc..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webb/web.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - JustWeb - - JustWebServlet - JustWebServlet - justweb.JustWebServlet - - - JustWebServlet - /justwebb - - - ejb/JustBean - Session - justbean.JustBeanHome - justbean.JustBean - JustSessionBean - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webc/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webc/glassfish-web.xml deleted file mode 100644 index e4edcff2e8f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webc/glassfish-web.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - /webnbeanc - - ejb/JustBean - ejb/JustBean - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webc/web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webc/web.xml deleted file mode 100644 index b7b9e201753..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webc/web.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - JustWeb - - JustWebServlet - JustWebServlet - justweb.JustWebServlet - - - JustWebServlet - /justwebc - - - ejb/JustBean - Session - justbean.JustBeanHome - justbean.JustBean - JustSessionBean - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/alt-ejbjar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/alt-ejbjar.xml deleted file mode 100644 index 9ddc3e9fff9..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/alt-ejbjar.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - Ejb1 - - - MyStatelesshello - statelesshello.StatelesshelloHome - statelesshello.Statelesshello - statelesshello.StatelesshelloEJB - Stateless - Container - - user - java.lang.String - scott - - - number - java.lang.Double - 22.25 - - - - - - - - - - MyStatelesshello - Remote - sayStatelesshello - - Required - - - - MyStatelesshello - Remote - getUserDefinedException - - Required - - - - MyStatelesshello - Remote - isStatelesshello - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/application.xml deleted file mode 100644 index 2991c8fe579..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/application.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Application description - EARwithEJBOnly - - earwithejb.jar - alt-ejbjar.xml - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/build.xml deleted file mode 100644 index 969e325be02..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/build.xml +++ /dev/null @@ -1,267 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/ejb-jar.xml deleted file mode 100644 index 9ddc3e9fff9..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/ejb-jar.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - Ejb1 - - - MyStatelesshello - statelesshello.StatelesshelloHome - statelesshello.Statelesshello - statelesshello.StatelesshelloEJB - Stateless - Container - - user - java.lang.String - scott - - - number - java.lang.Double - 22.25 - - - - - - - - - - MyStatelesshello - Remote - sayStatelesshello - - Required - - - - MyStatelesshello - Remote - getUserDefinedException - - Required - - - - MyStatelesshello - Remote - isStatelesshello - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/portable-app.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/portable-app.xml deleted file mode 100644 index e80941df5a0..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/portable-app.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Application description - EARwithEJBOnly - - earwithejb-portable.jar - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/sun-alt-ejbjar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/sun-alt-ejbjar.xml deleted file mode 100644 index ece1511e9a0..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/sun-alt-ejbjar.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - Ejb1 - - MyStatelesshello - MyStatelesshello - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/sun-ejb-jar.xml deleted file mode 100644 index ece1511e9a0..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/sun-ejb-jar.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - Ejb1 - - MyStatelesshello - MyStatelesshello - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/altapplication.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/altapplication.xml deleted file mode 100644 index 1f1ce6c9d71..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/altapplication.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Application description - EARwithWAROnly - - - servletonly.war - altwar - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/application.xml deleted file mode 100644 index 52542fa48c8..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/application.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Application description - EARwithWAROnly - - - servletonly.war - war - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/build.xml deleted file mode 100644 index 25e37533598..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/build.xml +++ /dev/null @@ -1,276 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/portable-app.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/portable-app.xml deleted file mode 100644 index 248b34bde3b..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/portable-app.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Application description - EARwithWAROnly - - - servletonly-portable.war - war - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/sun-web.xml deleted file mode 100644 index 5279cd2feb6..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/sun-web.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - war - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/build.xml index dc231d1a8e9..5286479bf21 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/build.xml @@ -94,7 +94,7 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/build.xml index d29f7882c57..6b53819029f 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/build.xml @@ -34,7 +34,7 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/build.xml index ef4ae921631..1c7fa3a2662 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/build.xml @@ -94,7 +94,7 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/build.xml index d29f7882c57..6b53819029f 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/build.xml @@ -34,7 +34,7 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/application.xml deleted file mode 100644 index 52542fa48c8..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/application.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Application description - EARwithWAROnly - - - servletonly.war - war - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/build.xml deleted file mode 100644 index 51e28bf72f9..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/build.xml +++ /dev/null @@ -1,202 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/portable-app.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/portable-app.xml deleted file mode 100644 index 248b34bde3b..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/portable-app.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Application description - EARwithWAROnly - - - servletonly-portable.war - war - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/sun-web.xml deleted file mode 100644 index 5279cd2feb6..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/sun-web.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - war - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/application-client.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/application-client.xml deleted file mode 100644 index bb305cb9011..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/application-client.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - application client for wstoejb application - wstoejbClient - - web service ref - service/WstoEjbService - wstoejb.WebServiceToEjb - META-INF/wsdl/WebServiceToEjb.wsdl - mapping.xml - - wstoejb.WebServiceToEjbSEI - WebServiceToEjbSEIPort - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/build.xml deleted file mode 100644 index 204b1084c38..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/build.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/sun-application-client.xml deleted file mode 100644 index faf43de78b2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/sun-application-client.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - service/WstoEjbService - http://HTTP_HOST:HTTP_PORT/wstoejb/wstoejb?WSDL - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wscompile_config.xml deleted file mode 100644 index e781eb38955..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wscompile_config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wstoejb/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wstoejb/Client.java deleted file mode 100644 index 5ba67b190d6..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wstoejb/Client.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package wstoejb; - -import javax.naming.*; -import javax.xml.namespace.QName; -import javax.xml.rpc.Stub; -import javax.xml.rpc.Call; -import javax.xml.rpc.Service; - -import wstoejb.WebServiceToEjbSEI; - - -/** - * This is a appclient test - */ -public class Client { - - public static void main(String args[]) { - - boolean testPositive = (Boolean.valueOf(args[0])).booleanValue(); - try { - Context ic = new InitialContext(); - - Service myWebService = (Service) - ic.lookup("java:comp/env/service/WstoEjbService"); - WebServiceToEjbSEI port = (WebServiceToEjbSEI) myWebService.getPort(WebServiceToEjbSEI.class); - System.out.println(port.payload("APPCLIENT as client")); - } catch(Throwable t) { - if(testPositive) { - t.printStackTrace(); - System.exit(-1); - } else { - System.out.println("Recd exception as expected"); - } - } - System.exit(0); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/application.xml deleted file mode 100644 index 39f5fe05a87..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/application.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Application description - WebServiceToEjbApp - - - sayhello.war - wstoejb - - - - appclient.jar - - - wstoejb.jar - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/build.xml deleted file mode 100644 index 5adcc743418..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/build.xml +++ /dev/null @@ -1,204 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/build.xml deleted file mode 100644 index 535b9ca8410..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/build.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/ejb-jar.xml deleted file mode 100644 index dabe6452241..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/ejb-jar.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Ejb1 - - - WsToEjbSessionBean - wstoejb.StatefulSessionBeanHome - wstoejb.StatefulSessionBean - wstoejb.StatefulSessionBeanEJB - Stateful - Container - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/sun-ejb-jar.xml deleted file mode 100644 index bfcb3c931e7..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/sun-ejb-jar.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - Ejb1 - - WsToEjbSessionBean - WsToEjbSessionBean - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java deleted file mode 100644 index 522216aa93a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package wstoejb; - -import jakarta.ejb.EJBObject; -import java.rmi.RemoteException; - -/** - * Simple interface for a statefull session bean. - * - * @author Jerome Dochez - */ -public interface StatefulSessionBean extends EJBObject { - - /** - * perform some kind of processing - * @param payload is the request info - * @return the processed info - * @throws RemoteException - */ - public String payLoad(String payload) throws RemoteException; -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java deleted file mode 100644 index 39d31131107..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package wstoejb; - -import jakarta.ejb.*; -import java.rmi.RemoteException; - -/** - * Simple interface for a statefull session bean. - * - * @author Jerome Dochez - */ -public class StatefulSessionBeanEJB implements SessionBean { - - private SessionContext sc; - - public StatefulSessionBeanEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In ejbCreate !!"); - } - - public void setSessionContext(SessionContext sc) { - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} - - /** - * perform some kind of processing - * @param payload is the request info - * @return the processed info - * @throws RemoteException - */ - public String payLoad(String payload) throws RemoteException { - return "Hey " + payload + ", I am such a dummy ejb, don't bother !"; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java deleted file mode 100644 index d47f2cbfcec..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package wstoejb; - -import java.rmi.RemoteException; -import jakarta.ejb.EJBHome; -import jakarta.ejb.CreateException; - -/** - * Simple interface to create a statefull session bean - * - * @author Jerome Dochez - */ -public interface StatefulSessionBeanHome extends EJBHome { - - public StatefulSessionBean create () throws RemoteException, CreateException; - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/portable-app.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/portable-app.xml deleted file mode 100644 index f0bef4374fa..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/portable-app.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Application description - WebServiceToEjbApp - - - sayhello-portable.war - wstoejb - - - - appclient-portable.jar - - - wstoejb-portable.jar - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/build.xml deleted file mode 100644 index 51a5339bd81..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/build.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/config-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/config-interface.xml deleted file mode 100644 index 4db777fef9b..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/config-interface.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/sun-web.xml deleted file mode 100644 index 8e1d87c08be..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/sun-web.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - wstoejb - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/web.xml deleted file mode 100644 index 0032f13362f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/web.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - WebServiceToEjbWebApp - - WebServiceToEjbServlet - wstoejb.WebServiceToEjbServlet - 0 - - - WebServiceToEjbServlet - /wstoejb - - - 54 - - - MyEjbReference - Session - wstoejb.StatefulSessionBeanHome - wstoejb.StatefulSessionBean - WsToEjbSessionBean - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/webservices.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/webservices.xml deleted file mode 100644 index 3be9902e9e4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/webservices.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - Very simple web services - - A WebService Servlet that will invoke an ejb - WEB-INF/wsdl/WebServiceToEjb.wsdl - mapping.xml - - port component description - WebServiceToEjbSEIPort - tns:WebServiceToEjbSEIPort - wstoejb.WebServiceToEjbSEI - - WebServiceToEjbServlet - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbSEI.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbSEI.java deleted file mode 100644 index e79b531f333..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbSEI.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - - package wstoejb; - -import java.rmi.Remote; -import java.rmi.RemoteException; - - /* - * This interface is the service endpoint interface for a simple webservices - * interfacing a simple EJB - * - * @author Jerome Dochez - */ - public interface WebServiceToEjbSEI extends Remote { - - /* - * Invoke the ejb - */ - public String payload(String requestInfo) throws RemoteException; - - } diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbServlet.java deleted file mode 100644 index ba067e55d1c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbServlet.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package wstoejb; - -import java.rmi.*; -import javax.rmi.*; -import javax.naming.*; - - - /** - * Simple servlet implementation of the SEI - * - * @author Jerome Dochez - */ - public class WebServiceToEjbServlet implements WebServiceToEjbSEI { - - /** - * Implementation of the SEI's methods - */ - public String payload(String requestInfo) throws RemoteException { - try { - if (bean==null) { - bean = createEJB(); - } - return(getMsg(requestInfo) + "; and dont bother this dummy servlet also"); - } catch(Exception e) { - throw new RemoteException(e.getMessage()); - } - } - - /** - * Creates the ejb object from it's home interface - */ - private StatefulSessionBean createEJB() throws Exception { - // connect to the EJB - Context ctxt = new InitialContext(); - java.lang.Object objref = ctxt.lookup("java:comp/env/MyEjbReference"); - StatefulSessionBeanHome homeIntf = (StatefulSessionBeanHome) PortableRemoteObject.narrow(objref, StatefulSessionBeanHome.class); - return homeIntf.create(); - } - - public String getMsg(String info) throws Exception { - if (bean == null) { - return "could not talk to the EJB : java:comp/env/MyEjbReference"; - } else { - return bean.payLoad(info); - } - } - - private StatefulSessionBean bean; - } diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/build.xml deleted file mode 100644 index 0302fc5d84d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/build.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/StatelessHelloTest.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/StatelessHelloTest.java deleted file mode 100644 index ce61b3ce5ff..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/StatelessHelloTest.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package devtests.deployment.ejb.statelesshello.testng; - -import devtests.deployment.DeploymentTest; -import org.apache.tools.ant.taskdefs.CallTarget; -import org.apache.tools.ant.taskdefs.ExecTask; -import org.apache.tools.ant.taskdefs.Property; -import org.testng.annotations.Configuration; -import org.testng.annotations.Test; - -/** - * Illustrates an example test relying some of the inherited logic - * in DeploymentTest. - * - * The general flow of this test is: - * - * assemble the jars - * deploy the app and run the client - * redeploy the app and run the client - * undeploy the app - * deploy the app using JSR-88 and run the client - * redeploy the app using JSR-88 and run the client - * undeploy the app using JSR-88 - * - * @author: tjquinn - * - */ - -public class StatelessHelloTest extends DeploymentTest { - - private int nextLogID = 0; - - /** Creates a new instance of ExampleTest */ - public StatelessHelloTest() { - } - - /** - *Deploy the app using asadmin and run it, expecting a positive result. - */ - @Test - public void deployWithAsadminAndRun() { - deploy(); - runPositive("ejb/statelessejb Test asadmin deploy"); - } - - /** - *Redeploy and run after first test. - */ - @Test(dependsOnMethods={"deployWithAsadminAndRun"}) - public void redeployWithAsadminAndRun() { - redeploy(); - runPositive("ejb/statelessejb Test asadmin redeploy"); - } - - /** - *Undeploy using asadmin after first deployment and redeployment. - */ - @Test(alwaysRun=true,dependsOnMethods={"redeployWithAsadminAndRun"}) - public void undeployAfterAsadminRuns() { - undeploy(); - } - - /** - *Deploy with JSR-88 and run. - */ - @Test(dependsOnMethods={"undeployAfterAsadminRuns"}) - public void deployWithJSR88AndRun() { - deployWithJSR88(); - runPositive("ejb/statelessejb Test jsr88 deploy"); - } - - /** - *Stop using JSR-88 and attempt to run. - */ - @Test(dependsOnMethods={"deployWithJSR88AndRun"}) - public void stopAndRetry() { - stopWithJSR88(); - runNegative("ejb/statelessejb Test jsr88 stopped state"); - } - - /** - *Start with JSR-88 and attempt to run. - */ - @Test(dependsOnMethods={"stopAndRetry"}) - public void startAndRetry() { - startWithJSR88(); - runPositive("ejb/statelessejb Test jsr88 started state"); - } - - /** - *Stop, redeploy, and attempt to run (should fail). - */ - @Test(dependsOnMethods={"startAndRetry"}) - public void stopRedeployAndRetry() { - stopWithJSR88(); - redeployWithJSR88(); - runNegative("ejb/statelessejb Test jsr88 redeploy stop"); - } - - @Configuration(afterTestClass=true) - public void unsetup() { - undeployAtEnd(); - } - - public void undeployAtEnd() { - undeployWithJSR88(); - } - - protected void deployWithJSR88() { - project.executeTarget("deploy.jsr88"); - } - - protected void startWithJSR88() { - project.executeTarget("start.jsr88"); - } - - protected void stopWithJSR88() { - project.executeTarget("stop.jsr88"); - } - - protected void redeployWithJSR88() { - project.executeTarget("redeploy.jsr88"); - } - - protected void undeployWithJSR88() { - project.executeTarget("undeploy.jsr88"); - } - - protected void runPositive(String testTitle) { - run(testTitle, "run.positive"); - } - - protected void runNegative(String testTitle) { - run(testTitle, "run.negative"); - } - - protected void run(String testTitle, String runTarget) { - CallTarget target = new CallTarget(); - target.setProject(project); - target.setTarget(runTarget); - - Property logID = target.createParam(); - Property description = target.createParam(); - logID.setName("log.id"); - logID.setValue(String.valueOf(nextLogID++)); - description.setName("description"); - description.setValue(testTitle); - - target.execute(); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/build.xml deleted file mode 100644 index 516645a0d9e..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/build.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/ejb-jar.xml deleted file mode 100644 index 9ddc3e9fff9..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/ejb-jar.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - Ejb1 - - - MyStatelesshello - statelesshello.StatelesshelloHome - statelesshello.Statelesshello - statelesshello.StatelesshelloEJB - Stateless - Container - - user - java.lang.String - scott - - - number - java.lang.Double - 22.25 - - - - - - - - - - MyStatelesshello - Remote - sayStatelesshello - - Required - - - - MyStatelesshello - Remote - getUserDefinedException - - Required - - - - MyStatelesshello - Remote - isStatelesshello - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java deleted file mode 100644 index 73dfb005337..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package standaloneclient; - -import java.util.*; -import jakarta.ejb.EJBHome; -import statelesshello.*; -import javax.naming.*; -import javax.rmi.PortableRemoteObject; -import org.omg.CORBA.ORB; - - -public class HelloClient { - - public static void main(String[] args) { - - boolean testPositive = (Boolean.valueOf(args[0])).booleanValue(); - if(testPositive) - System.out.println("Test expects successful result"); - else - System.out.println("Test expected to fail"); - try { - - Context ic = new InitialContext(); - - // create EJB using factory from container - java.lang.Object objref = ic.lookup("MyStatelesshello"); - - System.out.println("Looked up home!!"); - - StatelesshelloHome home = - (StatelesshelloHome) PortableRemoteObject.narrow( - objref, - StatelesshelloHome.class); - System.out.println("Narrowed home!!"); - - Statelesshello hr = home.create(); - System.out.println("Got the EJB!!"); - - // invoke method on the EJB - System.out.println(hr.sayStatelesshello()); - System.out.println( - "Client's sayStatelesshello() method succeeded\n"); - try { - - System.out.println( - "Client now getting a User Defined Exception"); - System.out.println(hr.getUserDefinedException()); - - } catch (StatelesshelloException he) { - System.out.println("Success! Caught StatelesshelloException"); - System.out.println( - "Client's getUserDefinedException() method succeeded\n"); - - } catch (java.rmi.ServerException se) { - if (se.detail instanceof StatelesshelloException) { - System.out.println( - "Success! Caught StatelesshelloException"); - System.out.println( - "Client's getUserDefinedException() method succeeded\n"); - - } else { - System.out.println("Failure! Caught unasked for Exception"); - System.exit(-1); - } - } - System.out.println( - "Client is now trying to remove the session bean\n"); - hr.remove(); - } catch (NamingException ne) { - if(testPositive) { - System.out.println("Caught exception while initializing context : " + - ne.getMessage() + " \n"); - System.exit(-1); - } else { - System.out.println("Recd exception as expected"); - } - } catch (Exception re) { - if(testPositive) { - re.printStackTrace(); - System.out.println( "Session beans could not be removed by the client.\n"); - System.exit(-1); - } else { - System.out.println("Recd exception as expected"); - } - } - System.out.println( - "Session bean was successfully removed by the client.\n"); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java deleted file mode 100644 index ca7d5d5bdf7..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package statelesshello; - -import jakarta.ejb.*; -import java.rmi.Remote; -import java.rmi.RemoteException; -import java.io.Serializable; - -public interface Statelesshello extends EJBObject { - - public String sayStatelesshello() throws RemoteException; - public String getUserDefinedException() throws RemoteException, StatelesshelloException; -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java deleted file mode 100644 index 1d24e735473..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package statelesshello; - -import java.io.Serializable; -import java.io.InputStream; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; - -public class StatelesshelloEJB implements SessionBean { - private SessionContext sc; - - public StatelesshelloEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In ejbCreate !!"); - } - - public boolean isStatelesshello() throws EJBException { - return true; - } - - public String sayStatelesshello() throws EJBException { - - - try { - System.err.println("URL: "+getClass().getResource("/statelesshello/")); - System.err.println("URL: "+getClass().getResource("/statelesshello/StatelesshelloEJB.class")); - InputStream is = getClass().getResourceAsStream("/statelesshello/StatelesshelloEJB.class"); - System.err.println("Stream: " + is); - is.close(); - } catch (Exception ex) { - ex.printStackTrace(); - } - - - - Double d = null; - String name = null; - StringBuffer buffer = new StringBuffer("Statelesshello EJB - checked environment properties for user "); - System.out.println("StatelesshelloEJB is saying hello to user\n"); - System.out.println("Now going forward with reading the environment properties\n"); - - try { - InitialContext ic = new InitialContext(); - name = (String) ic.lookup("java:comp/env/user"); - buffer.append(name); - buffer.append("\nand for number which is = "); - d = (Double) ic.lookup("java:comp/env/number"); - buffer.append(d); - buffer.append("\n"); - } catch(NamingException e) { - e.printStackTrace(); - throw new EJBException(e.getMessage()); - } - if(d == null) { - throw new EJBException("Wrong value for environment property"); - } - System.out.println(buffer); - return new String(buffer); - } - - public String getUserDefinedException() throws RemoteException, StatelesshelloException { - - System.out.println("Throwing a User Defined Exception"); - throw new StatelesshelloException("test exception"); - - } - - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloException.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloException.java deleted file mode 100644 index c89fd374a74..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloException.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package statelesshello; - -import java.rmi.RemoteException; - -public class StatelesshelloException extends Exception { - - public StatelesshelloException(String str) { - super(str); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java deleted file mode 100644 index 1513c0b8dda..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package statelesshello; - - -import java.io.Serializable; -import java.rmi.Remote; -import java.rmi.RemoteException; -import jakarta.ejb.EJBHome; -import jakarta.ejb.CreateException; - - -public interface StatelesshelloHome extends EJBHome { - - public Statelesshello create () throws RemoteException, CreateException; - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/sun-ejb-jar.xml deleted file mode 100644 index ece1511e9a0..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/sun-ejb-jar.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - Ejb1 - - MyStatelesshello - MyStatelesshello - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/build.xml deleted file mode 100644 index eaa7358db16..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/build.xml +++ /dev/null @@ -1,224 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/config-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/config-interface.xml deleted file mode 100644 index 894789a180a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/config-interface.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/ejb-jar.xml deleted file mode 100644 index dc779eddde5..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/ejb-jar.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - SayHelloJAR - - - SayHelloEJB - helloservice.SayHello - helloservice.SayHelloEJB - Stateless - Container - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHello.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHello.java deleted file mode 100644 index 5477ce57d29..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHello.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package helloservice; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -public interface SayHello extends Remote { - public String sayHello(String name) throws RemoteException; -} - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java deleted file mode 100644 index 5f25a8a9258..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package helloservice; - -import jakarta.ejb.*; -import java.rmi.RemoteException; - -public class SayHelloEJB implements SessionBean { - - private SessionContext sc; - - public SayHelloEJB() {} - - public void ejbCreate() throws CreateException {} - - public String sayHello(String s) throws RemoteException { - return "Hello EJB returns your Hello : " + s; - } - - public void setSessionContext(SessionContext sc) { - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - public void ejbActivate() {} - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/staticstubclient/SayHelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/staticstubclient/SayHelloClient.java deleted file mode 100644 index 7e6b0e04ef5..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/staticstubclient/SayHelloClient.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package staticstubclient; - -import javax.xml.rpc.Stub; -import helloservice.*; - -public class SayHelloClient { - - public static void main(String[] args) { - - System.out.println("Endpoint address = " + args[0]); - boolean testPositive = (Boolean.valueOf(args[1])).booleanValue(); - try { - Stub stub = createProxy(); - stub._setProperty - (javax.xml.rpc.Stub.ENDPOINT_ADDRESS_PROPERTY, args[0]); - SayHello hello = (SayHello)stub; - System.out.println(hello.sayHello("Hi There ejb endpoint !!!")); - } catch (Exception ex) { - if(testPositive) { - ex.printStackTrace(); - System.exit(-1); - } else { - System.out.println("Exception recd as expected"); - } - } - System.exit(0); - } - - private static Stub createProxy() { - return (Stub) (new SayHelloService_Impl().getSayHelloPort()); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/sun-ejb-jar.xml deleted file mode 100644 index a8005c8c99d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/sun-ejb-jar.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - SayHelloJAR - - SayHelloEJB - SayHelloEJB - - SayHelloPort - ejb/sayhello - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/webservices.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/webservices.xml deleted file mode 100644 index a84a55420be..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/webservices.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - desc - - A WebService EJB that says Hello - META-INF/wsdl/SayHelloService.wsdl - mapping.xml - - port component description - SayHelloPort - tns:SayHelloPort - helloservice.SayHello - - SayHelloEJB - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/build.xml index 76a2c05c634..0dd99cb2caf 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/build.xml @@ -90,7 +90,7 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestClient.java deleted file mode 100644 index eac1fed44f4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestClient.java +++ /dev/null @@ -1,290 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package devtests.deployment.jsr88.apitests; - -import java.io.*; -import java.util.*; -import javax.enterprise.deploy.spi.*; -import javax.enterprise.deploy.spi.status.ProgressEvent; -import javax.enterprise.deploy.spi.status.DeploymentStatus; -import javax.enterprise.deploy.shared.ModuleType; -import devtests.deployment.util.JSR88Deployer; - -public class TestClient { - - /** - *system property (integer) specifying the sleep delay to introduce into ProgressobjectImpl event notification - *to make sure a possible race condition does not occur. The property also has a default value. - */ - private final String SLEEP_TIME_PROPERTY_NAME = "devtests.sleepDurationForProgressObjectImplRaceTest"; - private final Integer SLEEP_TIME_DEFAULT = new Integer(4000); - - JSR88Deployer depl = null; - - private void initDeployer(String[] args) throws Exception { - log("Getting access to JSR88 deployer: using URI = " + args[1]); - depl = new JSR88Deployer(args[1], args[2], args[3]); - } - - private boolean checkIfAppsArePresent(TargetModuleID[] reportedApps, HashMap expectedApps) { - for(int i=0; i - *You can use this program to create multiple threads in the same JVM (all - *running the same task) or to run multiple copies of the program in different - *JVMs but synchronized. - *

- *arguments: - * --host - * --port - * --username - * --password - * --operation [*] - * --startTime (as H:mm:ss) - * --delay - *

- *where can be getTargets, getApps, loopGetTargets"); - * n (default=1) is the number of concurrent threads to share the connection at once - * testStartTime is a time in the current day, specified as [H]H:mm:ss default is to start immediately - *

- *The getTargets and getApps tasks invoke the corresponding back-end method only - *once in each thread. The loopGetTargets is more likely to induce problems if - *there are race conditions somewhere in the code path, since it invokes the - *getTargets method multiple times from each thread. - *

- *The system property sleep.time, if set, is used as the delay between when - *multiple threads are started. This is normally not needed but could be used - *to stagger the requests from the threads that are started to see if doing - *so avoids any race conditon that is revealed by starting the threads - *without delay. - * - *The classpath must include: - * javaee.jar - * appserv-deployment-client.jar - * appserv-admin.jar - * - * @author tjquinn - */ -public class TestJSR88Concurrency { - - private DeploymentFactory factory; - - private DeploymentManager manager; - - private static final String HOST = "--host"; - private static final String PORT = "--port"; - private static final String USERNAME = "--username"; - private static final String PASSWORD = "--password"; - private static final String OPERATION = "--operation"; - private static final String START_TIME = "--startTime"; - private static final String DELAY = "--delay"; - private static final String SECURE = "--secure"; - private static final String TIMEOUT = "--timeout"; - - /** initialization info for the command-line option names and defaults, if any */ - private static final String[][] optionsAndDefaults = new String[][] - { {HOST, "localhost"}, - {PORT, "4848"}, - {USERNAME, "admin"}, - {PASSWORD, "adminadmin"}, - {OPERATION, null}, // no default value - {START_TIME, null}, // no default value - {DELAY, "0"}, - {SECURE, "false"}, - {TIMEOUT, "10000"} // 10 seconds - }; - - /* command-line option names and values */ - private HashMap options; - - /* used to control how many iterations of the loopGetTargets will run */ - private static final int LOOP_MAX = 100; - - /** - * Creates a new instance of TestJSR88Concurrency - */ - public TestJSR88Concurrency() { - } - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - try { - new TestJSR88Concurrency().run(args); - } catch (Throwable thr) { - thr.printStackTrace(); - System.exit(1); - } - } - - private void run(String[] args) throws DeploymentManagerCreationException, TargetException, InterruptedException, ParseException, UserException { - try { - prepareArgs(args); - factory = initFactory(); - manager = initManager( - getHost(), - getPort(), - getUsername(), - getPassword(), - options.get(SECURE).equalsIgnoreCase("true")); - - waitForTargetTime(); - - processFunction(getOperation()); - } catch (UserException ue) { - System.err.println("User error: " + ue.getMessage()); - System.exit(1); - } - - } - - private void waitForTargetTime() throws ParseException, InterruptedException { - if (getTargetTimeText() == null) { - System.out.println("No start delay specified; continuing immediately"); - return; - } - SimpleDateFormat targetTimeFormat = new SimpleDateFormat("H:mm:ss"); - Calendar targetTime = Calendar.getInstance(); - targetTime.setTime(targetTimeFormat.parse(getTargetTimeText())); - - Calendar now = Calendar.getInstance(); - targetTime.set(now.get(Calendar.YEAR), now.get(Calendar.MONTH), now.get(Calendar.DAY_OF_MONTH)); - System.out.println("Currently it is " + now.getTime().toString()); - System.out.println("Waiting until " + targetTime.getTime().toString()); - Thread.sleep(targetTime.getTimeInMillis() - System.currentTimeMillis()); - System.out.println("Proceeding"); - } - - private void prepareArgs(String[] args) throws UserException { - options = initOptionsMap(); - - int i = 0; - while (i < args.length) { - if (options.containsKey(args[i])) { - options.put(args[i], getRequiredOptionValue(args, ++i)); - } else if (args[i].startsWith("--")) { - throw new UserException("Unrecognized option " + args[i]); - } - i++; - } - - ensureRequiredInfoSupplied(); - } - - private void ensureRequiredInfoSupplied() throws UserException { - if (getOperation() == null) { - throw new UserException("Expected --operation but none was found"); - } - } - - private HashMap initOptionsMap() { - HashMap result = new HashMap(); - for (String[] optionAndValue : optionsAndDefaults) { - result.put(optionAndValue[0], optionAndValue[1]); - } - return result; - } - - private String getRequiredOptionValue(String[] args, int valuePosition) throws UserException { - if ((valuePosition >= args.length) || (args[valuePosition].startsWith("--"))) { - throw new UserException("No value available for " + args[valuePosition - 1]); - } - return args[valuePosition]; - } - - private void usage() { - System.out.println("devtests.deployment.jsr88.apitests.TestJSR88Concurrency --host --port --username --password --operation [*] --startTime testStartTime (as H:mm:ss) --delay --secure true/false"); - System.out.println(" where can be getTargets, getApps, loopGetTargets"); - System.out.println(" n (default=1) is the number of concurrent threads to share the connection at once"); - System.out.println(" testStartTime is a time in the current day, specified as [H]H:mm:ss default is to start immediately"); - System.out.println(" delay is the number of milliseconds to wait between starting threads"); - } - - private DeploymentFactory initFactory() { - /* - *We know we are testing our factory, so just instantiate it. - */ - return new SunDeploymentFactory(); - } - - private DeploymentManager initManager( - String host, - String port, - String username, - String password, - boolean secure) throws DeploymentManagerCreationException { - String url = "deployer:Sun:AppServer::" + host + ":" + port + getConnectionStringSuffix(secure); - return factory.getDeploymentManager(url, username, password); - } - - private void processFunction(String function) throws TargetException, InterruptedException { - /* - *The star, if present, separates the operation name from the number of - *threads on which to run that operation. - */ - String[] pieces = function.split("\\*"); - long delay = getDelay(); - int parallelThreadCount = 1; - if (pieces.length > 1) { - parallelThreadCount = Integer.parseInt(pieces[1]); - } - if (parallelThreadCount == 1) { - performFunction(pieces[0], 1); - } else { - Thread[] threads = new Thread[parallelThreadCount]; - AtomicBoolean[] threadOK = new AtomicBoolean[parallelThreadCount]; - for (int i = 0; i < parallelThreadCount; i++) { - threadOK[i] = new AtomicBoolean(); - threads[i] = new Thread(new Runner(pieces[0], i, threadOK[i])); - threads[i].start(); - /* - *No need to wait if we just started the last thread. - */ - if (delay != 0 && i < parallelThreadCount - 1) { - Thread.currentThread().sleep(delay); - } - } - boolean allThreadsOK = true; - for (int i = 0; i < parallelThreadCount; i++) { - Thread t = threads[i]; - t.join(getTimeout()); - allThreadsOK &= threadOK[i].get(); - } - - if ( ! allThreadsOK) { - throw new RuntimeException("At least one thread failed"); - } - } - } - - private void printTargets(int threadID) { - - System.out.println("[" + threadID + "]Targets:"); - for (Target t : getTargets()) { - System.out.println("[" + threadID + "] " + t.getName()); - } - System.out.println(); - } - - private Target[] getTargets() { - return manager.getTargets(); - } - - private TargetModuleID[] getApps() throws TargetException { - Target[] targets = getTargets(); - ModuleType[] types = new ModuleType[] {ModuleType.EJB, ModuleType.EAR, ModuleType.CAR, ModuleType.RAR}; - List result = new ArrayList(); - for (ModuleType mt : types) { - result.addAll(Arrays.asList(manager.getAvailableModules(mt, targets))); - } - return result.toArray(new TargetModuleID[result.size()]); - } - - private void printApps(int threadID) throws TargetException { - System.out.println("[" + threadID + "]Applications:"); - for (TargetModuleID id : getApps()) { - System.out.println("[" + threadID + "] " + id.getModuleID()); - } - System.out.println("[" + threadID + "]"); - } - - private void loopGetTargets() { - getTargets(); // to warm up the connection - long startTime = System.currentTimeMillis(); - for (int i = 0; i < LOOP_MAX; i++) { - getTargets(); - } - System.out.println((System.currentTimeMillis() - startTime)); - } - - private void performFunction(String function, int threadID) throws TargetException { - if (function.equals("getTargets")) { - printTargets(threadID); - } else if (function.equals("getApps")) { - printApps(threadID); - } else if (function.equals("loopGetTargets")) { - loopGetTargets(); - } else { - System.err.println("No recognized function in thread " + threadID); - } - } - - private void multiGetApps() { - - } - - private String getStartTimeText() { - return options.get(START_TIME); - } - - private String getHost() { - return options.get(HOST); - } - - private String getPort() { - return options.get(PORT); - } - - private String getUsername() { - return options.get(USERNAME); - } - - private String getPassword() { - return options.get(PASSWORD); - } - - private String getOperation() { - return options.get(OPERATION); - } - - private String getTargetTimeText() { - return options.get(START_TIME); - } - - private long getDelay() { - return Long.parseLong(options.get(DELAY)); - } - - private String getConnectionStringSuffix(boolean secure) { - return secure ? ":https" : ""; - } - - private long getTimeout() { - return Long.parseLong(options.get(TIMEOUT)); - } - - private class Runner implements Runnable { - - private String function; - private int threadID; - private AtomicBoolean result; - - public Runner(String function, int threadID, AtomicBoolean result) { - Runner.this.function = function; - this.threadID = threadID; - this.result = result; - } - - public void run() { - try { - performFunction(function, threadID); - result.set(true); - } catch (Throwable thr) { - result.set(false); - synchronized (TestJSR88Concurrency.this) { - System.err.println(Thread.currentThread().getName()); - thr.printStackTrace(); - } - } - - } - } - - /** - *Indicates a user error, such as a missing command-line value, that should - *be displayed without a stack trace. - */ - public class UserException extends Exception { - public UserException(String msg) { - super(msg); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/build.xml deleted file mode 100644 index 9502fb5e6f4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/build.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - - -]> - - - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/build.xml deleted file mode 100644 index 5debba1165e..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/build.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/build.xml deleted file mode 100644 index 07d012a7fe8..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/build.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/build.xml deleted file mode 100644 index 0409ec253e3..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/build.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/DeployTargetModuleIDTester.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/DeployTargetModuleIDTester.java deleted file mode 100644 index 028de29b205..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/DeployTargetModuleIDTester.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * DeployTargetModuleIDTester.java - * - * Created on January 27, 2004, 10:07 AM - */ - -package devtests.deployment.jsr88.targetmoduleid.deploytargetmoduleid; - -import java.io.File; -import javax.enterprise.deploy.spi.TargetModuleID; -import javax.enterprise.deploy.shared.ModuleType; -import javax.enterprise.deploy.spi.Target; -import javax.enterprise.deploy.spi.status.ProgressObject; - -import com.sun.enterprise.deployment.archivist.ApplicationArchivist; -import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.BundleDescriptor; -import com.sun.enterprise.deployment.util.ModuleDescriptor; - -import devtests.deployment.util.JSR88Deployer; - -/** - * - * @author Jerome Dochez - */ -public class DeployTargetModuleIDTester extends JSR88Deployer { - - /** Creates a new instance of DeployTargetModuleIDTester */ - public DeployTargetModuleIDTester(String host, String port, String user, String password) { - super(host, port, user, password); - } - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - - try { - DeployTargetModuleIDTester deployer = getDeployer(args); - TargetModuleID[] ids = deployer.deploy(args); - if (deployer.test(ids, args[6])) { - log("Test Passed"); - System.exit(0); - } else { - log("Test FAILED"); - deployer.dumpModulesIDs("", ids); - System.exit(1); - } - - } catch(Exception e) { - e.printStackTrace(); - System.exit(1); - } - } - - protected static DeployTargetModuleIDTester getDeployer(String[] args) { - return new DeployTargetModuleIDTester(args[1], args[2], args[3], args[4]); - } - - - protected TargetModuleID[] deploy(String[] args) throws Exception { - - File inputFile = new File(args[6]); - if (!inputFile.exists()) { - error("File not found : " + inputFile.getPath()); - System.exit(1); - } - File deploymentFile = null; - if (args.length > 6) { - deploymentFile = new File(args[7]); - if (!args[7].equals("null")) { - if (!deploymentFile.exists()) { - error("Deployment File not found : " + deploymentFile.getPath()); - System.exit(1); - } - } - } - - log("Deploying " + inputFile + " plan: " + deploymentFile); - ProgressObject po = deploy(inputFile, deploymentFile, false); - return po.getResultTargetModuleIDs(); - } - - protected boolean test(TargetModuleID[] moduleIDs, String path) - throws Exception - { - - if (moduleIDs.length==0) { - // deployment failed ? - log("Deployment failed, got zero TargetModuleID"); - System.exit(1); - } - - // we are loading the deployed file and checking that the moduleIDs are - // correct - Application app = ApplicationArchivist.openArchive(new File(path)); - - if (app.isVirtual()) { - BundleDescriptor bd = app.getStandaloneBundleDescriptor(); - - // standalone module, should be fast. - if (moduleIDs.length!=1) { - // wrong number... - log("Error " + path + " is a standalone module, got more than 1 targetmoduleID"); - dumpModulesIDs("", moduleIDs); - return false; - } - } else { - for (int i=0;i - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/ClientConfigurationTester.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/ClientConfigurationTester.java deleted file mode 100644 index b23c3fea43e..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/ClientConfigurationTester.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * GetWebUriTester.java - * - * Created on January 28, 2004, 3:36 PM - */ - -package jsr88.deploymentmanager.distribute.clientconfiguration; - -import java.io.File; -import javax.enterprise.deploy.spi.TargetModuleID; -import javax.enterprise.deploy.shared.ModuleType; -import javax.enterprise.deploy.spi.Target; -import javax.enterprise.deploy.spi.status.ClientConfiguration; -import javax.enterprise.deploy.spi.status.ProgressObject; - -import com.sun.enterprise.deployment.archivist.ApplicationArchivist; -import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.BundleDescriptor; -import com.sun.enterprise.deployment.util.ModuleDescriptor; - -import devtests.deployment.util.JSR88Deployer; - -/** - * - * @author Jerome Dochez - */ -public class ClientConfigurationTester extends JSR88Deployer { - - /** Creates a new instance of DeployTargetModuleIDTester */ - public ClientConfigurationTester(String host, String port, String user, String password) { - super(host, port, user, password); - } - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - - try { - ClientConfigurationTester deployer = getDeployer(args); - ProgressObject po = deployer.deploy(args); - if (deployer.test(po, args[6])) { - System.exit(0); - } else { - deployer.dumpModulesIDs("", po.getResultTargetModuleIDs()); - System.exit(1); - } - - } catch(Exception e) { - e.printStackTrace(); - System.exit(1); - } - } - - protected static ClientConfigurationTester getDeployer(String[] args) { - return new ClientConfigurationTester(args[1], args[2], args[3], args[4]); - } - - - protected ProgressObject deploy(String[] args) throws Exception { - - File inputFile = new File(args[6]); - if (!inputFile.exists()) { - error("File not found : " + inputFile.getPath()); - System.exit(1); - } - File deploymentFile = null; - if (args.length > 6) { - deploymentFile = new File(args[7]); - if (!args[7].equals("null")) { - if (!deploymentFile.exists()) { - error("Deployment File not found : " + deploymentFile.getPath()); - System.exit(1); - } - } - } - - log("Deploying " + inputFile + " plan: " + deploymentFile); - return deploy(inputFile, deploymentFile, false); - } - - protected boolean test(ProgressObject po, String path) - throws Exception - { - - TargetModuleID[] moduleIDs = po.getResultTargetModuleIDs(); - if (moduleIDs.length==0) { - // deployment failed ? - log("Deployment failed, got zero TargetModuleID"); - System.exit(1); - } - - // we are loading the deployed file and checking that the moduleIDs are - // correct - Application app = ApplicationArchivist.openArchive(new File(path)); - - if (app.isVirtual()) { - BundleDescriptor bd = app.getStandaloneBundleDescriptor(); - - // standalone module, should be fast. - if (moduleIDs.length!=1) { - // wrong number... - log("Error " + path + " is a standalone module, got more than 1 targetmoduleID"); - dumpModulesIDs("", moduleIDs); - return false; - } - - // let's just check that the web uri is fine - if (bd.getModuleType().equals(ModuleType.WAR)) { - if (moduleIDs[0].getWebURL()==null) { - log("Error : standalone web module and getWebURI() returned null"); - return false; - } - } - } else { - for (int i=0;i - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/DeployGetWebUrlTester.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/DeployGetWebUrlTester.java deleted file mode 100644 index 9697fe2a31d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/DeployGetWebUrlTester.java +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * GetWebUriTester.java - * - * Created on January 28, 2004, 3:36 PM - */ - -package devtests.deployment.jsr88.targetmoduleid.deploygetweburl; - -import java.io.File; -import javax.enterprise.deploy.spi.TargetModuleID; -import javax.enterprise.deploy.shared.ModuleType; -import javax.enterprise.deploy.spi.Target; -import javax.enterprise.deploy.spi.status.ProgressObject; - -import com.sun.enterprise.deployment.archivist.ApplicationArchivist; -import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.BundleDescriptor; -import com.sun.enterprise.deployment.util.ModuleDescriptor; - -import devtests.deployment.util.JSR88Deployer; - -/** - * - * @author Jerome Dochez - */ -public class DeployGetWebUrlTester extends JSR88Deployer { - - /** Creates a new instance of DeployTargetModuleIDTester */ - public DeployGetWebUrlTester(String host, String port, String user, String password) { - super(host, port, user, password); - } - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - - try { - DeployGetWebUrlTester deployer = getDeployer(args); - TargetModuleID[] ids = deployer.deploy(args); - if (deployer.test(ids, args[6])) { - System.exit(0); - } else { - deployer.dumpModulesIDs("", ids); - System.exit(1); - } - - } catch(Exception e) { - e.printStackTrace(); - System.exit(1); - } - } - - protected static DeployGetWebUrlTester getDeployer(String[] args) { - return new DeployGetWebUrlTester(args[1], args[2], args[3], args[4]); - } - - - protected TargetModuleID[] deploy(String[] args) throws Exception { - - File inputFile = new File(args[6]); - if (!inputFile.exists()) { - error("File not found : " + inputFile.getPath()); - System.exit(1); - } - File deploymentFile = null; - if (args.length > 6) { - deploymentFile = new File(args[7]); - if (!args[7].equals("null")) { - if (!deploymentFile.exists()) { - error("Deployment File not found : " + deploymentFile.getPath()); - System.exit(1); - } - } - } - - log("Deploying " + inputFile + " plan: " + deploymentFile); - ProgressObject po = deploy(inputFile, deploymentFile, false); - return po.getResultTargetModuleIDs(); - } - - protected boolean test(TargetModuleID[] moduleIDs, String path) - throws Exception - { - - if (moduleIDs.length==0) { - // deployment failed ? - log("Deployment failed, got zero TargetModuleID"); - System.exit(1); - } - - // we are loading the deployed file and checking that the moduleIDs are - // correct - Application app = ApplicationArchivist.openArchive(new File(path)); - - if (app.isVirtual()) { - BundleDescriptor bd = app.getStandaloneBundleDescriptor(); - - // standalone module, should be fast. - if (moduleIDs.length!=1) { - // wrong number... - log("Error " + path + " is a standalone module, got more than 1 targetmoduleID"); - dumpModulesIDs("", moduleIDs); - return false; - } - - // let's just check that the web uri is fine - if (bd.getModuleType().equals(ModuleType.WAR)) { - if (moduleIDs[0].getWebURL()==null) { - log("Error : standalone web module and getWebURI() returned null"); - return false; - } - } - } else { - for (int i=0;i - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/build.xml deleted file mode 100644 index 7d0f7d1912c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/build.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/ChildTargetModuleIDTester.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/ChildTargetModuleIDTester.java deleted file mode 100644 index 59522566158..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/ChildTargetModuleIDTester.java +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * DeployTargetModuleIDTester.java - * - * Created on January 27, 2004, 10:07 AM - */ - -package jsr88.deploymentmanager.getXModules.childtmid; - -import java.io.File; -import javax.enterprise.deploy.spi.TargetModuleID; -import javax.enterprise.deploy.shared.ModuleType; -import javax.enterprise.deploy.spi.Target; -import javax.enterprise.deploy.spi.status.*; - -import com.sun.enterprise.deployment.archivist.ApplicationArchivist; -import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.BundleDescriptor; -import com.sun.enterprise.deployment.util.ModuleDescriptor; - -import devtests.deployment.util.JSR88Deployer; - -/** - * - * @author Jerome Dochez - */ -public class ChildTargetModuleIDTester extends JSR88Deployer { - - /** Creates a new instance of DeployTargetModuleIDTester */ - public ChildTargetModuleIDTester(String host, String port, String user, String password) { - super(host, port, user, password); - } - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - - try { - ChildTargetModuleIDTester deployer = getDeployer(args); - TargetModuleID[] ids = deployer.deploy(args); - if (deployer.test(ids, args[6])) { - log("Test Passed"); - System.exit(0); - } else { - log("Test FAILED"); - deployer.dumpModulesIDs("", ids); - System.exit(1); - } - - } catch(Exception e) { - e.printStackTrace(); - System.exit(1); - } - } - - protected static ChildTargetModuleIDTester getDeployer(String[] args) { - return new ChildTargetModuleIDTester(args[1], args[2], args[3], args[4]); - } - - - protected TargetModuleID[] deploy(String[] args) throws Exception { - - File inputFile = new File(args[6]); - if (!inputFile.exists()) { - error("File not found : " + inputFile.getPath()); - System.exit(1); - } - File deploymentFile = null; - if (args.length > 6) { - deploymentFile = new File(args[7]); - if (!args[7].equals("null")) { - if (!deploymentFile.exists()) { - error("Deployment File not found : " + deploymentFile.getPath()); - System.exit(1); - } - } - } - - log("Deploying " + inputFile + " plan: " + deploymentFile); - ProgressObject po = deploy(inputFile, deploymentFile, false); - return po.getResultTargetModuleIDs(); - } - - protected boolean test(TargetModuleID[] moduleIDs, String path) - throws Exception - { - - // hack for std modules - - TargetModuleID[] aTargetModuleIDs = findApplication("sayhello", ModuleType.WAR, null); - - dumpModulesIDs("war", aTargetModuleIDs); - - if (moduleIDs.length==0) { - // deployment failed ? - log("Deployment failed, got zero TargetModuleID"); - System.exit(1); - } - - // we are loading the deployed file and checking that the moduleIDs are - // correct - Application app = ApplicationArchivist.openArchive(new File(path)); - - // check of non running modules - ModuleType modType; - if (app.isVirtual()) { - modType = app.getStandaloneBundleDescriptor().getModuleType(); - } else { - modType = ModuleType.EAR; - } - - // now we need to start the application - for (int i=0;i - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/ear/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/ear/build.xml deleted file mode 100644 index c3afeb1821d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/ear/build.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/META-INF/application-client.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/META-INF/application-client.xml deleted file mode 100644 index 9467f3dc642..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/META-INF/application-client.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - appclienttest - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/META-INF/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/META-INF/sun-application-client.xml deleted file mode 100644 index f2016359fa4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/META-INF/sun-application-client.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/SimpleJSR88Client.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/SimpleJSR88Client.java deleted file mode 100644 index 3f49164f56b..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/SimpleJSR88Client.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * SimpleJSR88Client.java - * - *Provides access to the JSR88 API through a convenient command line. - *

- *This is intended for internal testing use only. - * - * Created on January 21, 2004, 11:22 AM - */ - -import java.io.File; -import java.util.jar.Manifest; - -import java.net.*; - -import javax.enterprise.deploy.shared.ModuleType; -import javax.enterprise.deploy.spi.factories.*; -import javax.enterprise.deploy.shared.factories.*; -import javax.enterprise.deploy.spi.status.*; -import javax.enterprise.deploy.spi.*; -import javax.enterprise.deploy.spi.exceptions.*; - -//import javax.enterprise.deploy.model.*; - -/** - * - * @author tjquinn - */ -public class SimpleJSR88Client { - - - private final String J2EE_DEPLOYMENT_MANAGER = "J2EE-DeploymentFactory-Implementation-Class"; - - private DeploymentFactory deploymentFactory; - - private DeploymentManager deploymentManager; - - private String host; - - private String port; - - private String user; - - private String password; - - private String uri; - - /** Creates a new instance of SimpleJSR88Client */ - public SimpleJSR88Client(String host, String port, String user, String password) { - this.host = host; - this.port = port; - this.user = user; - this.password = password; - this.uri = "deployer:Sun:AppServer::" + host + ":" + port; - } - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - /* - *Get properties indicating the user, password, host, and port. - */ - String host = null; - String port = null; - String user = null; - String password = null; - - if (((host = System.getProperty("jsr88client.host")) == null) - || ((port = System.getProperty("jsr88client.port")) == null) - || ((user = System.getProperty("jsr88client.user")) == null) - || ((password = System.getProperty("jsr88client.password")) == null) ) { - System.out.println("The properties jsr88client.host, jsr88client.port, jsr88client.user, and jsr88client.password must be assigned"); - System.exit(-1); - } - - try { - new SimpleJSR88Client(host, port, user, password).run(args); - System.exit(0); - } catch (Throwable thr) { - System.out.println("Error executing simple JSR88 client"); - thr.printStackTrace(System.out); - System.exit(1); - } - } - - public void run(String[] args) throws TargetException, DeploymentManagerCreationException { - if (args.length == 0) { - throw new IllegalArgumentException("Specify the JSR88 client command you want to execute as the first command line parameter"); - } - - if (args[0].equals("getAvailableAppClientModules") ){ - getAvailableModules(ModuleType.CAR); - } else { - throw new IllegalArgumentException("Unrecognized JSR88 client command specified: " + args[0]); - } - } - - private void getAvailableModules(ModuleType type) throws TargetException, DeploymentManagerCreationException { - Target targets [] = getDeploymentManager().getTargets(); - TargetModuleID [] moduleIDs = getDeploymentManager().getAvailableModules(type, targets); - System.out.println("Available modules listing"); - for (int i = 0; i < moduleIDs.length; i++) { - System.out.println("Module " + i + ": " + moduleIDs[i].getModuleID()); - } - System.out.println(); - } - - private DeploymentFactory loadDeploymentFactory() { - System.out.println("Loading deployment factory"); - Object deploymentFactory = null; - File file = null; - String className = null; - try { - file = new File(System.getProperty("com.sun.aas.installRoot") - + File.separator+ "lib" + File.separator + "deployment" - + File.separator + "sun-as-jsr88-dm.jar"); - - Manifest mf = new java.util.jar.JarFile(file).getManifest(); - className = mf.getMainAttributes().getValue(J2EE_DEPLOYMENT_MANAGER); - URL[] urls = new URL[]{file.toURL()}; - URLClassLoader urlClassLoader = new java.net.URLClassLoader(urls, getClass().getClassLoader()); - Class factory = null; - try { - factory=urlClassLoader.loadClass(className); - } catch (ClassNotFoundException cnfe) { - cnfe.printStackTrace(); - System.exit(-1); - } - - try { - deploymentFactory = factory.newInstance(); - } catch (Exception ie) { - ie.printStackTrace(); - System.exit(-1); - } - if (deploymentFactory instanceof DeploymentFactory) { - DeploymentFactoryManager.getInstance().registerDeploymentFactory((DeploymentFactory) deploymentFactory); - } else { - System.out.println("Expected instance of DeploymentFactory from class loading of " + className + " but got " + deploymentFactory.getClass().getName() + " instead"); - System.exit(-1); - } - - } catch (Exception ex) { - log("Failed to load the deployment factory using URL " + file.getAbsolutePath() + " and class " + className); - ex.printStackTrace(); - System.exit(-1); - } - System.out.println("Deployment factory loaded."); - return (DeploymentFactory) deploymentFactory; - - } - - private static void log(String message) { - System.out.println("[" + getJSRClientName() + "]:: " + message); - } - - protected static String getJSRClientName() { - return "SimpleJSR88Client"; - } - - protected DeploymentFactory getDeploymentFactory() { - if (this.deploymentFactory == null) { - this.deploymentFactory = loadDeploymentFactory(); - } - return this.deploymentFactory; - } - - private DeploymentManager loadDeploymentManager() throws DeploymentManagerCreationException { - System.out.println("Loading deployment manager using uri " + this.uri + " under user " + this.user); - DeploymentManager answer = getDeploymentFactory().getDeploymentManager(this.uri, this.user, this.password); - System.out.println("Deployment manager loaded."); - return answer; - } - - protected DeploymentManager getDeploymentManager() throws DeploymentManagerCreationException { - if (this.deploymentManager == null) { - this.deploymentManager = loadDeploymentManager(); - } - return this.deploymentManager; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestOpenJarFileWorkaround.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestOpenJarFileWorkaround.java deleted file mode 100644 index f29ddc6c209..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestOpenJarFileWorkaround.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * TestOpenJarFileWorkaround.java - * - * Created on February 8, 2004, 3:36 PM - */ - -import devtests.deployment.util.JSR88Deployer; - -import javax.enterprise.deploy.model.*; -import javax.enterprise.deploy.spi.*; -import javax.enterprise.deploy.shared.ModuleType; - -import java.io.File; - -/** - * - * @author tjquinn - */ -public class TestOpenJarFileWorkaround { - - private static final String here = "devtests/deployment/jsr88/misc"; - - /** - Values taken from command-line arguments - */ - private String host = null; - private String port = null; - private String user = null; - private String password = null; - private String warFileToDeploy = null; - - private JSR88Deployer depl = null; - - /** Creates a new instance of TestOpenJarFileWorkaround */ - public TestOpenJarFileWorkaround() { - } - - private void initDeployer(String host, String port, String user, String password) throws Exception { - log("Getting access to JSR88 deployer"); - depl = new JSR88Deployer(host, port, user, password); - } - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - TestOpenJarFileWorkaround test = new TestOpenJarFileWorkaround(); - try { - test.run(args); - test.pass(); - } catch (Throwable th) { - th.printStackTrace(System.out); - test.fail(); - } - } - - private void log(String message) { - System.out.println("[TestProgressObjectImpl]:: " + message); - } - - private void pass() { - log("PASSED: " + here); - System.exit(0); - } - - private void fail() { - log("FAILED: " + here); - System.exit(-1); - } - - private void prepareArgs(String[] args) { - if (args.length < 5) { - log("Expected 5 arguments (host, port, user, password, war) but found " + args.length); - fail(); - } - - this.host = args[0]; - this.port = args[1]; - this.user = args[2]; - this.password = args[3]; - this.warFileToDeploy = args[4]; - } - - public void run(String[] args) throws Throwable { - - /* - *Prepare instance variables from the command-line arguments for convenience. - */ - prepareArgs(args); - - /* - *Locate the web archive to deploy. - */ - File warFile = new File(this.warFileToDeploy); - if ( ! warFile.exists()) { - log("Could not find war file " + warFile.getAbsolutePath()); - fail(); - } - - /* - *Initialize the deployer for use during the test. - */ - initDeployer(host, port, user, password); - - /* - *Start by deploying the web app. - */ - int firstDeployResult = depl.deploy(warFile, /*deploymentPlan */ null, /* startByDefault */ true); - - if (firstDeployResult != 0) { - log("Failed to deploy war file " + warFile.getAbsolutePath() + " the first time."); - fail(); - } - - /* - *Next, undeploy the same web app. - *Get the list of modules acted upon so we can specify the correct module ID to undeploy. - */ - TargetModuleID [] firstListOfApps = depl.getMostRecentTargetModuleIDs(); - - if (firstListOfApps.length != 1) { - log("Expected exactly one result module from the deployer but found " + firstListOfApps.length); - for (int i = 0; i < firstListOfApps.length; i++) { - log(" " + firstListOfApps[i].getModuleID()); - } - fail(); - } - - int firstUndeployResult = depl.undeploy(firstListOfApps[0].getModuleID()); - - if (firstUndeployResult != 0) { - log("Error undeploying the web application the first time."); - fail(); - } - - /* - *Now, try to deploy the app again. - */ - int secondDeployResult = depl.deploy(warFile, /*deploymentPlan */ null, /* startByDefault */ true); - - if (secondDeployResult != 0) { - log("Failed to deploy war file " + warFile.getAbsolutePath() + " the second time."); - fail(); - } - - /* - *Undeploy the web app one last time. - */ - TargetModuleID [] secondListOfApps = depl.getMostRecentTargetModuleIDs(); - - if (secondListOfApps.length != 1) { - log("Expected exactly one application from the deployer but found " + secondListOfApps.length); - for (int i = 0; i < secondListOfApps.length; i++) { - log(" " + secondListOfApps[i].getModuleID()); - } - fail(); - } - - int secondUndeployResult = depl.undeploy(secondListOfApps[0].getModuleID()); - - if (secondUndeployResult != 0) { - log("Error undeploying the web application the second time."); - fail(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestProgressObjectImpl.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestProgressObjectImpl.java deleted file mode 100644 index 20178cfb0ea..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestProgressObjectImpl.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * TestProgressObjectImpl.java - * - * Created on January 15, 2004, 10:10 AM - */ - -import javax.enterprise.deploy.spi.status.ProgressListener; -import org.glassfish.deployapi.ProgressObjectImpl; -import org.glassfish.deployapi.TargetImpl; -import org.glassfish.deployment.client.DeploymentFacilityFactory; -import org.glassfish.deployment.client.DeploymentFacility; -import org.glassfish.deployment.client.AbstractDeploymentFacility; -import javax.enterprise.deploy.shared.StateType; - -import java.io.File; -import java.io.PrintStream; -import java.io.FileOutputStream; -import java.io.FileNotFoundException; - -/** - *Makes sure that the ProgressObjectImpl class functions correctly. - *

- *In particular, bug 4977764 reported that the ProgressObjectImpl class was susceptible to - *concurrent update failures in the vector that holds registered progress listeners. The - *fireProgressEvent method worked with the vector of listeners itself rather than a clone of the vector. - *One of the listeners unregistered itself from the progress object, so when the iterator tried to - *get the next element it detected the concurrent update. So, the progress object now clones the vector - *temporarily in fireProgressEvent and iterates through the clone. - * - * @author tjquinn - */ -public class TestProgressObjectImpl { - - private static final String here = "devtests/deployment/jsr88/misc"; - - /** - *Provides a concrete implementation of the progress object for testing. Note that the behavior being - *tested is actually that of the superclass ProgressObjectImpl. - */ - public class MyProgressObjectImpl extends ProgressObjectImpl { - - public MyProgressObjectImpl(TargetImpl target) { - super(target); - } - - /** - *Required by the abstract class definition but not used during testing. - */ - public void run() {} - - /** - *Stands in as an operation that fires an event to registered listeners. - */ - public void act() { - fireProgressEvent(StateType.RUNNING, "starting"); - /* - *This is where any real work would be done. It's useful to test with two events just in case - *that would uncover any problems. - */ - fireProgressEvent(StateType.COMPLETED, "done"); - } - } - - /** - *Adds a new listener during the event handling. - */ - public class MeddlingListenerAdder implements ProgressListener { - - - public void handleProgressEvent(javax.enterprise.deploy.spi.status.ProgressEvent progressEvent) { - /* - *Meddle in the listener list by adding a new listener to the list. This should trigger the error - *in the original version of ProgressObjectImpl but should not in the fixed version. - */ - TestProgressObjectImpl.this.theProgressObjectImpl.addProgressListener(new TestProgressObjectImpl.MeddlingListenerRemover()); - } - - } - - /** - *Removes itself as a listener during the event handling. - */ - public class MeddlingListenerRemover implements ProgressListener { - - - public void handleProgressEvent(javax.enterprise.deploy.spi.status.ProgressEvent progressEvent) { - /* - *Meddle in the listener list by removing itself from the list. This should trigger the error - *in the original version of ProgressObjectImpl but should not in the fixed version. - */ - TestProgressObjectImpl.this.theProgressObjectImpl.removeProgressListener(this); - } - - } - - /* Local progress object implementation to be tested. */ - private MyProgressObjectImpl theProgressObjectImpl; - - /** Creates a new instance of TestProgressObjectImpl */ - public TestProgressObjectImpl() { - } - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - TestProgressObjectImpl test = new TestProgressObjectImpl(); - try { - test.run(args); - test.pass(); - } catch (Throwable th) { - th.printStackTrace(System.out); - test.fail(); - } - } - - public void run(String[] args) { - addNewListenerDuringEventHandling(); - } - - /** - * Tamper with the listener list by adding a new listener during event handling. - */ - private void addNewListenerDuringEventHandling() { - /* - *Create a TargetImpl just to satisfy the signature of the constructor for the progress object implementation. - */ - DeploymentFacility df = DeploymentFacilityFactory.getDeploymentFacility(); - TargetImpl target = new TargetImpl((AbstractDeploymentFacility)df, "test", "test"); - theProgressObjectImpl = new MyProgressObjectImpl(target); - TestProgressObjectImpl.MeddlingListenerAdder meddlingListener1 = new TestProgressObjectImpl.MeddlingListenerAdder(); - TestProgressObjectImpl.MeddlingListenerAdder meddlingListener2 = new TestProgressObjectImpl.MeddlingListenerAdder(); - - theProgressObjectImpl.addProgressListener(meddlingListener1); - theProgressObjectImpl.addProgressListener(meddlingListener2); - - /* - *Fire an event that will change the listener set. - */ - theProgressObjectImpl.act(); - - } - - private void log(String message) { - System.out.println("[TestProgressObjectImpl]:: " + message); - } - - private void pass() { - log("PASSED: " + here); - System.exit(0); - } - - private void fail() { - log("FAILED: " + here); - System.exit(-1); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/build.xml deleted file mode 100644 index 294d430448c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/build.xml +++ /dev/null @@ -1,232 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/build.xml deleted file mode 100644 index 10a09b4c3a0..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/build.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/AddressBean.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/AddressBean.java deleted file mode 100644 index f0587dd816a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/AddressBean.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.io.Serializable; - -public class AddressBean implements Serializable { - - private String street; - private String city; - private String state; - private String zip; - - public AddressBean() { } - - public AddressBean(String street, String city, - String state, String zip) { - - this.street = street; - this.city = city; - this.state = state; - this.zip = zip; - } - - public String getStreet() { - return street; - } - - public void setStreet(String street) { - this.street = street; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getZip() { - return zip; - } - - public void setZip(String zip) { - this.zip = zip; - } - - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CoffeeBreak.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CoffeeBreak.properties deleted file mode 100644 index c2c912aafde..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CoffeeBreak.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -query.url=http://localhost:8082/RegistryServer/ -publish.url=http://localhost:8082/RegistryServer/ -endpoint.url=http://localhost:8080/jaxrpc-coffee-supplier/jaxrpc -saaj.url=http://localhost:8080/saaj-coffee-supplier - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/ConfirmationBean.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/ConfirmationBean.java deleted file mode 100644 index 0ab383d5f4b..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/ConfirmationBean.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.io.Serializable; -import java.util.*; - -public class ConfirmationBean implements Serializable { - - private String orderId; - private Calendar shippingDate; - - public ConfirmationBean() { } - - public ConfirmationBean(String orderId, Calendar shippingDate) { - - this.orderId = orderId; - this.shippingDate = shippingDate; - } - - public String getOrderId() { - return orderId; - } - - public void setOrderId(String orderId) { - this.orderId = orderId; - } - - public Calendar getShippingDate() { - return shippingDate; - } - - public void setShippingDate(Calendar shippingDate) { - this.shippingDate = shippingDate; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CustomerBean.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CustomerBean.java deleted file mode 100644 index f042d522e99..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CustomerBean.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.io.Serializable; - -public class CustomerBean implements Serializable { - - private String firstName; - private String lastName; - private String phoneNumber; - private String emailAddress; - - public CustomerBean() { } - - public CustomerBean(String firstName, String lastName, - String phoneNumber, String emailAddress) { - - this.firstName = firstName; - this.lastName = lastName; - this.phoneNumber = phoneNumber; - this.emailAddress = emailAddress; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getEmailAddress() { - return emailAddress; - } - - public void setEmailAddress(String emailAddress) { - this.emailAddress = emailAddress; - } - - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/DateHelper.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/DateHelper.java deleted file mode 100644 index a2673590c71..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/DateHelper.java +++ /dev/null @@ -1,212 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.util.*; -import java.text.SimpleDateFormat; - -/** - * This class contains helper methods for dealing with - * Date objects. - */ - -public final class DateHelper { - - public static final Date getDate(int year, int month, int day, - int hour, int minute) { - - // returns a Date with the specified time elements - - Calendar cal = new GregorianCalendar(year, intToCalendarMonth(month), - day, hour, minute); - - return cal.getTime(); - - } // getDate - - public static final Date getDate(int year, int month, int day) { - - // returns a Date with the specified time elements, - // with the hour and minutes both set to 0 (midnight) - - Calendar cal = new GregorianCalendar(year, intToCalendarMonth(month), - day); - - return cal.getTime(); - - } // getDate - - static public final Date addDays(Date target, int days) { - - // returns a Date that is the sum of the target Date - // and the specified number of days; - // to subtract days from the target Date, the days - // argument should be negative - - long msPerDay = 1000 * 60 * 60 * 24; - long msTarget = target.getTime(); - long msSum = msTarget + (msPerDay * days); - Date result = new Date(); - result.setTime(msSum); - return result; - } // addDays - - - static public int dayDiff(Date first, Date second) { - - // returns the difference, in days, between the first - // and second Date arguments - - long msPerDay = 1000 * 60 * 60 * 24; - long diff = (first.getTime() / msPerDay) - (second.getTime() / msPerDay); - Long convertLong = new Long(diff); - return convertLong.intValue(); - } // dayDiff - - - static public int getYear(Date date) { - - Calendar cal = new GregorianCalendar(); - cal.setTime(date); - return cal.get(Calendar.YEAR); - } // getYear - - static public int getMonth(Date date) { - - Calendar cal = new GregorianCalendar(); - cal.setTime(date); - int calendarMonth = cal.get(Calendar.MONTH); - return calendarMonthToInt(calendarMonth); - } // getMonth - - static public int getDay(Date date) { - - Calendar cal = new GregorianCalendar(); - cal.setTime(date); - return cal.get(Calendar.DAY_OF_MONTH); - } // getDay - - static public int getHour(Date date) { - - Calendar cal = new GregorianCalendar(); - cal.setTime(date); - return cal.get(Calendar.HOUR_OF_DAY); - } // geHour - - static public int getMinute(Date date) { - - Calendar cal = new GregorianCalendar(); - cal.setTime(date); - return cal.get(Calendar.MINUTE); - } // geMinute - - private static int calendarMonthToInt(int calendarMonth) { - - if (calendarMonth == Calendar.JANUARY) - return 1; - else if (calendarMonth == Calendar.FEBRUARY) - return 2; - else if (calendarMonth == Calendar.MARCH) - return 3; - else if (calendarMonth == Calendar.APRIL) - return 4; - else if (calendarMonth == Calendar.MAY) - return 5; - else if (calendarMonth == Calendar.JUNE) - return 6; - else if (calendarMonth == Calendar.JULY) - return 7; - else if (calendarMonth == Calendar.AUGUST) - return 8; - else if (calendarMonth == Calendar.SEPTEMBER) - return 9; - else if (calendarMonth == Calendar.OCTOBER) - return 10; - else if (calendarMonth == Calendar.NOVEMBER) - return 11; - else if (calendarMonth == Calendar.DECEMBER) - return 12; - else - return 1; - - } // calendarMonthToInt - - public static String format(Date date, String pattern) { - - // returns a String representation of the date argument, - // formatted according to the pattern argument, which - // has the same syntax as the argument of the SimpleDateFormat - // class - - SimpleDateFormat formatter = new SimpleDateFormat(pattern); - return formatter.format(date); - - } // format - - public static String format(Calendar cal, String pattern) { - - SimpleDateFormat formatter = new SimpleDateFormat(pattern); - return formatter.format(calendarToDate(cal)); - - } // format - - private static int intToCalendarMonth(int month) { - - if (month == 1) - return Calendar.JANUARY; - else if (month == 2) - return Calendar.FEBRUARY; - else if (month == 3) - return Calendar.MARCH; - else if (month == 4) - return Calendar.APRIL; - else if (month == 5) - return Calendar.MAY; - else if (month == 6) - return Calendar.JUNE; - else if (month == 7) - return Calendar.JULY; - else if (month == 8) - return Calendar.AUGUST; - else if (month == 9) - return Calendar.SEPTEMBER; - else if (month == 10) - return Calendar.OCTOBER; - else if (month == 11) - return Calendar.NOVEMBER; - else if (month == 12) - return Calendar.DECEMBER; - else - return Calendar.JANUARY; - - } // intToCalendarMonth - - public static Calendar dateToCalendar(Date date) { - - Calendar cal = new GregorianCalendar(); - cal.setTime(date); - return cal; - - } // dateToCalendar - - public static Date calendarToDate(Calendar cal) { - - return cal.getTime(); - - } // calendarToDate - -} // class diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/LineItemBean.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/LineItemBean.java deleted file mode 100644 index 17f887e0220..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/LineItemBean.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.io.Serializable; -import java.math.BigDecimal; - -public class LineItemBean implements Serializable { - - private String coffeeName; - private BigDecimal pounds; - private BigDecimal price; - - public LineItemBean() { } - - public LineItemBean(String coffeeName, BigDecimal pounds, - BigDecimal price) { - - this.coffeeName = coffeeName; - this.pounds = pounds; - this.price = price; - } - - public String getCoffeeName() { - return coffeeName; - } - - public void setCoffeeName(String coffeeName) { - this.coffeeName = coffeeName; - } - - public BigDecimal getPounds() { - return pounds; - } - - public void setPounds(BigDecimal pounds) { - this.pounds = pounds; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/OrderBean.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/OrderBean.java deleted file mode 100644 index 4e036011578..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/OrderBean.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.io.Serializable; -import java.math.BigDecimal; - -public class OrderBean implements Serializable { - - private String id; - private CustomerBean customer; - private LineItemBean[] lineItems; - private BigDecimal total; - private AddressBean address; - - public OrderBean() { - } - - public OrderBean( AddressBean address, CustomerBean customer, String id, - LineItemBean[] lineItems, BigDecimal total) { - - this.id = id; - this.customer = customer; - this.total = total; - this.lineItems = lineItems; - this.address = address; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public CustomerBean getCustomer() { - return customer; - } - - public void setCustomer(CustomerBean customer) { - this.customer = customer; - } - - public BigDecimal getTotal() { - return total; - } - - public void setTotal(BigDecimal total) { - this.total = total; - } - - public LineItemBean[] getLineItems() { - return lineItems; - } - - public void setLineItems(LineItemBean[] lineItems) { - this.lineItems = lineItems; - } - - public AddressBean getAddress() { - return address; - } - - public void setAddress(AddressBean address) { - this.address = address; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/PriceItemBean.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/PriceItemBean.java deleted file mode 100644 index b4124e10db3..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/PriceItemBean.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.io.Serializable; -import java.math.BigDecimal; - -public class PriceItemBean implements Serializable { - - private String coffeeName; - private BigDecimal pricePerPound; - - public PriceItemBean() { } - - public PriceItemBean(String coffeeName, BigDecimal pricePerPound) { - - this.coffeeName = coffeeName; - this.pricePerPound = pricePerPound; - } - - public String getCoffeeName() { - return coffeeName; - } - - public void setCoffeeName(String coffeeName) { - this.coffeeName = coffeeName; - } - - public BigDecimal getPricePerPound() { - return pricePerPound; - } - - public void setPricePerPound(BigDecimal pricePerPound) { - this.pricePerPound = pricePerPound; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/PriceListBean.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/PriceListBean.java deleted file mode 100644 index cdec3a7c79d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/PriceListBean.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.io.Serializable; -import java.util.*; - -public class PriceListBean implements Serializable { - - private Calendar startDate; - private Calendar endDate; - private PriceItemBean[] priceItems; - - public PriceListBean() { - } - - public PriceListBean(Calendar startDate, Calendar endDate, - PriceItemBean[] priceItems) { - - this.startDate = startDate; - this.endDate = endDate; - this.priceItems = priceItems; - } - - public Calendar getStartDate() { - return startDate; - } - - public void setStartDate(Calendar date) { - this.startDate = date; - } - - public Calendar getEndDate() { - return endDate; - } - - public void setEndDate(Calendar date) { - this.endDate = date; - } - - public PriceItemBean[] getPriceItems() { - return priceItems; - } - - public void setPriceItems(PriceItemBean[] priceItems) { - this.priceItems = priceItems; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/URLHelper.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/URLHelper.java deleted file mode 100644 index de381cf4ba2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/URLHelper.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; -import java.util.ResourceBundle; - -public final class URLHelper { - - public static final String getSaajURL() { - - ResourceBundle registryBundle = - ResourceBundle.getBundle("com.sun.cb.CoffeeBreak"); - - String saajURL = registryBundle.getString("saaj.url"); - - - return saajURL; - - } // getDate - - public static final String getEndpointURL() { - - ResourceBundle registryBundle = - ResourceBundle.getBundle("com.sun.cb.CoffeeBreak"); - - String endPointURL = registryBundle.getString("endpoint.url"); - - - return endPointURL; - - } // getDate - - public static final String getQueryURL() { - - ResourceBundle registryBundle = - ResourceBundle.getBundle("com.sun.cb.CoffeeBreak"); - - String queryURL = registryBundle.getString("query.url"); - - - return queryURL; - - } // getDate - - public static final String getPublishURL() { - - ResourceBundle registryBundle = - ResourceBundle.getBundle("com.sun.cb.CoffeeBreak"); - - String publishURL = registryBundle.getString("publish.url"); - - return publishURL; - - } // getDate - - -} // class diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.properties deleted file mode 100644 index 8599a878b75..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.properties +++ /dev/null @@ -1,55 +0,0 @@ - - - -# This file is referenced by the build.xml file. - -wscompile.dir=${j2ee.home}/bin - -example=supplier -package=com.sun.cb -package.path=com/sun/cb - -build=build -server.src=src/server/${package.path} -client.src=src/client/${package.path} -registry.src=src/registry/${package.path} -dist=dist -common=../common/build - -stage.ear=stage-ear -stage.war=stage-war - -wsdl.file=Supplier.wsdl -client.class=${package}.SupplierClient - -config.wsdl.file=config-wsdl.xml -config.interface.file=config-interface.xml -start.interface.file=conf/start-interface.xml -server.start.wsdl.file=conf/server-start-wsdl.xml -client.start.wsdl.file=conf/client-start-wsdl.xml -mapping.file=mapping.xml - -context.path=jaxrpc-coffee-supplier -url.pattern=jaxrpc -client.jar=jaxrpc-client.jar -registry.jar=registry-org.jar -war.file=${context.path}.war - -endpoint-address=http://localhost:${domain.resources.port}/${context.path}/${url.pattern} - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.xml deleted file mode 100644 index 3cfefa97159..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.xml +++ /dev/null @@ -1,289 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/client-start-wsdl.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/client-start-wsdl.xml deleted file mode 100644 index 69d19c420a9..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/client-start-wsdl.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/server-start-wsdl.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/server-start-wsdl.xml deleted file mode 100644 index 90b0b4ef9b6..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/server-start-wsdl.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/start-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/start-interface.xml deleted file mode 100644 index 3c3d693a884..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/start-interface.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-interface.xml deleted file mode 100644 index 3c3d693a884..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-interface.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-wsdl.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-wsdl.xml deleted file mode 100644 index 69d19c420a9..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-wsdl.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/OrderCaller.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/OrderCaller.java deleted file mode 100644 index a624df5e7c0..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/OrderCaller.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; -import javax.xml.rpc.Stub; - -public class OrderCaller { - - private SupplierIF supplier; - - public OrderCaller(String endpoint) { - - try { - Stub stub = (Stub)(new Supplier_Impl().getSupplierIFPort()); - //stub = (SupplierIF_Stub)(new Supplier_Impl().getSupplierIFPort()); - stub._setProperty( - javax.xml.rpc.Stub.ENDPOINT_ADDRESS_PROPERTY, - endpoint); - supplier = (SupplierIF) stub; - } catch (Exception ex) { - ex.printStackTrace(); - } - } - - - public ConfirmationBean placeOrder(OrderBean order) { - - ConfirmationBean result = null; - try { - result = supplier.placeOrder(order); - } catch (Exception ex) { - ex.printStackTrace(); - } - return result; - } - -} // class diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/PriceFetcher.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/PriceFetcher.java deleted file mode 100644 index 7fc7113b23d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/PriceFetcher.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -public final class PriceFetcher { - - public static final PriceListBean getPriceList(String endpoint) { - - PriceListBean result = null; - - try { - SupplierIF_Stub stub = - (SupplierIF_Stub)(new Supplier_Impl().getSupplierIFPort()); - stub._setProperty( - javax.xml.rpc.Stub.ENDPOINT_ADDRESS_PROPERTY, - endpoint); - result = stub.getPriceList(); - } catch (Exception ex) { - ex.printStackTrace(); - } - - return result; - - } // getPriceList - -} // class diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestOrderCaller.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestOrderCaller.java deleted file mode 100644 index f565d08f0d8..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestOrderCaller.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.math.BigDecimal; -import java.util.*; - -public class TestOrderCaller { - public static void main(String[] args) { - try { - - AddressBean address = new AddressBean("455 Apple Way", - "Santa Clara", "CA", "95123"); - CustomerBean customer = new CustomerBean("Buzz", - "Murphy", "247-5566", "buzz.murphy@clover.com"); - - LineItemBean itemA = new LineItemBean("mocha", new BigDecimal("1.0"), new BigDecimal("9.50")); - LineItemBean itemB = new LineItemBean("special blend", new BigDecimal("5.0"), new BigDecimal("8.00")); - LineItemBean itemC = new LineItemBean("wakeup call", new BigDecimal("0.5"), new BigDecimal("10.00")); - LineItemBean[] lineItems = {itemA, itemB, itemC}; - - OrderBean order = new OrderBean(address, customer, "123", lineItems, - new BigDecimal("55.67")); - - OrderCaller oc = new OrderCaller(args[0]); - ConfirmationBean confirmation = oc.placeOrder(order); - - System.out.println(confirmation.getOrderId() + " " + - DateHelper.format(confirmation.getShippingDate(), "MM/dd/yy")); - - } catch (Exception ex) { - ex.printStackTrace(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestPriceFetcher.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestPriceFetcher.java deleted file mode 100644 index d523f5433ad..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestPriceFetcher.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.math.BigDecimal; -import java.util.*; - -public class TestPriceFetcher { - - public static void main(String[] args) { - try { - - PriceListBean priceList = PriceFetcher.getPriceList(args[0]); - System.out.println(args[0]); - System.out.println( - DateHelper.format(priceList.getStartDate(), "MM/dd/yy") - + " " + - DateHelper.format(priceList.getEndDate(), "MM/dd/yy")); - - PriceItemBean[] items = priceList.getPriceItems(); - for (int i = 0; i < items.length; i++) { - System.out.println( - items[i].getCoffeeName() + " " + items[i].getPricePerPound()); - } - - } catch (Exception ex) { - ex.printStackTrace(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/CoffeeRegistry.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/CoffeeRegistry.properties deleted file mode 100644 index ffb5e082340..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/CoffeeRegistry.properties +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -registry.username=testuser -registry.password=testuser -org.name=JAXRPCCoffeeDistributor -org.description=A supplier of fine coffees since 2002. -person.name=Jane Doe -phone.number=(800) 555-1212 -email.address=jane.doe@jaxrpccoffee.com -classification.scheme=ntis-gov:naics -classification.name=Other Grocery and Related Products Wholesalers -classification.value=42249 -service.name=JAXRPCCoffee Service -service.description=JAXRPCCoffee Service description -service.binding=JAXRPCCoffee Service binding -key.file=orgkey.txt - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRPublisher.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRPublisher.java deleted file mode 100644 index 122a0f83bf8..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRPublisher.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import javax.xml.registry.*; -import javax.xml.registry.infomodel.*; -import java.net.*; -import java.security.*; -import java.util.*; -import javax.naming.*; - -/** - * The JAXRPublisher class consists of a makeConnection - * method and an executePublish method. The makeConnection - * method establishes a connection to the Registry Server. - * The executePublish method creates an organization and - * publishes it to the registry. - */ -public class JAXRPublisher { - - Connection connection = null; - - public JAXRPublisher() {} - - /** - * Establishes a connection to a registry. - * - * @param queryUrl the URL of the query registry - * @param publishUrl the URL of the publish registry - */ - public void makeConnection(String queryUrl, - String publishUrl) { - - Context context = null; - ConnectionFactory factory = null; - - /* - * Define connection configuration properties. - * To publish, you need both the query URL and the - * publish URL. - */ - Properties props = new Properties(); - props.setProperty("javax.xml.registry.queryManagerURL", - queryUrl); - props.setProperty("javax.xml.registry.lifeCycleManagerURL", - publishUrl); - - try { - // Create the connection, passing it the - // configuration properties - context = new InitialContext(); - factory = (ConnectionFactory) - context.lookup("java:comp/env/eis/JAXR"); - factory.setProperties(props); - connection = factory.createConnection(); - System.out.println("Created connection to registry"); - } catch (Exception e) { - e.printStackTrace(); - if (connection != null) { - try { - connection.close(); - } catch (JAXRException je) {} - } - } - } - - /** - * Creates an organization, its classification, and its - * services, and saves it to the registry. - */ - public String executePublish(String username, - String password, String endpoint) { - - String id = null; - RegistryService rs = null; - BusinessLifeCycleManager blcm = null; - BusinessQueryManager bqm = null; - - try { - rs = connection.getRegistryService(); - blcm = rs.getBusinessLifeCycleManager(); - bqm = rs.getBusinessQueryManager(); - System.out.println("Got registry service, query " + - "manager, and life cycle manager"); - - // Get authorization from the registry - PasswordAuthentication passwdAuth = - new PasswordAuthentication(username, - password.toCharArray()); - - Set creds = new HashSet(); - creds.add(passwdAuth); - connection.setCredentials(creds); - System.out.println("Established security credentials"); - - // Get hardcoded strings from a ResourceBundle - ResourceBundle bundle = - ResourceBundle.getBundle("com.sun.cb.CoffeeRegistry"); - - // Create organization name and description - Organization org = - blcm.createOrganization(bundle.getString("org.name")); - InternationalString s = - blcm.createInternationalString - (bundle.getString("org.description")); - org.setDescription(s); - - // Create primary contact, set name - User primaryContact = blcm.createUser(); - PersonName pName = - blcm.createPersonName(bundle.getString("person.name")); - primaryContact.setPersonName(pName); - - // Set primary contact phone number - TelephoneNumber tNum = blcm.createTelephoneNumber(); - tNum.setNumber(bundle.getString("phone.number")); - Collection phoneNums = new ArrayList(); - phoneNums.add(tNum); - primaryContact.setTelephoneNumbers(phoneNums); - - // Set primary contact email address - EmailAddress emailAddress = - blcm.createEmailAddress(bundle.getString("email.address")); - Collection emailAddresses = new ArrayList(); - emailAddresses.add(emailAddress); - primaryContact.setEmailAddresses(emailAddresses); - - // Set primary contact for organization - org.setPrimaryContact(primaryContact); - - // Set classification scheme to NAICS - ClassificationScheme cScheme = - bqm.findClassificationSchemeByName - (null, bundle.getString("classification.scheme")); - - // Create and add classification - Classification classification = (Classification) - blcm.createClassification(cScheme, - bundle.getString("classification.name"), - bundle.getString("classification.value")); - Collection classifications = new ArrayList(); - classifications.add(classification); - org.addClassifications(classifications); - - // Create services and service - Collection services = new ArrayList(); - Service service = - blcm.createService(bundle.getString("service.name")); - InternationalString is = - blcm.createInternationalString - (bundle.getString("service.description")); - service.setDescription(is); - - // Create service bindings - Collection serviceBindings = new ArrayList(); - ServiceBinding binding = blcm.createServiceBinding(); - is = blcm.createInternationalString - (bundle.getString("service.binding")); - binding.setDescription(is); - binding.setValidateURI(false); - binding.setAccessURI(endpoint); - serviceBindings.add(binding); - - // Add service bindings to service - service.addServiceBindings(serviceBindings); - - // Add service to services, then add services to organization - services.add(service); - org.addServices(services); - - // Add organization and submit to registry - // Retrieve key if successful - Collection orgs = new ArrayList(); - orgs.add(org); - BulkResponse response = blcm.saveOrganizations(orgs); - Collection exceptions = response.getExceptions(); - if (exceptions == null) { - System.out.println("Organization saved"); - - Collection keys = response.getCollection(); - Iterator keyIter = keys.iterator(); - if (keyIter.hasNext()) { - javax.xml.registry.infomodel.Key orgKey = - (javax.xml.registry.infomodel.Key) keyIter.next(); - id = orgKey.getId(); - System.out.println("Organization key is " + id); - } - } else { - Iterator excIter = exceptions.iterator(); - Exception exception = null; - while (excIter.hasNext()) { - exception = (Exception) excIter.next(); - System.err.println("Exception on save: " + - exception.toString()); - } - } - } catch (Exception e) { - e.printStackTrace(); - if (connection != null) { - try { - connection.close(); - } catch (JAXRException je) { - System.err.println("Connection close failed"); - } - } - } - return id; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRRemover.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRRemover.java deleted file mode 100644 index c53e045be98..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRRemover.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import javax.xml.registry.*; -import javax.xml.registry.infomodel.*; -import java.net.*; -import java.security.*; -import java.util.*; -import javax.naming.*; - -/** - * The JAXRRemover class consists of a makeConnection method, - * a createOrgKey method, and an executeRemove method. It - * finds and deletes the organization that the OrgPublisher - * class created. - */ -public class JAXRRemover { - - Connection connection = null; - RegistryService rs = null; - - public JAXRRemover() {} - - /** - * Establishes a connection to a registry. - * - * @param queryUrl the URL of the query registry - * @param publishUrl the URL of the publish registry - */ - public void makeConnection(String queryUrl, - String publishUrl) { - - Context context = null; - ConnectionFactory factory = null; - /* - * Define connection configuration properties. - * To delete, you need both the query URL and the - * publish URL. - */ - Properties props = new Properties(); - props.setProperty("javax.xml.registry.queryManagerURL", - queryUrl); - props.setProperty("javax.xml.registry.lifeCycleManagerURL", - publishUrl); - - try { - // Create the connection, passing it the - // configuration properties - context = new InitialContext(); - factory = (ConnectionFactory) - context.lookup("java:comp/env/eis/JAXR"); - factory.setProperties(props); - connection = factory.createConnection(); - System.out.println("Created connection to registry"); - } catch (Exception e) { - e.printStackTrace(); - if (connection != null) { - try { - connection.close(); - } catch (JAXRException je) {} - } - } - } - - /** - * Searches for the organization created by the JAXRPublish - * program, verifying it by checking that the key strings - * match. - * - * @param keyStr the key of the published organization - * - * @return the key of the organization found - */ - public javax.xml.registry.infomodel.Key createOrgKey(String keyStr) { - - BusinessLifeCycleManager blcm = null; - javax.xml.registry.infomodel.Key orgKey = null; - - try { - rs = connection.getRegistryService(); - blcm = rs.getBusinessLifeCycleManager(); - System.out.println("Got registry service and " + - "life cycle manager"); - - orgKey = blcm.createKey(keyStr); - } catch (Exception e) { - e.printStackTrace(); - if (connection != null) { - try { - connection.close(); - } catch (JAXRException je) { - System.err.println("Connection close failed"); - } - } - } - return orgKey; - } - - /** - * Removes the organization with the specified key value. - * - * @param key the Key of the organization - */ - public void executeRemove(javax.xml.registry.infomodel.Key key, - String username, String password) { - - BusinessLifeCycleManager blcm = null; - - try { - blcm = rs.getBusinessLifeCycleManager(); - - // Get authorization from the registry - PasswordAuthentication passwdAuth = - new PasswordAuthentication(username, - password.toCharArray()); - - Set creds = new HashSet(); - creds.add(passwdAuth); - connection.setCredentials(creds); - System.out.println("Established security credentials"); - - String id = key.getId(); - System.out.println("Deleting organization with id " + id); - Collection keys = new ArrayList(); - keys.add(key); - BulkResponse response = blcm.deleteOrganizations(keys); - Collection exceptions = response.getExceptions(); - if (exceptions == null) { - System.out.println("Organization deleted"); - Collection retKeys = response.getCollection(); - Iterator keyIter = retKeys.iterator(); - javax.xml.registry.infomodel.Key orgKey = null; - if (keyIter.hasNext()) { - orgKey = (javax.xml.registry.infomodel.Key) keyIter.next(); - id = orgKey.getId(); - System.out.println("Organization key was " + id); - } - } else { - Iterator excIter = exceptions.iterator(); - Exception exception = null; - while (excIter.hasNext()) { - exception = (Exception) excIter.next(); - System.err.println("Exception on delete: " + - exception.toString()); - } - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - // At end, close connection to registry - if (connection != null) { - try { - connection.close(); - } catch (JAXRException je) { - System.err.println("Connection close failed"); - } - } - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgPublisher.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgPublisher.java deleted file mode 100644 index 1024fd16dd4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgPublisher.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import javax.xml.registry.*; -import java.util.ResourceBundle; -import java.io.*; - -public class OrgPublisher { - - public static void main(String[] args) { - - String queryURL = URLHelper.getQueryURL(); - String publishURL = URLHelper.getPublishURL(); - String endpoint = URLHelper.getEndpointURL(); - - ResourceBundle registryBundle = - ResourceBundle.getBundle("com.sun.cb.CoffeeRegistry"); - - String username = - registryBundle.getString("registry.username"); - String password = - registryBundle.getString("registry.password"); - String keyFile = registryBundle.getString("key.file"); - - JAXRPublisher publisher = new JAXRPublisher(); - publisher.makeConnection(queryURL, publishURL); - String key = publisher.executePublish(username, - password, endpoint); - try { - FileWriter out = new FileWriter(keyFile); - out.write(key); - out.flush(); - out.close(); - } catch (IOException ex) { - System.out.println(ex.getMessage()); - } - } - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgRemover.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgRemover.java deleted file mode 100644 index fbd87710e55..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgRemover.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.util.ResourceBundle; -import javax.xml.registry.*; -import javax.xml.registry.infomodel.Key; -import java.io.*; - -public class OrgRemover { - - Connection connection = null; - - public static void main(String[] args) { - - String keyStr = null; - - String queryURL = URLHelper.getQueryURL(); - String publishURL = URLHelper.getPublishURL(); - - ResourceBundle registryBundle = - ResourceBundle.getBundle("com.sun.cb.CoffeeRegistry"); - - String username = - registryBundle.getString("registry.username"); - String password = - registryBundle.getString("registry.password"); - String keyFile = registryBundle.getString("key.file"); - - try { - FileReader in = new FileReader(keyFile); - char[] buf = new char[512]; - while (in.read(buf, 0, 512) >= 0) { } - in.close(); - keyStr = new String(buf).trim(); - } catch (IOException ex) { - System.out.println(ex.getMessage()); - } - - JAXRRemover remover = new JAXRRemover(); - remover.makeConnection(queryURL, publishURL); - javax.xml.registry.infomodel.Key modelKey = null; - modelKey = remover.createOrgKey(keyStr); - remover.executeRemove(modelKey, username, password); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/ContextListener.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/ContextListener.java deleted file mode 100644 index 6bfcbe9c572..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/ContextListener.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import jakarta.servlet.*; -import javax.xml.registry.*; -import java.util.ResourceBundle; -import java.io.*; - -public final class ContextListener - implements ServletContextListener { - - public void contextInitialized(ServletContextEvent event) { - String queryURL = URLHelper.getQueryURL(); - String publishURL = URLHelper.getPublishURL(); - String endpoint = URLHelper.getEndpointURL(); - - ResourceBundle registryBundle = - ResourceBundle.getBundle("com.sun.cb.CoffeeRegistry"); - - String username = - registryBundle.getString("registry.username"); - String password = - registryBundle.getString("registry.password"); - String keyFile = registryBundle.getString("key.file"); - - JAXRPublisher publisher = new JAXRPublisher(); - publisher.makeConnection(queryURL, publishURL); - String key = publisher.executePublish(username, - password, endpoint); - try { - FileWriter out = new FileWriter(keyFile); - out.write(key); - out.flush(); - out.close(); - } catch (IOException ex) { - System.out.println(ex.getMessage()); - } - } - - public void contextDestroyed(ServletContextEvent event) { - String keyStr = null; - - String queryURL = URLHelper.getQueryURL(); - String publishURL = URLHelper.getPublishURL(); - - ResourceBundle registryBundle = - ResourceBundle.getBundle("com.sun.cb.CoffeeRegistry"); - - String username = - registryBundle.getString("registry.username"); - String password = - registryBundle.getString("registry.password"); - String keyFile = registryBundle.getString("key.file"); - - try { - FileReader in = new FileReader(keyFile); - char[] buf = new char[512]; - while (in.read(buf, 0, 512) >= 0) { } - in.close(); - keyStr = new String(buf).trim(); - } catch (IOException ex) { - System.out.println(ex.getMessage()); - } - - JAXRRemover remover = new JAXRRemover(); - remover.makeConnection(queryURL, publishURL); - javax.xml.registry.infomodel.Key modelKey = null; - modelKey = remover.createOrgKey(keyStr); - remover.executeRemove(modelKey, username, password); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/PriceLoader.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/PriceLoader.java deleted file mode 100644 index 252cbed528a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/PriceLoader.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.util.*; -import java.math.BigDecimal; -import java.lang.reflect.Array; - -public final class PriceLoader { - - public static final PriceItemBean[] loadItems(String propsName) { - - ResourceBundle priceBundle = - ResourceBundle.getBundle(propsName); - - Enumeration bundleKeys = priceBundle.getKeys(); - ArrayList keyList = new ArrayList(); - - while (bundleKeys.hasMoreElements()) { - String key = (String)bundleKeys.nextElement(); - String value = priceBundle.getString(key); - keyList.add(value); - } - - PriceItemBean[] items = - (PriceItemBean[])Array.newInstance(PriceItemBean.class, keyList.size()); - int k = 0; - for (Iterator it=keyList.iterator(); it.hasNext(); ) { - String s = (String)it.next(); - int commaIndex = s.indexOf(","); - String name = s.substring(0, commaIndex).trim(); - String price = s.substring(commaIndex + 1, s.length()).trim(); - items[k] = new PriceItemBean(name, new BigDecimal(price)); - k++; - } - - return items; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierIF.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierIF.java deleted file mode 100644 index f58ac8daf31..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierIF.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -public interface SupplierIF extends Remote { - - public ConfirmationBean placeOrder(OrderBean order) throws RemoteException; - public PriceListBean getPriceList() throws RemoteException; -} - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierImpl.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierImpl.java deleted file mode 100644 index ac265b556cd..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.math.BigDecimal; -import java.util.*; - -public class SupplierImpl implements SupplierIF { - - public ConfirmationBean placeOrder(OrderBean order) { - - Date tomorrow = com.sun.cb.DateHelper.addDays(new Date(), 1); - ConfirmationBean confirmation = - new ConfirmationBean(order.getId(), - DateHelper.dateToCalendar(tomorrow)); - return confirmation; - } - - public PriceListBean getPriceList() { - - PriceListBean priceList = loadPrices(); - return priceList; - } - - private PriceListBean loadPrices() { - - String propsName = "com.sun.cb.SupplierPrices"; - Date today = new Date(); - Date endDate = DateHelper.addDays(today, 30); - - PriceItemBean[] priceItems = PriceLoader.loadItems(propsName); - PriceListBean priceList = - new PriceListBean(DateHelper.dateToCalendar(today), - DateHelper.dateToCalendar(endDate), priceItems); - - return priceList; - } - -} // class - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierPrices.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierPrices.properties deleted file mode 100644 index f380edc5082..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierPrices.properties +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - - -c1=Mocca, 4.00 -c2=Wake Up Call, 5.50 -c3=French Roast, 5.00 -c4=Kona, 6.50 diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/TestText.txt.txt b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/TestText.txt.txt deleted file mode 100644 index 3150fbe1f4c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/TestText.txt.txt +++ /dev/null @@ -1 +0,0 @@ -This file should be ignored by the deployed and running app. \ No newline at end of file diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/cbserver.war b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/cbserver.war deleted file mode 100644 index 6c32fdca5e29c0932fd366886e5e9c879ae28efc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85925 zcma&NQ;=@$vaMTojk0aqwr#t_L*^d^qU^>-eqeo z^L;Y9q6{b)Di9PD6wt6bfC1>=9ws0#APq5LIw^T^1```2XJ>#jgNeN@gR`q0gNZSN ziiN#{gQcChh>??vlncO?{=d$Aj{^buCK@ONDPo5EODKv~Oir@OUHv*kAjn@9b31UF zSX$;I7Rd%txpZDiv%V-qm<_k;hAdbYUh~*-%-zX-aGE|@`G5>?ZgLvkRTRf&(?9RR zm9mhuV2+SCl*2mbTgWPxum4&}*aN%1y07@I8Y6b2k1^%5tcllOl-uEi6+InXFo4Y7?dAnD?A9I8U z$&Ls-(JRvA$}}>?ts^8qhmL6YOqg=-jJQN)k;RDlSnQI_k?6R@^!s2(;%%p{R+3NR z6(|*qcCaloVhC-RLs142inWKI#0VG&2pSX!Nb&!(hK&Ez^FP#38Q@}MX`|?5X#)6v zOX#b-VYeWN$akTejZHyniF58i_j|t$<0O;<5uu4e5{j4@?e3Iw!-d9xbOSiD79_F~ zS<(lHAT*t=#o-J>VAA4wlFQkxOTgdv19%tc0|IW-U;rEc)MK@u1eEP^^t~Rg1&#zS zE=~{68!n6>FWcdJ9hOVvXDQ>Q&l!|KyKR9MX>OltVE4ch_jVEXl@y6T@75HVp@<9E zze9w9$JHQW26{ybqpN?q3E#DRflDO60{m2$ z>QU5$SW{BFF8G|y%ugmSYj*_vKvqT71~_AA%^VB{FwMB|EhPI#4e6sj({W+3nMcj* z(uYLSwP=mFg3;i?QMuH)mNDniHk#E^iIga>SxDWx(o7|ryWEwT7GXNWW0Qv~pa2g0 zl4RV{Z~J_5Pxy+-2JwLM@t=~=o|CW!+@aa+Z0&gsc3|8KTpVulgoD*ZqFc!k6JDeA z`YsYA{LX%>s7zJ(jW^WQw9RIbj%7^;tUZs)1FT#YS%kJFp4^)aJMS{2a>_wi>6t?R zxZk+7E?wf0MxFCY67tRSkJ>x3jcYBuBd{&^(FXg8wadi^Y}yTgcO}M!0*frPxd)^~ zmDHl@q9D4k&^`C-i(W?eZbc0!-_Kf8xMU=u)!f%QjsW_ta(Pleoq0e%quV$})Br4o z^Eezzy@bv7oi3Te8R|pS0RWdFLZIa2PZSbq8TQ^{YnR>(QBJmm?)KJ z;9(z^a!E?!WJ#93eYE^(Q&*le@n&QbEZ?a*n(eTbPY?t!cAH}^A{g|~$^ z$j|@MX&gdCk_ZS8km3KPQzQc#xqs_aK=}WB{L_LQY>Zq049+G_0Dzq-z|7Ll(#6u= z&Y9lI*+kI3y&)%h}5iOZyb;98oq{QAdCJ}DCl(^|Axefm?oDcCQbzE3}dmE-MD9HoX3`B{5FuwofSYubr8bl^c$6WnC)RtYD$cYdi!9 z3Gdpz2jwxUCiS?a?<^+o=Ivq9nQxTLlSsGD#uzJ)sr!3S)K zNJgGt1rF?zxOK*C)wC= zY`l{2oRgxEKj>4lJSG>I3u0{9e}2uMz6f_c!l0x(FU?!w0{XJ#HR$PJ6qs6uLaxkY z+e;%gMbbw)lw1(BS`!n6a5RNL{RO5DC*ZBO2IR+)bU6NQz$g`@XDka$#`46v&!H-S zgl&4$l+}#z6OGFnqKPQETn}L99FXW*pggTEiZ@X7tvx(OErc>#<$=%k(We ziNElo`2AC#v&cXB)VA8C8wdH{Db13~a@p{Y`h6h(Q%W=a=ad$)0GL?YySj+mJJ|{Y zjO_leeAe(ZL|wxA={6mcHKTymLhdIG86Y7gLKGF+3IG9?wgQ1Vig?CmPc}7TFf&8C z1n88MG?y)*uUGOd1h-gCiOZEdH!Y=E-Av#wZ@XLHsK5IAvaqJ7m*SYXB#?S#8Ym{rWpd z&m+nIn{H14=J|d^|NFHz$oft|f18DN0Bc@Lun$UJg;7|tFep`kE>ap_#8wo!5v(#i zxfEc(v=Am(?f=(L@<#qFBk?+?C1Wz?5o(lbYs4JOk}rce*$&&w-Yr6QZqtI@#Ad4O z1*=pr6_6EX1S^Ux^#O%MtJ7+!dh|4gJLl!ydUR>ZPD1#eJwrUhI8|*4J?Tg?x-q8u zg1&`~H|xxIDaSEZv79$r+F9dM%2QwKePY4>y9mk~x{xTNqQC*R*INLON z|K!BkDqX&^VwTL?>?}SuX!y2)EKCN*{;?REYwcdnG15gem$Hn(MzCf7`{g6ESfO8S zGHrv2>!PV2m6qfN|ITrzMRDz!H$`2#uwTnntaccm;^yA+v-#X0^+GX|O_^J#JZPaN znG&r5YLzUibtR>`AZit5lp697Ocb)^%|jVoML+-Npbj#!h2|->cp_>5b!A8~al8n% ze%No7kRdf5dNQJ_LTru-VI(EAj||m=+EuKAeW0XDMKO4^TshDtubFJ8;dkqo7)$o) zUy{3PEH?2S(jKL>S(RFdGYKZa`=|R_zwRfS+d@%E>bnCjRGD-Z7a|$xHgc?-(-w>t z_Cof`EBf7tA44B~dcYXe#AGLt(s3j!o$;~(WAsjS5*Cz zG^?W?2H%p}1ko_|!PI7znQJ-ZzM%5FxX0pBmwDH_iMSf(BuN*zkIYPm?$Kx{v9lE& z@qWn^%Av`KHVRI_HJ8k=&sSPt;3b`^4k^QExkLggHR(Il>Vv#7B2z2dG^=TUmk4Aq zrC*ej)9;nwqg8q27e_61*}|(R)G*wZB(=$+{XW3N8@jIc&Xp1^@&O5N7~o9jpw&Th zoKxwsw8NWKq2ecdm{BM67-z#>)mGE(yXaJ|Rxt{aSN&?@mR~xk9xBxx-Bu!TB+P2% z`q=!0x;$y|{fG^j(%9?k%55k`#m2bW<1yQoU8>a7u&gb&IKDr;YCxnQvMb9fhah7S z8Q!xUu&XEl(M@G$CV4Ke4QAzFzjSsP;V8QOS=>*^=aAX=kwKIcl!B)MvnFd(LQrS1D6U z2?7Ma^YX+-%C#o#7j-l*aZb*Z#Vn-k{2j`HRu3dW&!P5PyS3x!C`w+lgW)^aB=_nV zsf9i=%cLJMsE~aVg2{Dzkw12}ZpU!VV_6Hj=V2#AKj34LK5MX^C~;|Y^G;JvC(k&k z^^mS0E*p2CuG;8)Qr-5ovn_=rVtR=&Qwb|6gENo13Oj4t=g{Q`P&iX{i2QC1|HyW% zl=h9_UAzq*pklku>G2zm$vHO)JEK$}QNQ{fL zrfxMC`9~*?-<_$oIh?-xG0#cRmr%f!r9)R+v^VJJ{Q zjI>iH0cAgue5zZ)RwXaUY0CPKiJvN*+o;|~hkK!YMmVm6>Sx`rH?5d;v0pTE)$*M- zyU=mgT=^~>j9H%1yJ~k#=cMT)%gfwQTj>zp!fXoutpy|2AySf!7$mXgz6p&`Lsj&| zjjkYwoGRR@Ojixi6@1E_)*Rv#J<4QSY^RJTd+1gi*Hj8GfzXnUM5Al4!d-@*JpR6P z1z%L(JZmp^)}8#-QBKufPSa7&ki~gicMPWWM5bOnYDHu(HBxQ5NQR&WFLNXS4r;neik2W-(A`E17~{@O1x4rV8K<0T*LXSyS{M05RZp$= z9E3hr!&2?#fI0BMINkd5w<66NzN8>B_lzWZy^1b_7eD-Wl38MUS(plZJ< z^IHf3-@(xT60Bv|npLZc%5WpMo`u7j^ynFKjv!wBkNVqza*%bG;<4qNc(95_RT=aLyFL#WCF9Z4BIb5&R{=wZFaN8Mq@S@K@m6 zzC5^rAJOss^!4~*?FyaW84*C7wtu)oFrFO9I^Df9iscS(j*jl&f%<{`7ae%G2A;%% z0Rr;F_)l{u-G81t{~Zwi_sr?5s-=P=g!oOqLT{8vvq`-REXBzlMUn4RnTVJ`h?%z; zLZ(Fx*}O*iemrxF@wyMHE~G4N`F0tv>`jhCDrQ{Cys%*KvNH1c4;9$)14lymJfqd;jB=WRRf9-hY$5P5P@LLNSfs{ApZZukb($OJT1~%I` zkwHecm3FT_gaXcPV7?JN?9XWKv$#rhTB6d4oQgLF6U;K)p8EDYGu##$Z$k+&CraF!m^W?u<_4#IvCvFATX(g!#Dzv1XYLF^Q8oieXYK%jwOo9g%}IOM zqZXE-@PVFy^vQQ(^aSRgiBglD2JJ;%YkK8U-ppl6l`$e9i2sr0^;}EYwO~v!Vj~m{ zZnrQY1Q#?e@ia+mZSazVM(*FszBW!Sx+JT$zY!b8CNo+QZ;L)5R=MN zZCg*8hN?;hUhqjTq(mLF>^n{y2R21}zD|AdFwWWu0te#&WA~^2J1^&%0t@7KQ3f(k zELsin>5x&xvJtm$eq+|NaUC4G>4*cE!fuRv+qeV40E!E~2yrYfLs4XJJ#rTrYi*o= zX#XveGiej!=V0h5wDti?e`~Cdg4DQ0o*Q`l?x}O?Y&~8Kfsj)-`Lcq4k3W(n{6e{2 z^Fl`9AYN0vQ#{k2U{ZMTG_ub%a)*a<8LnE8b(zT?^(S)1Q?nyrUtALQ9SCI0=&rFDEN3NjQqdr{VZ~PGI4+ZWhIF<^1R!B zu5h#9|8AxK2{5q!9bf>Qoa~(}?M!T3O#%O67bVF`|F8?x(48-uYgtg7MYrEQF|#4D ztS+GqVI?NsYKPW3IkXuxT=JA(H=Rz|034fwNkkH@7oV3?$#!fqDO6wq=Z#Cr)YR~m zd-xazdit5SuV=i?ZDX&sLK%M_{tGcc-x49U^P>=h1S%lc!#nz6*7(r`zkt6p?IQ=(=o-2MhVYqC9g zDOTRCVn%s}>4K`1>VPZ)qyCqa@ei{kfZj?;n|X2CxU314OIWPD=1}I|Y@;gGGC&C6H7dw#2DQYY9pCHpeq0X_p4AC`%lfS@4PRj1q7HFz*dZZ}` zD^P0&PB;nv|V0z{y3`$o&7#a~+ihMZ|CUEOs)8aXe!6UL3jT#g7s}G#%ACC=$4s z9&pYyLrZ3Tm41XeyDupN5uvXAQ97KlGL9iUbxsm&mP&*yLIhcqRQ(|&&2>-$Fowl6Azh2rNGQmXL{WezFl*NivCF#85w5Vm7U2N`O%*GyNt5iio%R(}Z zpoX8+AgHWulhj<>TU~@lW-$b2$Y!s=CfJ~`gtL~TlnfQkXmB>s*)>ALqN(4R@{JW~ z<8RZ6$WN)Me)DvSU6-`z@id#FdMs0WcI{V420LBdy~gRW^5$~K78t`UFf&u$q!dYokUc41Y&yTnr)1R?A@>BPq3{4m3u^Th0Q%wOm(uSE`eoB$S*!c(YGfa z=tk;xS-rh`!o*irDat0#W(!ULHd=7w|J3#J?bm8dGa|1%(6N-0oa(DOW!#m+UI5~~ z*p>^qoV}859euOxp++PNw$;Kss^X4uhFHA>)^v>*L`7ve%(+E%@Uq=mB?h}S$z5L! zz^l2;Vik+)txzXYyzO=E*-Auyi1Mi#p~VwT8=I79HAYe~cQn&}vyIbNfSPM+wBTM8 z)$1RMRwFtDcG9~B6V2`a(tbay!Yol}j_2P8>Smo-+A>s=HZ&fz#3QzixQsDnb%aVY zG(bX>xdqxcY75cCTh%K8>5n80l%Hm3<+p!DP{|j3`eXr5lkzk6Y(bnP^^uf-Dj}1T z_7PG{UN$AzBN_En1|2z-#TSu_>W&}ne`O**;9qC1=X*?^uaV+MZP2|fxHbup|4(nw{2#pWZyQljOJ@fo7ZVGB(|_AzNyE|uM+1#-CXMxA z&KbFCjT}C1V}3Xi1r`RFI#p3e%j%qyTpmri^})0!T&(u;nO^;rLf`-HN(VNo(?*qt=#pL?4QXh+#a*2@+O}>QRfalu2JU> zJhoHkjy%3m>-RoFpfQ-f6QePhy(6PB0N$C=7|h>c&}tWNsk<`!tWmqvhb~q}FAh9F zw@2f0RUJt_p2>UWv)H=8?PCvYJ$MAR3wCp`-466%wrlqJu%Gw4V-)VreLp?^1|e9i zhG%IGL8|#gT={4YNuc_u_E`q5mbmpjyTdfO*>jO1j&W+q5N5hQYxnd9UiXm9v zr@W6oDd~fpm(+%qhpu_1-D7kTrnk`qVLPMYkkt#JoJ2|{lT*d~f8sflbS>2LgzDVjEseR&_P z-A(Q_Sv-lq094Iy8jz|<@DC8%gO-ao5%JtYPmCVwJ2p3oDXiwHT9!C%&!~t&jv$d> zyCHDmJGtSz{bH56FzGj@iPW~NR^!|oZS?l9n)4%@pSD51K=PTg2uYtTp$k_xrTuL| zOLCQk+Z@Cjg#GH>PUM||7c##90vMZ21h3S*TI1IzOR0DDo^%o#=jd$`{IxeEzv^8I zWPza>Qomo+LUdQgZ6g;gEzMyrQpnh?4;klky?0d z;?uI^A6JojX_hCk*#SbEK{{4Am-$8%b&1(1$)VekH?UDUQ1i%h; zmp>+{BK`M)1LMM^cV%FzD;8QOo})ZFxWyAMwNbmoe>Jo^wmVy~ z6lpfWXa(AuLu-BcNNYG_#*K80F2SmRzRSDH*=9PQwwqDmxHQXc1y7lq_tqPK-w!O} zv4*2l7gj0yVsY6AW@v*UK;Gn&*Cgpr`#sn+nCp5DgvkU?pOACu98H0TUl=ObI?RKS za#}1VNLz5sOq>fDaMDrz3JE(gCsU)ajR8we8V0LjVWp_LC*dXYjMM%$>eN(I%}P*} zd!UC`q>{bO)n?V5Azmd_0c9im7~sM>!{0@$&P}(ze)p^|vZOqoa7@(X&Yqd5n-v?u zd(j@4nr1sJe7C!2t6!8Dl=f;y=hQx46k1_?%Nm;0f*1+D9ui5Bw$dB0Id#@M@KD5Q z#_&F1k6c%U54%Z7Ylbfb-Q$-cN57e0B8Ru9Je7TqDa?#T1({tnaz3c?4bsWbp08Y< zS|>ztKH{-yANbtQN663o404Bcx9mxIxH66#FKzX>F!||fFK*C(lwWuMS586PK6MGz`$4WZer{&r1jVq*=J^=?zVHR@h(+0pMT+MQ>ck1-1p(5@JXboQr5a_&OnNXT)uDa96~kRvY<|vUR}Y-4nODl)}~2BoQihqo>ZbsJvn&UJV3>Gfr(2 z-K4rM>}c26q`0Q|G=$aG4u0?R|F0dhWxDu9@jn|jTEu_9qW#b2kN0oQ-^S9I!OF

)O zk3kdYseg{*GWTJrYw1EoWIT-jJN~B&dMn@(ho8KeQZkXU-WiMjBF8RcMJnYF2rQJFPG1!Vy~>Je6!Cp->CIO5mh{=CXQwE!`Y zq$z%p;^qc330h(?YHD^PB{*XVLE*DuVKz!ZkzzV%@pWQ%1~SPFaRqS+Y7Vhd+YJhS z2H*PThTo`6V4yiMFZTJ@n`f1P+V{_+$yXje;;RB%Lu0|m3)1cn+TNk@2Zxg44XUI7#tk@2)Nl5Jk%9D)fK!14gAVmQ*t!} z7HTwGlQ6~l?JY5$5{4R>B-#14;H#ZuQ)446Ydnxj6sN5Adn;sgKioUfInDgW!+rPu;ic52@%+V>q`XNCW8O zE%8pQCy_IBi{m+hfNYA@;za-|;W#Ri$L9>7VzJ+mlkmB^V$DA!?FV@pQk;zYrv2MY zs&MhaDTCEj?}!$-WIi@u~3+r?|oib$2O$83p7#_f_|O9UdPQ7kwOZmEWr zJ}6Cn1*-rJWwD^IWqIaZ)oJ2332n`+?~JBB8zVVL+?sS%A5ZEuBq!L7;It3bh5n;O zmNvEm!0z*9aaOF*tS^i*$8L~}MeS+!fhO<+4wf##o|pL=K#AE~3{;G`O~o}Xv_Wsv zanIy3`ivpYH*yVe;g6UA^vVen#W?>?_D|Kj1b+#YN9vjVn8X zG9#~ofn%_>1@tW7IBUqJR{nGnY?0uiVrCiJR>VKhu4z-FBtQJQg z`r~r~jp3tO&X}M5rWu5c(>sENq#2mZM%F1G6;w{WO!`DC(2wp)xf!PV!uRL(Y+%yz zkx~ewUeifOCs|Nqrp&)hSR)Tm3^objy~G}FzOML|`9zm9Ixz#XhE{`bD+%Fl`jNSm z*2c?mPkaE`8F)QCxxFMJa+18Lue=+e*(1=wWWwb`rabHg%xVA$F#=*@d6ZGz(j8X)?6owGeQPMjcazF2ckMb?)V5;<3XQR#ft<^BTd!2;jjFZ#HziHsL8@kzx`&kq!mj6?MPns=f^IeOti%Jgoc-w1? zK7t z_wnug+(kn+Q6xUZ5{0K6xSETG8BJ!Q6wdxE={*-H^Cfz7umYoy&x zy(_7Zj$y<62!KMK!?WU_3Zr2wV8+`p8WHjfY$YP_$Q3DgEo>^68gH76;Pta6b!Xw~ zd(9NBW4zn`b5$jt+etlig*LrvhAjc76N0_mU@QZW)lw+T(pjrofqO9&ZN8!o@F{xE z2pvRvrK$M6ACCaRgl$|EP>d9jvj%^@{*rs3vQP5Os0eZC2eFSbhmsQNa$`)H_`{l( z6a5Mf)PO5Kr%lROFM@3+MOgc>T;j1$l=x~1GvN>kwh1LQg6MN+$5+CADz*P98W^fz zLW0E==ZmSSN$L!vrRf;-3=PxPtp`*<7!&BiDH%uP)!`O?mVtewo zCo-9^%rzfD;OD?P78B1^-8w!&O*|QZTrQeGqrBF_ZLHEPz8lltV|hS=$oa`OIPgiI zLFT}{iao9I)gj;+(<6|#vxk@|FV}E^QHm;@?r5~N<&VI)*U!x706SNZ#rta4csodq zswJkSVC+~jGd%*Q8}i#RQfvvKb~BnSk2!52&3RgYvTX6MSVc=&51Gb5Tl$e%w+4am z28E&JutzqaPCxbS6pH6}02O%7pw~xC?rGFYyN`JrcK_`+3=nEbL31`JyPb521QZ_Rx0PR@Cn@?_IN#u6&`2f+G@x2*FzGlwMSIwQ z;YwZl59)W8V=za-PW;}I+MBJ)>4|-&dem8=)ngHTZTT)`* zZ9np>>9DSIX?fkALITdl z?3`X9o)T0=@I$^oS%GK#N{$a7g;IExvk-ian?nu#w!G>|uECApNkm0P{O8c+jU{|GoQ0wzY6hZG+#9C#cK! zr_jFqq1OgBF_A!_DEpz=sD72&@brA$)hxd0vx5B;_BRx}<8^|-v0Bsy0tqDEQ1%V! z3#j(BO|+7$(~!TzIifZ?azJd;Ckm>dhk_E<1EFdp*_5&;FT9B#QK-uUQ{cU%p@;Zb zgT6`1O;T9heCA*gU>en*3n)Z6QOHhc6qC=WM_@xXb*{6Dbwv2^pWl=Tx4jk6-U?MH zk}4*c?bh$T8(w2EUrc)^N4?hb^H5n4nCTIf1Nb~m`tZ=@XDMwXxoWZ9Ce|_xeF$|( z2Ps2Kgimdwm0JH+?JNyy<{|$haGT?ar@S4-?vXEk4SUh%OOH(Jk83oi$VR<^cHB>0dro)g~hN=|J z>h4+Pgc#An@tDNA`@$pcG{h$4R8K%gtH~^^odgxbGsPlJyqy zCIhd?GbHQ(Hvha+%9#E02Z9KL!kj0|f6`d%4#v&-ew1X#BJ)%%s$f}C3U^4B1vlLT zfmr-4F=v0s1Vu-2-BppDS({+J>F%$-Td!RRV~@?2ior5#>90{ntb zCV>I6^r}Z6fs$RMTx5B}TT9`QKq=dmYh51mAy_7Y(-7IYG}9F9k2B0t2XnaRdt^iCk|;C~q@Tb6ce4z`xe?WgeXSlH?XcZ7M#|olV%eXFa#Y zzra9_Zbej6|STU&Gl<@pm=OU zA-wvyuzdm;akNY{A)-vH_i+k*5v!R}l}V5~Ep!P(6E>Y?@exgBu9_hUf*{wAek_gNmvf|}%g@hGBZ%9=T|(WfD=97ygq%2S6&LW;-i z#$NG1oM7S|Cfly&`eRQV!l3S&NJ~rt1daN_zSFv;QPTzh6G#1>&UiFimaVV3Pek+i zoi(5x*3FR__MkcOk*`)2{#pQ!xE}!l+jzZ`YswAou&A89*qOFoM&Id>&zhy&Vr2_4 zx6Orot8Z`p>m(Jkj)j)X!x`meR4KJMyv&xfvA}89FRGI9D%zd;VxLqlNX*E^ixaJr zuSo>)lrZB$NUlact-PVyEt_vuvJ{00UdkQWmROJ_o%ON0Od;rk`ACIbd0s*|C)QEk z>g%F!SA$eghBDuU5PIhT{y1JKuZ*tGkfuYY6g$gsP(1rk(5w|y6lM`OaS&L;vuc|@ z8h5DG;J2FfFtizNUS7U&6cy4+%`sF^-D_lRn@G7qLiiQ(_1(fKt3I@DR(D~R$&7i% zqR2I}C!o^Gan6g#HMaRo{BBl%kQ9Wng8F}!wW|-mkr{{l@1H)Egx_||V1oR|QQcZf z(c{=5rqSJ6e##*NHAR764f)95mE7dZ{rZ222sY?rmSxTBd>S1LTG+hPRih-sS>(b6 z<8Va33$SSQ=<}l7jP1OAV2B;z+3T?#mG&6e8whsaF7QgR9JL!sYBn5PR~BlwubRq_ zWh@Y;St!?H6WvWFK0_BbB8`k1T3DAjU`3CUdW27giEZ5Q8MieC<@6Gz(b##Z6kZ6W6%mzwKMCDInU+QOP74P{rmjZF%lxOaAXI#`fBYKfpd z>%ny{rzLr{iePQzJWTODvPBP@Tjv0O%E49tF zw-;fJ`51`$nOuRcp4ak-l=t~om8~yQn4QIQVFmr?FS5Hy*Su`jw;pNBjJeE z98+9)uaMhvu#c?}ced2FGThpghk1}Kx2qWYHvEUWz2O4%%ukaai#Ubqr_&2YI2>wRdKTe^G3Q+=(dyog)(pU(=~3}It+1gh&R z%E?Y1ZfLi^92%GjsRi|F{k6EhL@+np(uQK9tJe@0B@*y}BkMF!@p!MyL99LUF}pbp zWPmwrh;Tn^y9JZ!sWU4St?e<46QaAd(oySRGO*67b3aMgn2=W9>o(=J1?*{IF`i2S z#n>KINuB3p<*0C6v(le1 z;l|?86iS`3@mywv+0+4Ky!C~as85HpUr~n2OR}tbHoP@r2x-{ylJ17NBQF&rez3X* z)^UsaRH46)$|UHCDIyg=Rdna=EJP7k3utt1H_IuODiW)YDB3F(BsGJy7cvv{NMp~p z{j0SeVP$i)Af#)D^nIrOrlV(DUkawVVqTW3w8D3bmnY>$5NU3DEHAH0&sdM8eEvClXV#I zzP=C(CSrwd88w3f4VmgMr#b^e%5pI-OO?Zttl1ric0?Ws_6z-`_Co3WQTp?H>WQGf5zkFsW6xduUhtQypQ3uQ&uR3T!^G1CeW=+b8FkYG$C)Aw`_d3(jc<$(( zDyl(~Dt1)B`%Q+l>;zGUJz&S(Owh1(4py8J9Mg7Og`8nz^_6#&y>Nh}C1!zS4B6OH zp^xHi>`rV|MLap*i`yCu>{s^R{2YrL^q@QqZKD;Y(pPha^7#8%qZjKOE14GKI|``* znvA86;ebn4rD}8y3QW&^NqX>>u@WKbEX{3c^q>*^<3Xgr%c6Iz*)%&UwQL-2X76-Hg;{; z%?N~-eWuVtyXGi;cB(^gPwy;hBrk*~Qcu}pB9J9%cd$Dv0mi$eexXCN?obdfQi*qF z@Uo=|yP8}Dyw4p2ro|zY+|;#sRlG<4@#OW1Gg zc44WjzI*ODMRtC&(Y<*89JFXUwAsPl8+2jz;2rx-lGR?xua;jwrQHCP{()-t@j{CT zCH24V_9zC)-FC6`tO2G_0b<$6A}(?f4@BFKsy-W~NgiRDU6Wr)UExmX!5|dBtf9dD zfX|b#*fMi5o5P=iw6QFgU=e;j;l1{U9ih+X33gP(JO`NmfL~vGfE@X`7ecC$%;2Z9 zmhVRD{gCl40{5tolkCcoC+0sU1jw0SciY6T-6Imh#4+{HE z>6B9_Mhnt{o&m+~NpDGs83b~z@fll)ha!i@rBJUr3Wja>B;^4RE+9@?=itLjO@-)J z^w{=5aVXxazwpC%A7cm?9;@xt{?KIUF8A|@#r|s4_^gw?81Sck<&A&e*%$Qtv zXGCpQ!^MS*jf<@Ky*Sv%PiQv=sqjny_l@_gk6_hq+fo zPoM!W1A;I@oOQa8_z%*7S?HwpU_NUp)Pmb*FBaaqgK}y1gysQ2iFztImWJK@ckvU} zWKuNF;gpZE9l%gY`p;b~@lZi$ruKJIoul!XrbG&^BfNQN_mSiv{LNy=PU_9aCpm|J z&fni2v0iyVp6N>ycFo`d1>eF{pox1`KL`+p{+&h>&p%N~$=x|M$z%S(QhvHl0R$No z^=-2Kl2z0KvgShI_GS_bL<;!)gdioMq`H)JfhmMnVvx+nWdzryh6&Ln2??8SRwT(J zZv7`4TaXbwf3d(Iqf?wpm=(-{*ciX#u;WY#ajX%eY_cOR$*Y91JV41}KNMHA+BTtp z`-=>|ALo7@6zq|OMQTCrvCn(Id>g&$k0vx)>rh#;FZ78(zMa2KDUkW9%`2P5;~a~1 zvzqdca4i31XqG1F;Bs|?)|h{h+b0e79wh!`7Sx{M*z-*05C}YUW9a(crY>?rgUgb>rk!5!E<_@L}}`apCj;OFh9T+!>P&C=W^UTp$p|NAQ|=n z-!GoGrbADoqM}0&?eQstKy5Mz62N$0oT{THbV%rFY2m})==gMO2;f`MfQ73$DpvnC zABPtPCqBVCJk_q}9L?_zcx})iX}|C-b@Xjz!5W(aONfmxP{QsKzkLdeEj61BMDi+~ zbU3_hlaFANvHE`}jV2u< z1sZVcjeh7=YKN-x5Nk$h;zLdcdEi&exkh+(Qbg^0dP$dORZ!r|L8mj@(jV0~S2jeKMv{Gf}-@22Xy(r68-4-X@2j#zG)1U zDct{sqOPt|&PmODYAQA!o^Y*A4UdNstRPC%{6nz@mxo&p*6@D(XB-_3{u{5p7Rv^7iTa0g;JQ1uDL7lcQQiGK&}hO6@v{gc zK(tybia2R4dOg1l;v158g?Ud-f1M=`s%iTXsNkXMZBWo_&9=2JXAL#dK8E3NrhCMF zsYp8-eOYjtCPgf?xgJNK#R&6~nSDJfY#7X$i@NcsntGObztZg!2#4M%CS)=yj%;3dV*fe35W2rpLZ$EWUa#yaOws+C3QfcPmnMj3 zsLS^S;kv~xqY%HO=m9SSZPW&2X^uIpsYdZS@C9BI&T?21-bN8OC3NYH-m3v;$V+`R z3efo(KK5-q2En%`c8VbL=s%G(`V)?IN;L*ON|V8lRel2r%om16a10?$XI;x2`{$?Za1zZZhT_HZSQg1Hhwur_;mal- zCsUf7SfpQNRIS$^1~(@&bRGhVXZ0W?aEimTTvsx65wk_``CF>&DVUY;pitZD3DMmj z_NT6^7{&ziYBa11=G5%j*`PJ2nhNtPt$VMuDi&01XzS532$($i{t~CSLhgZ-TfL7K z*Lp*z%h4o4V-q&ab|Wj_g<|e%?Jwd`rx9b$jG9bH+1)5Esyteml{lJiSVXI)HE*d` zxI94mt?Aq0CiTm;gN*D&i`fUL8%8ZbWfk$mY3sr`Pp?G@n}A8FFm$eCpZXV%xdp<5 z&BG|PstSX$IAV6+ez1pXrQiob(;#5(GbaR-9Z}=NbGANMuetWVq4D{u%zd50@tm-N zP0}3$*%dt`IhRu2p9WCXc&fTAh$Zu4`S)`RtTg3~mYOyMDR5L^-Ud$CIN8ydTJs;tyI{`tDAl|F;F>@371&cN92x)9+Pn5!=|!uQq0O%tV{!hh`$h+ z`~^$&jF~XAz^dJaO@Q!Z>p{u{`UZ5LCMm4YZbW`j+(S3zXXpJd04YG$zu3q*k~1yE z?}C#JHF9V#r+B(BXyNSwsxt4Ogiq%f4s=AUyc;9pSfqFeXrnvDC}4$(kza%qwQ3D~ zvvq~qlY}D3^QqckYc7)s=N}}?eYHP?{Ql$Yx~Ze%E&7l4y+Hm>|DyjtHvcaNK$qIO z5|SGFHx9%qJnAgDB``7w0|0Tdre>gKTM#QNJ|b`)+J-f3ZTdxV2Nu+m>2=ey+V&cm zUe%ITn#E-zlh4)m{HYr&0R(`eeetBU>vQI3b zA(m)oX@4o&CHr-sI!w$?0NB26`^b=fJ}Mdmg@GhAt;DaVd|aj`cO1L0@r0s^948wk)v>d&kQC`0A3Uf_v&<1tRdDf6L}Bi=TN1PQ@G_ehBBf6y zia6Z0@pLichU-PiOo)nw5~iZ7C*|4B%+P4fUP_Q8AF2egqr;X`4ArlVdSj*8DIwWZ z5E`tU5~E2{^ryy=+_T)0Z0hbb7c;iXS+twx7@R;T|1>Zy9+ci-rMTf5&x6e z(TnKQWyo4N@`x3g_fb@xAQ&>Ctuy_UTiVK~%EF7F@e~*_(y@;3k-OUt+;2otRkG_? ze(MB?kP}A}*jD` zW@{l{N;9yh$vih~U{DDna*IiZ76UxLF~t$}lr1achN}Rasvn82EW0z1iKD=tHf5xU z&Y0a@^{_=l=jD>k4oAN!OkP# zO+{jq8Ax(~xgKTr7jf|LCur4QPqQaCE`#E(Qr`p)H6c&49ms?W58bODWskuP@d>hF zGgz-8ZCATg!U#l9nDx&MBEeX`r4>3xwG4@pb!NcUQ&2$4n=~M0#7Mcxj(WcJkAfRI z1m&e>X`q3=E%i zOVe$1V<#>}8d1ch_AD~B%_Od&1P6x&x|md-?(wvGr>=6#7DU%F9a#?)Au`*fMjrPn zm`+vM5rIu(VC#d?M$y4BFhO!v)GF3$LUGT$f&*T?8LynTv|iE(BgZYZNyuJk-bU4|VD8oF$BATCERoR&E!CPG0a+L&2g4!~Y^*J`9eIa_4%LT_PN{2RR z)At!~#RsbD>#QU$b(X)}tAEi~tz=v0u*Ns2tFB!4l=bX`w&xwop5*0A~ITks26 zYYdh7EI5AT@~_QVCk|$crUms}ec%BPz-(fUTPxk+J`26b>lq>J?o_;{x3x?K8xCeJ z3NpOO&OQ2%#s4%Wchn(O63`z%nBe}-m}q|d`xl1(jsL8=VVR+P%g|UEdmtjMY9uX4 z;8cWLlPO*{5;V;N(?N!LMivb_B&bG-8fk?y?@vT2R!|pR7*Hft1vM4%lgo==4$B&v z1JUt>4siJaPIuk{hI)w+SsjQBW&+)gnO}Wgb#3eTKKpKeyy`t~fx!3q@F~9h0@n~; ziw(_vQ3#E~ljDChXa|Tj8V=Rq`!r2!-3X%^4IgF7yA^sii1Dkr8-O=>n}x1G0MXtb zx&Qce+?0=}pdT8_j+T4*G;t7L8yyz%LBm0+`v_2nMSax zsAMMgE@lY$1f!QyGj>1w>P=fd=CPQWh{EFOnxy*yER%)} zDQD^NyoSuA^59q&Dy;t0D5d3w;=So=s_W#1#3NRSHg*OsT@7q$ee=>j?)turv64z5 zO@d_9W2_qY3F^!Q?ynSU^($i5!^pbXyu2@CY7{)2h%7YxK@e-K1s24`N+-wa+$DrL zeEc}N7`Z_(qg!KZVugew6#w!>I?{wsq_GGLU3c+bToSSj)38LWy@Qb7ZNxYop0k+~ z7)BJ5ibDCN8V%*iD!|xr98vHk9Ksf`6sPhkNr0VX4Vp`wB)MeTKoDrOt*nyjpem&` z`ZA%?WZ;qYE>q5Jsj|r7VzcjNR`!M_8m-m^o6Zr^<-#Hn49=7t$&% zFhsn-{H%2qjw`8)6bE4>Ek*GZCmkh#J9P(G)oKW-8{&gROwP4R1lP+Pvt6cQq2)>) zLw1@;I+QJ?vRd9awLLJU^i)wIDeIXEY642P^Dl~^QY;}yLzktNU2Wz@HNR(@218;L zXft$t2W`wLlLYJ_bOCW;?Bow%ejIU?9bnHa1Ycs3JOt#Gn$>H+vSR5EC<}B{lyi~y zFA00=^~2c<^b%P`#hxu;bmf|;TG8tJi5M%l1cxk~Cd3(>gaqO3i6MsE8u>hMzTE|6{2sf2|%ArNnG!}lJgXu>^Poq zC)F+w?6e*Sig>ZUd6$`U7Hm{BDNpq1A_VP@{Um;cY=w-H`q^g0#ZT*mLm`%sY$j}} zf%>)p2eiA4C1$W8mMW|w;TJPyD`6HHkC3nw`;oWdqOt}BE~OUUuk8s#%+AIlF09|6 zN6Rpgm|~KlR#lj>S4cgd0HiDidIbn*<7FNy4Hy0;8c){wUr1w@ic^{cI4swkys)*v z-Zh?0_{S409L}W9U@+CgQSZ?0y5}b!d^s$>N==4EsCnlZ`@W0HwF0&4wNMq9i5ga} z!iS0L;Xa1~uti|(hRYb?%gu_sahY|3vo=0Tf)v4gSC}C011v{~WP*&BQ4EoGXIC#7lAXOjWpK#wKiWmfnOJ2+nF4Y&8CwjrMm zxiIj;^P;;uvvYxt*@-U>2U2MFy0Min)xQqrf4JR6trcYu^WI)FG-o5J4f(5 z=NTCya;sD7CH}lXoH;Mp-hA-C#mpDDvzkT>V1qyN23rqjcYL6I@|-z`@eJ5{Uug*n zWt-17zEsun`qc;|tlZe;H~58R4!6_;X8{5>njz+S9++L7yNp!X6WF}lzP~49O?ByL z4{^!j1Ks8WUG;oBThE%t+o;qDpf}@$lwGY=0nsU{0#sB3U?8YNmTr&S0iVYy8h(!+ zlb0dCAVkhC3c(X26*O)kxTey7C>1nz9@L!*kywKWyNwUsEpehr9PJg25(5!9eP|DdtpTM$?;clTfSm_)&g_qG`0)mq1xU ze4^2BP@dHr4&l`|q^}F6GC0(5$VuU6qHD6Q(>zAO=o8O*jCgpcah7?kP5bh)chx#0 zq;Jdyl;wuMfvGF7sl1F>s&uwZq_MPPORn*>mf5`6-66gt<-;oE_;LLJ*lZyZS`o_PRRJ^KTEu(yqf=9y#G62%uU7@d!u0*wPGPGIk4;#DgjTz=PYT=0)hgmywT$*-bR? zwBr6{84{BT-4|%#I}t=be$CBiJJyOL$^|(|-oFz%7K=FD1uu$LY1-JEvO7v1>hJ@k z*;{NlvXW(F{K%wpFi|ynIO{1?||UL4!4s#{41emUuC>_D+-FJE4|16Ju#I-!c_uIZI_u#o)v= zCZ)`wfjyZ`xVkxW<9hd(l&UV8g+b9|eS8IIZHCTqP&S=qFiZU75@Cg`R~`zB87o&@ z4o0PTg`J;w{GPYBvpIRZzSgR-CB1`CKvL2SA{)&5Ec9`^DtRO*Aq05lp0_78hFl?% z(dn#JnSh)>84093oq6--STz?$vMd}dgbnQu<@f@7O`Z>{$q|g1D!YeHKW`4<$c9Fw zhTx6l)+pDsIQzEB@rLcz!|Tn*(@?b(_~2w_+zh8Qf64D53WI1XC6I)m)$-7Qpm80o z9K|{NAQSW8+t&p2SxJ(F=p zW_2SX3^6C+ZBP_PvPQ!54Rj1#B+Z!7dYTUB^q5~xZ-%^?q9wKvn+8+I6DqO~TtQpP zs|d|OhRef?k3t!>cT;}QGz}K|K_(q^F@@v2S@6)F4{`RLR*6DeL0WlKo_T`lA+*m? zjHat|L-N^jU*_ozRHtEkKWCyU`S1-MYgsV#)NVkBiLo`zxJ@{PG7~GzXm{mpBz`-i z!9-Zt#haw11la9lK!V=V_{ujAo8pu#RFpUKQbnY13W2W{tDZ4bVI=ce%2T}1zmZ%R zgYjJCj;uEXRG=%_BcK_3YxTL^=s;|)moh@~{*;2;v+f*VnUYvmlHvrB+YbmBZzVRc zTdd_Rss@N@Vfy0^klnF(+Kw@4s-L({~W>#Xl2&bEgOJXQXV-EsRi zAJ}%PJGV-LeOk~@O0Dv%*}vD7KG)wtd@1(TAbq2^$y>*d@3lIscHCaNf=*IIME4-k zs~?d>ciz(b&ITO01gUl z&N)q`;!0%3*G=6;*@^m_n=mk)orhRWagw7Z9pe=*_xzN^A-Ek+#e}v8KSHEy=HU#x z+nNgR+18C>6->)SFqLxj*hrXib-V21!20M%aU`WV3CVY}`gaA3Dj(`O((hg;p+* z6EDK=2l31kW67_rU4hqgr${*vmmz~GWO_dNF5kG!Sbui4XgV(y$fz&ZKtD>(M!Ht# z9!Ymiq-k69S`PcD&~+pw+gvrRbr_fpk0g|tl>xsP2Zp;l7W$!!or?X|I0HY1ALhOC zbcWg*(Mj8qvyXHckyAO4Q#(kdy3>7#zd})a62Ro!$MORwu>EAl-LYbe-s_H+)^kqG zJ%*2#&5i&1c~f=;1Xkex4*oUNRmL~YSPya`hV=Qzix7w{COAngZYEC3uEILQX5P)C znR)o#9U<~Mz!QuSCgJjcZ@_7;^+Q`KlT$ArQkvSwHPL2OwNT4AwgA2)?9s^_fGGga zI50uXuL>Ucq7dky%VPV@^V9sQbA9f3IX!_C?TmI3yx$01C4S{D+rBv<I*gA0>Hws zX(wFglVFB{;_cor##kSUn9zyo&}AKv2nMF3slAVxU{_cso=)l90SeCc>HxQ2R|(#5 zKh4~;+uQ&nzs0Xb*j@}5|fR3Qo8O z{;K1Ta?e1o6Q*`gmHpxgn1-`}EJ#k|5hXGW-1r2)?DBt9c83+{->ym5RhgW@t|-r@ z1j2@)-e=FFX81uCpwF)Enm}Ln+me>hIEh`vv>GvI#5@)wrvhG2ld5_OiHALNv`Y*2NE1tVNUc2n#b@rict0WqDb zo~iocgwQi(rkQtvbo3b*cWLQV|6|!m2!ChULjU7q&VOg* zPDm=)-`wfOEvIvW?DLAiS_BsO2*Pp5v)SmE05EFul^K%-FxIXESD;#*cDLOqIA#xI z!`s{(7vwLAOkWBy+bt3qEHHI0qNlYT*In1Iuex-8AFuZ{KlWY-!w{k*(G%%$2O+Ux z^C83n!VCmO+c9|9DfiXmwnm2bgrQ^!iFT9JxhZ$+@Yn3yL1K**xwGNnR5DEhPePUg zl1C+W5T}6a5K4kGDIn$psOWYpqnr>Q@HrL0`+rhAMFyO90!xL^3?Mj4GSZH^EA~eP zX+WT1EMYuVk2z3{RQXn8CU%gBLbNc zWU#qcOUkw{#np!Q<%NIcbu-k{v9Pi`C-@hktHS;YxhxHF(q5G64DbID;wqzN(~;rq zoET$Ev)-i-IbgY55mXIn5)gC1R$>NYmd@o7O<<32caRkb-9ZHN!RPXui1bq3*wgNT zJ~dzS*7?EY$lwiEcZ3x^Xyw-0PyDht7;{$wvkU^8s6~UZg*Q7LVGo@SCF&!0i{e0{NS5NL z%Uj?M@z&RvscuiIq zl{=6fr8|@z(}kuh4n1+ISp-(gm!j@8gxOYKhe_@ciTh7axNElh(qT+FKdaA{;M@!TOp~I#6s(JMN@U!JHA~6R4NfCXla@fG z4UEI)D%n{>8{+oXl`^G8D*)wPuP>SJVpAE)E^~92K{`u%m|^(^r>AG==a}hg5@)v% z_@ZA*W3(+2m@(_q=D#J4T`?M_#2a_3_)%d~q$v13a?f00LXxX-c|d#9&9kfKd7bz+MRF)gcU9b4M@~rJP@KHGto9Al$(OK?rZVGgy1=}H7BFCh!Q4A;A z&o^5`&7WGmo&`}0vX-91t(b`4@;d-{yeyic4_;1jF2Zfjpx>(rZnC^uc=4aYuvUJW zzF`O=0f1T1xPyiZWeR&55}bOC_7u=8c;oanzsa09KnS#Kvnq)0-I_q7?ju^%9RnO*S~ z?zK1Qk00rOyXj5w<6r-Q?%!A%guC)0$`@VQgjX6jbP$QGc)s`ygntxuK51AG@o17n zKw2$u(yqx-JoE&j>6UqZ{!$T5QB!r3vP~0KQ{-YUKp{$HbMxBd6^)L~rJ)T~)#kb5 zl$V|9mT_8$ubvd|Rff}*-*wwF^>^3v>N1`mAb+5|wmaC9qJ%EpkpTS=%czTh38;sJ43Wbdn(@ZpuwqkO3OEd)%^< ze18G=8AC|4IQw9~0cwo6duDI}wYO^jvATOeun}TR!%ZPn&WO^-xkdIH)W><`2KT^Z zYU^u#keLZL**;ZgK+W%$^r)KgmyoDq6YmD#?fw>%KZ|5H6YtofYpECiAUsKS0(zco zO>E_X-NF<}5V}iqTRWs*``cx@d9a>fMhbS?(H3O@EQKC)m$^AIfXTND3Hl8jhE2u8 zftx(%>x@Fv2U9C?U0gG(oxHguM3&5s$tlR{2XG{YTgsfa6FJ!69!>7#2r+~2oiyR< zcEr`ePWJU`Q&iAJN}hzpBn?u=Tr??;6O>2k6{F{PUC_ZL(Lqc?rb9|nffPIvyv?g-Hx~+Pk#ft18Y9^zt+Z*%p`30nRZ|R+dM32Kgyu7} z7(W%Xw5a8WmmY(vMVS((j$neCq|t|h`bUrgAvv`b>9&0dU(=?%^fhnhrN zZZg)6c7=m6zdY;xaoXP44Q}!hXVACEiarPW01l$qA3OTED_oKCTUd9;AJEB(^{AIp z4sk|B#|o1vXu`rWYQ)<1+0DZ8*V$*%QIYU`lR#J5)KSUQR+grC3H>xAS$*4DW#Y5v ze0vIFn8$EF6rGI{WB&I@5y-F(`m1Az4GwPsz2JdBNg6KTJm@>A*gs4$w65?g*rB09JU8n9N4}%rf!Ztv%~j(kh3zSpSbEOD<`7 z#x!xt7Yg5E{OBAfr(k}ao@zK|&#p509#kbIn1d{3K^${&;`h!EqGM7J2jbRZ#5&MB zBcalkKGjM{+umqMz>|cVfB?OnRKUj)du8&IVNj5cRpH>tpsrjLYr)ijNoZ+CdrZ4# zf3|h~H{Cu|QEL<72!v#<&*rfUmaW1a$6;He%BhvKVQcM6m^Mqb+AIZ1R(Sk|9QhhH zEQY83Nkm=c8>$b@KD!$&5W3qMDUXfooBDw5eK^2KxwZrHt$hq;MPnCEM3{!@Kn6f0r0^CcMK-E!YiYA6r%rfVn4syAq|N#m{a55}eu3fUi2U&Z*N^aJ6# zuKCMXgFX9rh+kzpdM_;j%Qx)-Y$xz&g3=1Y2quO0VTK~?!Nfb+af%>#A_*>=1U*n` zgU*awt)v3GRFhns2NPL=69;&ZN`wXyN#y-Q<1}O0cgkn`*eifT!xEKYiXqb(^!Ofb zg%CnEh^nw1nliK1Q?$JgOX2$2@Jx;X^~v6=1!>U0Ip=Px18gN^B`r zVU{EN^!cSG-;)5sB`|4?UPR1O4@T(qy&Rfm=i@b4?>tUh#4%*u(TFuIB2B+gmtj(3 z&p`?1yTtNMGI%SV7En3`$2$cY__Nlo8Zl*}@A6!z7j5ziq1WNIx`MBuzK?;L2`z-B zrEDWkJ})u1g(_umvL+C?!l4F!Nq7gFjbYcIw#?ScZIYXKOU~1f=7xrh@bR)>Lg-4) zq)^K!9~xX{8vKlexPU^+m|4yting2{>>M314sc@%gs;=^#Sw`Cy~vaR_6x+#(1w^1mV)n#cs_w)3j zx@-t_m;G|RH%9g3CgEtVImPNKK| z@;dBBFSKQT%BJx)nbJKnXIJ;2Me}Kr^5rPiGdTxF^XV#8qxq&AWDa8>R1)7gK>8fN zVV6imeBC(KAs(}KfNtEKmcZQ`tCHY)EHTDSkxX{VDv__}Oj7(LnJ^{F@Ci^2@~EgT%R%lR$}H3x@xM5G$LP%7Zq2tU6+2IC+qP}nw(Uyt#I|kQNyWBp zr(#r`biMCBJ-U0Jv;Td%$5@}%$2G>huispAUe|4ccMl!Cn^TIum?}LGmn*30IcC`A z1uw++jodOs(F-)<#|YyiW0qO}I0oAkFd4J1!BA$VZ(Md2He`y$kQsJ0%5ZYL&n&YJ zIwae!p9)rEh+&gcqZlf4ppFWeZRF<^rkE?dTH=N+Y1ZQMf*-ol6%7$S>#m;1Ez0!J z(t8y7ChLPgLJjK&!x70#J}{)m4aNKcr$0R!eoo^;gN~LbupK1x)Hy|G`Zun-=s4-|BoXI9u|FF2KH%+ZL{Y8v*c#e`%mfRkF(+)3BWlcaC%XX|h?E zwx8>!Nq`f=syba2LDYLB zKqL~{iE*ffSdT`et`Tp65sZW^iF#6LR_RBZ$A>lTys9h{a z9PdHrHnpr?*L_hPdc9%UeGFfA1J0Re4Y6mvdnY&M+-uD_VQzBBe_EXhPbCS31U` zGqoKpVJ>%!UqNZ6XWK@nDO%62A%`um?;%Y-7?%)=+0H{C5vUBfrTI9jX_9v|QYX+- zQwx-&FC9Yn&OR`Ef$`*%n82&T4SM2*&5jZ;~cvcx$6cSqqn z7Z;0c=0j`=f4QxZO{%li6Xi*fyziAZ{@dnB3v(xR6S!t@&O*PTyV;-Z^mgW*NgckI z6Z}ueJh)bnXOJAlo2o#MZ@+JJzOl}Noc00{p!nD09|XZqdB-MIa7*Hq9CFfOpy$6Y z5-UUCYWf{M-}3lRKp=)FhCVW&qM+!&?i!kC%)mgKd8o&y>KdJkme4V~2A8L%y&8Sf z?@vwlN>A?UU#xt8hUWiOvCE3D_p}GccF)ScJ-Fig9D-o~aw7}2qjX~nwu7{qhkbb~ zGEOrrkKl&z0L3%!uh&^NC1S>O7FJ_g6u$sqa`K8Br3;|#aHOzHdr9I$#mB@xr@rKx zypx%GWSzF!w~QW5qowRN;VUjyPBqcnHSj0O495W5VoIGMB~p?%No=B-Pn?n|a!IG5 zC%=EZs5Z1Jp~3VUO*t%PkuG?o=|~z+_Fz@M2#<*xDh%rOJpmO-N_jAGRVvIhZ*~z} zR>%?Tmtka^=bbmFH_6X?u5)OswJ)O4C09tLj1dnVFTe^I7SUpk;`KTI*Yn2_j7{r% zbREt7fb}WPr-mYXX>qy~q(^M&L(&USK)g)qbYw)=%4SJ-uMs3C$3{uX;FVG>D0mV$ z8Eb)TnE6CfX zSmn)NyqqWxK)A=H!5fzg^f)c)$4?qPQTcmSQ5CzUVrQU%rLxQ`nBf@Vmg#d*Y!R{X zOHQ_H?<&A>r#zLcL1mR*o4jbarZsXkN3=q!nEkLoO;r9tZjfqg3uG$1k%TRuK4# zdZb-E7OJ~*HIn5Gd8H?Mjbbrde)dpoDt2D76zH;Wj>htV;q(t#>%yiPLsZ#LrwtWy_9g9TMq8QSHMr*xIa{ zWB}Tcl#$IE-;1tAnEv30qFQ5B^br`Rxdf zXX*Ww)Aq=%<@y`2`H$p2|G|D|IRD@_nOH%hE~PQY#u&UX+@T7KI;2V}> z9KliuB9RJWERx9v0;a z&iv3N@(_vgHi0rg?V{{Ic9aooe-&emTUNhmZ_y6tSnZF*YFrJI2d?Oyx_k$32h!qJ zOKRzc6@_p@5$WcgUf}wEe@N7C3`YxB-RfX~mubJd%X5ySnMrEx)D|{$>C!erQ`7Df zCq}J@UH=_!Ri>x2F8JG`g#Jji-P6l|xaw`jJyi=KzI}W8$5{@|xBoI+<-ZVrYZv6d z;!l^-+|adaV1tYV%XmzZjbGqW?PY|J^^if^`G_>#Cn!$73PbUg|joXfOQ?FPv%h zAm%A1Sqy;;m5nX-VB_IH(|e?8%RLG{%)AH}|U%PEK1=A)GKV)}$WNru!J!FkoQeV5UQg z5X~8QkT?VcfMK@4TUQuTRe0)2o_OHqe}mm%ewo`9F;Tjpqd`NC+KZRrW6_}85#lqu zJ1Ct2{@8Oi77hr%Q^5t}mD9s|6E*o0IeI}41V(8HKEb5>YgFYovWeVPaE?r=Wc7Jc z6_-qwV!U>-&NDL`D=RDT?sCuUVk`r)@+p(3z>Jl`izWBbv|#2;InI1Nm;x)tTva9I zj~jht#>^zy`VuLnT(=u`;U`Btmt_>+Nqka?(r3lm6vuG}yjfkur(t7K(W!+b2UTSF z>g-_B52VB{+8NL?cBKLt>M6UE^b=1Du4HziJ^l>gpzkGU&e#U7gC=3NLv5;yJUr6*5Od=*VMwwBlhWf$VFCf1+ z$~0{(H4KH5T1RjY>XDi6jod9VocIhnFg>5*F=-zgcH^woA8XPTgg@~NwViyMlNYns z7WEelnErwR!-E~x5^Od?y``xkMXD4z(7R{Q=yvsw%*1mtrWK?O-xJm`zu{>LW|+G*d21#ha@6i`h~nmuleKJq0rX4J zrsmHrTVTR3bM0mP`I@~!J+JC=lVEIuvhvyky&_>B zIqi~4NJFc&_l;K!EmQMS(H!~A{3R)yAhTYGR9oPuYq(R7DA z4PE3JQdzQ;rLu5N>>@37=tgLEsi!|R5-5#R_sxskpRlwjIsyZ&v)n!eF{y3`y>_MJ z_;co|Uv6t0W2IE-coPF1ksi;=l$d=0{HonmDzLdZ$u8Kak)V~`KB=N_*Q{6VOy!vb zlXk_OxITXgup_qF);*43O8|E=sgj|`o;vnv^NWCLc)ImdRDm{HP*GoYOiCWxMx$Mq z7A8|bKA8zqZT>6`(DT6GeR6cTZb7~x!mWvUxjvPz#_lyIQS<>tn}a;0)8+hu^jq2M zMoFSo`}&~2kdKKI36?(y{&j3l9KBzW#VEDy^%S*Jdb52$pPEh~l3z3F3BBjX&^4t` z!XG}JHS@NEv)R?V4fZTI*|?uhiF*Wf^NIt zTegQ=q@r;-fW92UNkNAP4_`E7&>gK^vK`nKFCVBZvO9gmAMnfi*Bpenzd|ozl^-n4 zPTl9+A$W&(hLS>~nrRAMzvtH=)JLZch+pMT1^AVYypUh$2$Yt75|2`QBt3Y({^pIb zi*1}%_DAm&awRVkwRz;=nTGJN!R)lwvTW71+zCS!SEcs0(ps}_ZEz=6JFnF8>?%oy z?@W$~)^Jp7Zm2a0CgavF25aMq5#{KxuPS*r4($G^`GZuqBzI1hBZ>`&P~x!{h97kh z8FWog$`4;~kD>(XE(`hqkSr1dy+hE%53dc*YN@^VQE`-LKh#jBLYBbn$JvUN6gBejfyT5SBaIe2pW=m^q9o=0p=7 zx-$gB8_e+!I7erU<{$XuRU*0uguDh)3u^-GK9hPJu5e^h5?6i!<(@*oC3uz#;@h%w zrM7-CXT57hoodm*fyS_(5F@fA=dOsPTO5NrCASDymSOF*DoDd`yn8wNU^ z0vgOEspRj$o>KMQOuH+qt6xC_(iZK(#L^Zt<6bnH-tqU^o7+TBz#-Qpgn6?eYwnhO zOxlN5glf<{wv6ohjxF=Af2XkBj-98>`~?MQfpm64nt^VJ=A1l&m z#gb*l?6(OX8G|G$az9#V&{6H{vpD3?8S!{Gq>3S7XHyz7n@wR%Da*H3 zB_{#T^UfSTC-S?@JI^4Y-sWP#g&N_v1ys)gK`brU&N0vdF|o zCj@QSHx0TF+6!Y#B9y?&0kA+g2|VMS5Gg@Rbrcm#3CH1&LX`14dAW^>62geCvob6k zjjeq5NLe}VKOOX;b=&2{%#FMC!FV&QKawARMzQYhHOfu7B|@fWyv6+V;*6TvcYc5L zT>b>{@9vMKAAeSY)Q8_wW&6;A(;HD2@(9||hugDe`bBqu&Gd^hf2=O1)Wz9LE6k9V zT0Cgtx0+{ntWs&gaRu$EiyC5AA}JG{-d-L>IB)9c10ayK8B85<1? zJ9r>d0vPzXjRX_{fw+tdbv9FV^cHIcWkjHY{nMN8r=u@>pGDMTI^iPW+$mv06O(Ti zKfKf$tJL7DlNXlGk0ph=m7$V7t)fgRzO#;b4&_N~ikp>GbekqLY9cnQ1AYftP~}3~eS+L|H3q?gQ5giO*U`_ga$Z#PGmx*Zr~8gICObdJ7IqmXZahT;RU zqk6;W6N?`NSU0!j##dF9&PC;%Ixhg#EJ?X$f?=lePhu|KW%NlR1LHn5g3!H6LDd;7 z3Pjjzin^wL{_aPS?~J`5-bWlp<&hQ5&N!R5$IlDW)S}S0nd&?V>lu(QzIU6&1qMH2YcX1 zIP~68de|1M@`CF$#tp2;v|>HI2LP|WzN%X~mZIsLSx2)`s_8e7DMN2R-mY9*pGA)! z@_V^YCy>V$ZPPZy9LP&TBb`ZDP+sk83^D(_T18)e+3}T`FNK_>^V*niZ{#PuqRxT6 z?rZHXJnK)?x;ZdfJg|_bi8>RJ#b9IZgxSJua{8P^X~S*~vA#~d%`4O;i2hsfRz`6` z>$lTs^!guZfYrk1z+tkK`R>=t?5eT@6&W-#rnj5K&Dy!G)uUcav^NJRJBFl6ixL-8 z7p9=0{SIZ{3_xXF$#_9F_*Ahp+mgV8Tbo@4rzuop+V+9?Ng@2+EyRxfQJoTa=9zj_ zTtx)>Wb=bB^FdN(!mO0#WBls@O@Uci?sSB95@xVBIZ^Q!S+2i9@!>G(1aq6M5 zBvUQ~L8y<959Z9QD>l~Z7vX*T?^#~Fuc#6K#e>|(XZ&IDQL);_WpS5D@h4>5r@0@H zx4Z$Tp!%!fUYp`$527pZUhqh+7)uWjKyI!l{4h{8M4y%R0|e$+o9_?`K|zCf-Va#Krh{1JRtIct=2bNd}M5sZ?jfvYErUIe7 zE=%yG2)(ZJrN1)M!W4A8Q;{@#4Mx0IB?sq>TkGh5S}*|KiSaZ9q>EmCDJoax|G z5(i96)KMw<^@=M3=GBAPgmfX!9bh}pM!p2g20hadJ+ly90v#L@ zD%PVV`-=&RbP0LTpdx3Guk^?!yT!`12voXd)3k}AH-OdrNG+d29lMJ$;f+T0U*-)eE^_P`HXLoi6~G@lAzh*Bzu$C^ zm45#jaL&686}r;F_w02Z56&{TLwHe;aFxGAo_*|pzVq+6o9qI__P*25)%0Rl>18gn9X5Ro%K(D`S)p>+%Yr=~f z(@q7M7CZPr-NqDC0d;>iA~}NUE$V>geoP6IhrDITahBOBd~%<$T}`jdW7; zyJ)SnvGTCwE{`p>i3(22C+HV|k#}M)t<_z30Fj|$qF})>GuWPSn6n9)jY(G4hHhl^ zOeS4|!C!>bMjK?Lhf)8EAxFy45m?Ag!a-4Cd{{NzZIY2Y5=KjTQKyVGBN5(RB+&sz zNBJ&dgD%h}HRE)>P0!-yHSSC#5FsHsHv=o9AEvDObIjLe*_g^ z@fmTnT*?m3cFLYyMLe3b@KWx7VdR<+YB4Lq&XqpP44*s;^`|n`98hEGA7En=0!@7) zuQ38M=M%!c&ZgMD#Xmg3Dh)Fg2$x7s<+s`7_+{wil)Ywxq-~vguK5j>+^mnQjOvh1 zsV(z*W}wBjy8Y;(>;_vHH@nh5oTg~CHH`=N7T(*Zl_afL6f5@ic(;URSG9D~3=7ff z_ff>8P*;K8<{caEpI&PSo*zPFD8n0e$=MG%P!k_;tb}*f%!TBZK0Y@wOl{Yz;ryK0 zGU++$pRC55(!@F{I6F4d+mhm66LP0vV$#_j*PfGpR)A=U+m*m08kYlQt42xdJpV_kL3zhk;oo&Z5!qawy>zS+cXHiD+^C-l zy^>fk*@E+k_ClAq-_O{5VimE=yuN*1;6B^+OEb4BejqkL#40$WbF*tzm7XFHO3CA8 zTo->)b|p1_ps&>wyfv#XPH&IYl!b~?^YSX42w#|`og2?9B|fc&RO9RYjE}%OBeM$3$$LVA-xOxBzabD_T#*!d zbe)HL4$R5CaoN<0ZO89CT^CVg6&8c>rE50CH=PwZbw|451^Uqw@=KJ-&rY%s`o-Vq zktE4_{fku( zRN#W4m_p*o+#8btHT_bb9c70f89Ef~#KE}uVf|D*uU;687&hv`Qed^kXrsC*8jrA< z^mbL9tJvrdMDcvsqEc@-KVNxjUqJkQ6^B!Wo}D1|4Ylc8_bQ*YAoWk4*iE{K4l)G6${oQqQcSuq`cp3OGm#k1+^}ATu$4}$j#t#E0#%owg}RgSXZWBtTz|`KH%uk) zCCpCFhVNpj^?G#ZMdu9tzV^Qj_Fs9zSBx`9b{4jAlx6nN|xCL)hL7xZ5qo$%V-|k zAT~u47D>AOVt2=(%S0XX^gaK~(_f}vra=(1mdXR}003Xpn9Fz(DJDx_W7i4%fJ=_r zqbMG1sx-+6Dc^PV5f_BsIfB4ld#hMcCvFgZXP;mGYU`Bhtk;Kp9i0&Lh1~@jDUu3hD^k?AHmz2c1V% zJyiMKr}jj(EWdrfPR!~TT-;>RkV(DWL>%NF6SO?z+-|>3*$2hDI8#5W?Wux7zwKoM z4rmQyJ5DlUz~LHxEy!4Uk5!iw!EeR#e*2u6r|JOTA{be?uNnP8`|H-PZtb%;n~&`P zrhaN9)}3AWlMthEY%ULFLRo9?^{Z*meX=UlQ@nezYA9X7P7f|4ITyXkNRt*T7%Nw= z_IHKmiE7W@yyS%o-Qv|2S0;Ap8!akd?qvJr@jS6Ghe(f{oDw!iFoT5wEe{XEY`%dp+ZXG7(qL9UJp8XR;X!F*Rr?=G>3+`2n$#)JcFbCbz1*Q6L z>*)>feiHrBiu7LTEa)F$Y67zw#P(`Rx@TErIcW{6)yG`O8~!g}A;f7|)0W`Be1)0+ z@)cgX=Yu*RXm1axsaFRr;khnx;WWpHy09%0!HsD5@q@wdV!#s#3-AgTew*?Q{0wE> z4}{<&?y@{Dky*}G@)8$v;?F7@K_w{0{yV9r3g=@I@9LTgr{y^%BvBHZ>s zfGJK_E_!k|j#HOQVk#sYmR{CUEbW1VFKhbMHXS_y3f!g$ful8Q;7MI#jyOeMp~C5k zB?MqK;9xZtnMDeKt+Kw92s%a?h2%{Z&KaoToQmMPM8>B4sIvq0iq+%yuvdMT^%FI(b## z4lhNrDeM`k%Qnk#h2J^)`ggq0XK?|s`rmdE_W#mW_`l1&6LPh*G5H^j zYQ;`kusvv0v`>j*LiCWxpe=(86;hN)eyTy{JmJ!=aZB|^{F&Wj7D7@4APF@0Pr99K zNNScE^OA%Eu8#a0>YoYqEU{wd`ew8j<)Wb* z1y`De#~}Iky#27wUsF&mIr+ct1TaJFE`A#5MGI@@vvP22+uQukE?dCPt^YmuS z6FYv42*vvVy||#-AuTVI%wgK0p=v~DVJpt8Wl_6y-@FI^QCd&voy)`9#H3}NP--x; z?R!B&jf_Hqb!TEp}*2{mp*q;mvhLe+&N0U@?s9YcRP7}K}onPC=$P20u{KZjR^naF(WCb zz%NB1_&M%uq9P%EVvSx5#@A2Xe$X{PKnL*g#Ws=zf*z4yP}a1xl%mk`j)dZhw7AhH zPG#=|`cbn%^7_1+_MD@Q*{Q6%iFIYuac|#0^7iKsjm;h8_ zQv62%P%I7M`-c<=A!|!QnJW&sH#S{J@fZVYP*7PArt*P>= zT#pXzUiD*?0{!tCBdw1?sZ87yj9!NPFo*;P_TcL5GeB`Ry5h5HUMLcI*kOvdTIC*M z$qvJjp*L>3o|k*o6hkFdpP>l)F=JG-fmaWH%lJxt$~ctADG|a;+d%EIRN+P(vL!c; zv(!(dlz>8{%w;I1Lx;pyDD&Jh2#0b>gRC7>dh}748gXi`uMu+CL6}vmn4`qKfS2EI ztePN#8b-6_Y?WU*&d>-Wn^I5xO*uq9p-j^CMHpkKdQo_1Kh}0Gsr~7ySMkWx&!4_2 z8|!HWOtsH;Q_@Ej%iX8ssT2LIzGfHFs;hh-Ne#7zSj?3U zx*wufz~vo$lwpB)+KpWc_vg4POOK)DX5%?)rhw@7q2D5^vH)@xM0b`&OBdX%lq+?? zoat%Z9cv?!gZ?NB@Fm3XyaA%$;iRF^WCvr|D|5Qes~oS-CbkOMkcxBX9Kr8{T+x+f zpSF2Xy%f3fcd`@-%`Ccc7TyXd32azjSSWD_RyE6tMRxcf=CmPlU^nK=u?2tb>Q2Fj zkWmk0`sV^JVW&tAm=zWT%>0U7 z1dmJj>mG#nZ6gr9xcVVB_k3su`4i1ktsdeDJadfUDV2{I|?#@ObUAyR&`FsNX&|6~E zTjj==Yi*d!EpCL4k?l)gDCYtV%&ISCzs1yv`kLVnnv#8KWE)5}Pp477P{#RTR8R!iK`xhwoHKK?@%mF#l64Ij* zqf8=ftj;TnGRe$3loct2*BvEQc4Ma6%AS3DVjU^r5bOndUlag`5Y%T^d%3#I9pAiivnFz@lig8Uqe&IdAa&hG+9ASgAsl&% zs+);6XJlVOx8MUN{9xX8zE(5m#c|_{i=?$Mmgks6Q^>-cv5^2_u+xRjC1#wIm#07o zJtT7P`;4*nFKup)O)>M~FJ=`;f!gFk*jbOlC+d>8WCQShrpMy9ziRTJ=P-o4*0yrL zA0g&P|7gNx#c>tl!5vTuN1CT!lwoUvdpZ1BQ)iC2M#^|Jz^8;pn8EBfIrmql-GQaC zgdYNLc!x=yPq3&5q!n8tVpG_l4N@M1lV;!7}(dXovO;H|et+|3juL%fO5+{}yo3KgzVg|6L%*f5K*6`2__GKlrF6SK~aNpwZAk zV}@}=6hzj837Wns2BAYM$|F$e4mY>zK>q%ozF<8GBD#2ywm;&SJIXDJ_FjzA!P$mMSqmWw( zzr#ZV;6{{=RRkxLH6b|9cL(_F^_8V*c=`SZJ6}<*W&6sZ!Vqebl>VEY`v)afxK@!m zGXUH7h3m$~|6*tJzwEr?qPRZE`kFgqs!X4%vz3=ENr)jx|4L*b4l!_J3jB-Cyh{>m z-gW_*)8_%hkui4ZNSi{~#m=e|L~TLeL$;-p;Z|H8Kx*sHROs1#w@p;9@(d{46qVb` zH9NTi)I7pB^bSh6h!{%;MGU4o8^XsS=%_oEJ&VPN1+eG^>(kz{j0Ze7QKnZ0cE|R zWAtu;x3|bFiw7ICB7&IUyqW?2YJCU~z9{HfN&)C{Jhs(+@}(A=bi@v7$Pq&CP#qE_ zp;e3?jujXv^|*zLnQuvl7%vIHth^oPz&L1MS;AmT zqp0^zpk_lMiOYBF@+Mjoe17on-Nm9znCbW!^ zZ74(_5e?{LoD^>(mV$i>!?W>BZ zCDhRxl1K2JDn1yg2NLEJ1W0=fAg-}VqpH(mX6>1+Q*2ljYbizRvi?SCYaD!>HwKra zN5Ro6XMhDIyv3yD{DdRNIyIH%x{mab(}osV`nrh$ z)NdBZ+G@Ic zemdl?!%(i1DB?4MKFTdQoTV#OdoX0=6@ZOTT>Ux<`Ar%D{YPet$$zhTxcN0j@00>@ zUKO^$D|t-bFo|8gh6~)^4EoCW5qD?W^q^8&b%DrR4mjrV6AUwVuO$j8Y8+z#7t@`Q z?!Z}wA&S+>I%O!b1Jyl3H8XW{F`(~Bw^1j-5oTb~=y&+|GqgVQgFcfmW~{)`AC?)p zVPqd-V*$PY<~Z(0Ne8EU-@?ligXHktYg%hw~#AfEQt4I zoF(TODdRKWtvYNx44bAO%RB^k+}nvYXrSxGe^|POz*tqUb4%UH!{4VYv+PLX?iM;(I_DcU0#MyuP}tr*9Vh^zzE%j7MkdCN}_LB zXroIl?IlL?3=)h=d3IRVn7@0cT(tkJPWTY*%^`o&>-~k0o@1#h=_i?^I3MLQvIw>6 zeI4j6!6c=ShfnybYG8Eh^NjH_BDG<~u=a$6gu0yCFd#kpAFAk|=u|4}9h` z2^S%}7wEB}vP$QUJj|7R3YZ)d7mS>8^#|IIjkGxdp>{gFqOOQxU)5$9YjE>_cLfkX zn48Tom7Z>KiS8_4K-uNweO+{mkHN$0JUw7<-c;%e#gdDcm0MPLz)vjhJ7e9rKRg5; zLNCYnk*QJIB{Cf<2;?x?kv!Gw3;=p+RV`|iY``#UVF5t7Vabn)V>Vs$#xWbV7dSas&w$6S}C`OAb1XWRw4x$SSax&;u{H3RJvvtP?q zOd=D}Nh$O=R%=ra)ZitII#Q~KhF8DrmOS~3A(>LJ+kKdF?Y;-cGr~e0=y7FVYrSC* z9SsMxY_L8qXUqB&~!V~81NoaAL6tZX_Q z2^u2RmunwuI{^qomd|>{>pdyr6VO=!k^a!cJ?&CkjL*u-hulYJJBD`T?VXD3)kN-U zpo|e507V%CrU**HlHjyHk^!BSdNa+gB5lc16?*3l*<6gS^9)q(2*xO8*tbfIAtto~ zh2S>oK`J#2vW~j$j>`dv$J8oj7J$u*_yihQSyGL$n=*Tj`JV(C(tve5g{ znext(;yak18RZxWVgs{=q>)}rM=@n$dSR)HP2220&*!}dwAW*$=Fg!A=KYU}($IM? zJuvR!1wO?~@5DrC%y;!@7MR5=v(x!yi40S=;R{_x>WB0EQ1OM0anzoT@> z9gthYn5k`@i+28;=En0~&!J279LyPq%`!)$kBK%+&W~H*N@N9gC!+g>o22FC?Se4z zWMs1W#9SDWr)l`a^6~rO{DpdC;$@hf>k)ZmzYrRC?}HzH?=*WSqYdlW{JSGF$bJDd zPdA>}{)@vqx$l}?TSc-ygB#~159AsGHXP5=C*C0jdnn_cBX6MHYl5O(qVF3j*|k9=_-AAldB; zszpVq9CLW`yaG%nn9h+yz9M*~kmM-#RhpoQ= z)cKD;75-Ch(*Mg?_MguT`3<$dX9hi^CuMMoP=F8&Yz7cLwPvd$Wsa0Ypo3%!WL@ZineoXGAgzMk|TuDaSe2`O35L{;3E53#1O% zjTlmoHAu^Yev|zZ__GMuj0iH-m;`iz6xKkmBQ#JJ5bKA5+L0cW8VzO$^MU-a`j>+C zih+SZBHe67@-QSR^}&j2wz&8og?!&Cy?~ zerhJVj1x|CEi8>PS-aL#73-cu1p2-m^Xnn8J1R0cwV2|YMi@-zXF5cQvPDY4F7+O9 zW2N(ddz6s9b*-WBp>5>{tm_i!pN6w#wdT-6**-+6b_qk@jWHO`*MRyvLkq@nydgQwQsMiZIZIl5mlWb1vnuV`zv8Z|Pfws=(2y=2pZtO%r$UVGvtJn*y$aGXNbyue_tj*ZE#<{Hw+|7-nRBdLW44`^ z+-l&$d00eO{2b}0nle2Im0~5^E==J>jdK@9?dz2qResfkQ^|OU@8-27ugWd6bPraO z8e$5<-a-yD;Pv5tM+PBdoMza%&6;!7Q+oia)?jWnEs#_3w=_p!_Sr@$A$*8N8z4y| zje_7oY77GgG(y$N(p$`KT8PixPi6~s?V|6(^Cy<;shpLolTN`ohblLntV$s(MvlvO zO3bV~CbdC1wH0xhGvZrR3yN?yHUUekNOcnoPD9Fr49-L0t!?NL^ER*p{mE;P6KdKU zcy`|A1}D*~p5#Vu!@Gto-j*pHnVI~GO#LX`#vx~lID&|}1&;fI$l318+*e$CHHp() zA)RgFY|1fq8Hbp$?_gt%c%CtbZ+M&$440O@kSCJNqSS@W?0(RHwms=-5JSSCp=(B< zV#!8|scMI+WcMk-Y zV1F|6?Vga6GqbbbR`OPns<*G3CoNC+Ex(SG_UyIzTD~Qt3NY!{X>W(6qg8 z8L?RWLLD{j{Z1^4gpXwa6!H7yLf_MeGCNuFwD=$~MYljUsF}|~or6fDgRsO0 z&k(-J63Xa2`|w?ZXGI?oTg@HI({evU2;ffa*?i^xeoA1LDX*1EjClNGNx5-*4zcY+ zf3|u4qgM6fgKpHr%aQ^B{tuRve=9-x)lI2@D2DWe!5;_>0Ivuh3?3Y4i>^Dbg)HbG zkV_}qtv-y%B)P~srzszYu5vB%b?sEoYl1w1yci+tM#RdknZciqKP6~7rJ}>(ZtURX z`RVxqq!Vz69MqP=@1l`v1Y1uTskCI@yxRr2w0M7j3*-jb5P2JETj??<8$TrHy%Pu= z5~rf9zUbFf>7IG)4-9!jffg1Kos;2QWtQx%+YTH9P9_0-Ov`)YY!&;=@L)qUS1QfM z2hvhY=Umgp@C4c}K!uCCjWf%2PR{{}3>F~P$@SLoxt~r_@W*}Iver~}Xiz8?NcvXf z^JO36{N(7`+*DAuc&5vIU1Bw9FBk69FntsuHKYo7(d8h#)Q3=II$_E6W*sGcB0e&3 zU4-K$x_pX1NspF?_{w!+b>xA9*9LR4N8nCf;Dba6NEqCJULu|^lSJgY@_v41&cq>R z-|yt&_>mo;%F#^ta^dY%Yv*a2UX~~Z6NOgj_Uadp&oDauiUCLp4I>?7qHu2U>JHz_ zmxCo_sD_%OGw))A?HZOl8E%`&Fz8S+&QIoqof%M*l@mOmx*0;qG$l3>0%OsH$wT1t z(1>N;CsKyZJ5n6Y0;X|zpVf68wI8sHX?6+)K3x|O+X0yc#vneJt=|@mYGguxAW4IF zJh(M%ucsRQgo)t--5`!v2WVp}b1jBC6Fi>boYl!f6@iObTWulA!j3>yVX0Jczl=D9 z3vrRGw;wLiMeEcrT^qCJ^pOoXu!&(7e0&SO9v@m{ukEqh;TeHxIEJQhxUi&_-|CqE zGX&zLF!V$phW~q5Ix;)A-uNBy4~a*?nj*BJ!@byXUy#4!M0x7ue+wDBAyoV>6BPKB z5f8DJUcH4LO!wQ4RlBq@5jm+>cr1e*A^&&64SkZ#l*iym=cl)AHa-3$?;J2XYBG4l zJ>?d^9z3XW_@v*eK&13|4tAiP4~RS?%fQ!x%SYbATo0__`>`F=6lXYbmoyS?DyS;vfU@V+xHIA{z}`mMmS6 ze?%y7F8L7tJ3>KeRTjD!#IVA!c9Sujo?^4s;R!+;>V`fl8aUw}?=Odb^}~@#hb|W` zksNI+)9nQjN8j!GPM}`^LII(GXhbyG2zyT}H78}6+O7AR zGM3i=75?|0*d>~`MRPCtERlF8-vCvTtFeo(A_XW61%^qnu$MCWM;ZVKkOTuGf~=rR zy<*SKl_IjJy)=uHN#;jx?$*Ays@3Q5nhL@!cc~g*Hm(br4WdaDH^%~T+i1LvTt6aG z+46bkuzOx)i$3sja!IoJGsb)%-Qzzm1~V`XD`fCEv{0f`bWl-STi8;pd>bp|-fX^a zBSt70?%4F9>}*Y;yJfa0@%FTWc4}0;yzER#3yI~9=5gF;9yODyxtUKRm!IxEwWG+y zd*whs@!(p$Q>|ImN|zNtmW%|i2vi{({6;@Cfg9wquyqu7^k#B>%s-LlKpPd zmqdbKqX%q|#`%3njKR$8rh#d8wj;+6Pv+MxkCwHtVd>&dC=&0g-Sr@a8Jnzkw#q1> z{H>73gwtZmhHSE9b<-p&JLs2KUWPVXk#HU&YQUyimj>4=1CpNn0_Rv=Q}QbaR9IrhHuw>q8?- z&zthFjX?i2J3;kC4Fv0fm~Lzc7a~g0Mv@J0EHTRdn9f*#FobgiNQ6Xm{j}y;MU+1%bcb>EzilhjXl@ytNK5e^daG7%fyAIRN2Pr>LUmI5Ndr`E zQ|hF=b{gmNLq>ycA-Ez}^n>bdQ4LEK)bGA_BdiBOm}wHHmAUh?=}5&FZt62Z3_t~d?rgNT02ZaD-2G-I@V zYGZ^wJHL&YcCXPI&6RCz;+}~o<3aX$ZZ{iA0cVWV5vtMh7>TCAwB@tmZ3}R_6K979 z<1=Pn>ZMefT!#t09SifGoyfOZNCF`nm+(QE8|UyX8|pYk!kdGIn$vV zydDD#I#8PKGqT3x;gl?ZF;L?^3uopAp2* zk*ZN|PU+pQT0gLE2$?6vK%7bdc%NT_o$20oqp5d%^xGfM5@dFsXqdN~fje`TlqDh- z>yTwwnPkR^7HH0C=QB*|lYH|sa|KPQf$63LjZi}( zve|(!NI6CS7Ia%vepkSD5pc61n4;qeiXe#mU6T z7-=vDKP}`j;s=fz$679As2Q6`e1I(S<>ea^sN@ucR0Z&h?JjsL4oOZ*-Y(>sbB+YU z_f`;OEF)zlLyCE6<{QIW5{JXLbcYkRXSZdCn-n-)FD&1nGN*NmMy*b502fwTAQ$%N z4=q@%m^uvxS=ei~*{Cji)3$IvE%Saho7`Y013-Y+9J0Y+AmOLuU|7i!LAR&0S^alQ zq$He!YB*I}avc3wuFye^=>s6)7khe7XAsiYgeJF%zBU|{SZna7@jw)3wZ7jVZ!>{D zHR=<&3U}UsJaqceFO#hY!8V?~!_C~$cnXH&K{-VPD>+l3zA*6&%evS=1@tx>aDaV) z9OtNn?bxmD*yyo=vSs%kSo0na;`ws+-j`?bj08-&OUv_M+|xBi;2gonV;sMMH_D0_E5iQv@Xy84-g`3z%mNoa;XP7+G2Qw6rNPj(i6LdBqDebIR zw}edla3JGJih)Ckz6jUC2G!O@7!a;RY}uD!JA5{62q#cO@;;&I&=rFvwj^DGyAlwy z#3@OHl^C)fgh0@lWR$8yO;oq)+ERDr5J+=v^D>J|{K?qOvkKOn@PRuA@#uW4bS?O5 zc&cx4tR?(SZ90&^@02=F2tgrd7_L~a10S~K^hpL{QN#4 zH>k-_)7j`s8Y+oh{p|6y2YHe^Bfyc#MuvAnk`?Uop)@hqdocE?JFYRa(}6ALoo!(8N4meu7eL?tg4LxI7KgOZtp7PS*u zRfuuaeU=31)|_)S#K62I#7W^Etq@~(rw-loCoE>ct}>WvSHn~5C&SDG@S)6O8sf-{ zMu@?Xy7FA474gC8%D`htbQs&E4d8#rihP76&0t2wZdO+0cn%vV)te>xC9u|$ikxaV zy(+!XgMSX;F&6kykxgS_m|(6mxMaj|jd*2Fl3L!#r^td8zwSE$y!uf*D1@1lstU*W zAbMb|q_feW-96}ec?>mMzUKR$!rmF*8KfC(-OsF9C`T8z0D$=**kLSjP$YvE3bn)m zL(23pgV#u6X*q~7!!YbrR<7I|~`f$%;lX9Q<#ANE4qY+pO)o^45 zEk%64e4&gPHFgm6e~Xe5H;TN#sZ3aX_Z2O0VVM~Yb@L1i8Vj!y1mD5#5w%)KkbbfS zUt=T^c>zKBU3I=?%3xv*GW4v7!kf!*l!YP2{!&?0sEWZ*JF*OiW_@$k{p0xVP+~Rx zjW3txo{I%m8Q52!zhT8AutO^Zs;QzDD03K8qd;ryxYHl8&+3s>D_PbBJ2c_ufHSxj zcJXw{E0b5#D^qWZe?_oEc9z?gR${&~HV=R+G}C;E(l4!}qZ2^r}>f^cJ3>_kiHguOjYWNDhEB zLa>C%!oO9m8=R}$Dze}TC06ML@tiLiX)zw2cW9ia*&dml)|bBEKpOLc-@BIXS$AAT zyGgVdGVtXKF1DA7%b`UoAasrn6TGxrbxTQg1l`*%NHA~0D$6PTjP<28RzZe)hYt7X z(}e?`5c)!~RI2Q?*cE^fQ@Cw(Y?<&zuEBfUMr`tou@dI=uLDzKgu~(RyT*pALv+e^ zcvGq2u%Ut7=yN0L=ad&m__X9x^C32Xo%LsJdJz}#KN$q~x_>$|JWvY%Zrzk(4*&?U zo*Auf{kesNZ}DKAH&ePQaR` z;t|>@g?__y=>(9g69JtDn%MVB5-b*}di$m;Z*7|6ByZL8lkp=-+#C2EOiYC}=`xw? z^b-vEgo|4x@%hH+0prb+X$`3z+Y$?Scp56MsU6en^*q@^oca_%qWm}GF?=}1&Qf$U zTU{&ZXWDlD-wm6vkyNRfpp#4_N}t!bsB#PEo@i9ShK{-}TVV}@x*NF+DM%0xZH6)x z**fhnH!W#z<@^I4!h!Y|;6mm=_q{+t&A1Iyz|7iL@;F3%#@1nKxsyhn`ZS}GkM>fJ zN}6z(=9wJ0jLW~#&KI{$X3cC&Opo1TEhi14RsMKib1S~E{(Nu&n7c3YN&t zM=InkDg)93y#853nFCjeK19+rAdf!1_^31;@=Ka#t)vb6`2BH;Dsi9Hyrn^^Z#{q* z^Z2+&-~ouVs7F=cnBZY?vLO+*?)0O~8;Uczm=RwBi9@3mJ|Cq)98W`hbdFv1qnHqz z@|p>CiMh014lnx>#!v~zb&G$joBJrfpLL|azQ}Lk{QX=Na9){ZV^P^`+Rh2FJON9R zzR#fZXy+6G7;B=bTywJo-;;uk_+lmH)amGUw@Kj^lDex`MRZ+5D{kNn`I1FN8_VLl zp?N@qEws0Baa7LI3G=oY@pdW+(gk5{rBQgmg{6G{Y(*-O6k6~n+E^=5p0?Aqua&BCGJ4q0e zZT{QX{ySX$4?zB&kOr7#U+HOy;TA{>{6>*t^|1!ZYLFLB^4;5G1`+`EcVYfp*%M&)=0KeGUDw|`MKD&2}gDC2ihe;z9Ngas*t(r)UYm$RSXv-SV-n&?0|J$D`1ap z%+4`~F53Z-V1rPI(-6TGX^^r(D`pX}Ke=q7HG8CMWSE5OF9BR8*U0SGu$k2`J2)3` zf09bGqBF^wFEA-@I-cw!!nAyYPzX4#(dvl)c+dp6I z+{X9ulz8Y2W#?we5wcYv;Yo{~XEm4nnp>$Dj?|n7zr5nGZl^x#53hqADS47L^qV)M z*#AIo>c7q|I{&KLl{Ydmb8xhG`|})AmTaboIgdQ>EQ2sYJ6J_vFreG2YoOs9Lkm2B zqOEGFuaAO>g%Pen9}XH#Wwt#zh{j>IIAa#q=#k32GDT%JwNe%5D^OD_mc}f#RC|zF zAk|=V%=S1l?a-Xw&cYzdkP1(_7Z2B?adN-1)8?`kko0sv!|;axHq5ssdBZlc#|;2y znYc4-2_$^;81ST%!?m>r%VkrGllrtVtf$4THE3W3@S!oNrwvef9Y5$Mal^~C!}krh zY~a@IyC^t_%bTEuJ#HM_4ciW1a!tcH+?_Kz95~zCMqilz2@+S&*nvV;Pj%ihy32P_ znZalRXIlvDB;Ld?Q%xhoV%v>FaW}0){LLKMh-Nv zdTMmS8|=H`(AeHa`WoC)2cfcg%5>7U>qI7<0>RQa+~Nh{!fVp>^*J^x%OlhsNLDLj zRA3L~$)6>cUOPtRZ{`rf70Ib#W5&yvY}Yd96{Cw0G}hnbxe7xM^lck9hQTj_4+R>> zF22CsmagQ5^y zfI-rSGn-+9Us8Wex&8)`X)xbI|8sJER3~OBCh@5gnOur4o5EU_SorWEogJsN$WU=2 zpIdCXf(bZ(7yDy+I!u;SZ;!b+Bat5N~RqCN+Q#b)5&yRPSh;CX!7(W zgf0WBq|DU4-jqRFwoJWq_P15I74HOuE@U4==gJIYCqI}FvGrYNoybb(=}ZQ|4k89d zmynm>@^r~O25%`{i`m|$;PMQZy|+?~y;G2ATeCG-wr$(CZQHhO+qUhhUAAp|m#cQ! z=D*L^eLK#*(S4)W)10y9Q)bSwa*dRPEX>nQW?tU6M*>DJF>XfM-&9)Skp*Kik_i!C z?$*HbuYmbL{o#V7botRRb%K5hI?8(HkOdRyn{3_MY?uX%JgjR8KukhUCpqvVV%5wL zW%()7O7qc5N{*1Y$X|0<(4w#Vg!2(#jt^4^`PhApnK5^GzQUZ6G8MrW7R#Gu%0ISX zb+WsQy&8Vc+6e*O%$lzqTk#&+f`u`D);k8U=kP1WH5##y;I_t`55^;@)enGqLdfJC zPeS*gK&rtKyEeKy3oY-K7>5t_p0%3{5`=Y{{@hzT^rQuMf!=x`;gKZfd zF`F^F(~>K3zh)tH8)V`VSse(i6sX`nfD@T7vxR3M&~Gl(T->1QfNaBLk=#|=?8e;; z7ni)I$eE0=sU6)%)KwDM0BB6MTlPmKv+%Mv_ZCWpSSw1`Vy{^wRor%EXRK^Yf8hkq zjcJE-4;Z$PVZ^6Y#fTJIR$%G6BtMwtSor{-drcPVEva)8sc0zVXjblLVesj*A~=fB z_75glaxq5cB=SFn=A|s;M6-wFmLti}U{ z0roBvB7(dwIavhciS&`x3dFG(=Gq!Mm8{Fq1Q&-;F%#lcjwXAZ;)6}&-t6lzig z(j)E)to3ARN#dJruDDA7^{QXgg6tEgRC&hPu6WMz)dNi!=w^2e;>?j3RCy-GPI%05 z$`aMgkkW^X0_>6(S`>~I`X-0b$`V!7I=C|+SNaXDBMvFw35>Q@bM+?+w!SkG>|h^; zTyum^)}4;qE|+m9ZGOzfk1+E>r9GRXY-uJnqD<}e@0j;+qcq~J=mQfNM@T5LLuFvO zIt8gp22bt-$E|GNH0kJ|JDK6uz&-34*)MVCdQm)@OSsa^)|u)Zyu}U`uCqLsN{dvH zaJh(Z3vM$E#y*&E$i}j&ojFHZ+Stzv6^6hb!_{B|?aICm(AsW}BXg~5XX-PUtlMAU zG&Opcp@-zaz4;qP#9&8QI)!IrMP2je>wF04cH_+OJOG|J?fo%}qzq*g7mPD!$kVja|4GS(&iZlcEHz$ysoBg1W>F91w1iFIq*q9lo6ndq_5 z==L>p97FqKZS!>;#R$xr7Vb9;we@%mZE9Dd>br<-X{7pG7x0d+WV;M6t%ajGPT`}w z0wwxwAFDeQnRRX$G&_f7`oA|~Sqm;bTh^Uo(scbEOgwl1Q9S>$eSeSPx>#HbrwT1i%2%*$3%N7kR-6@%Nm zo52zpo&n=tv)`n-J31zl=deUB6-St)mek~RaQN}_M(O%}giOfO@Cg}xRvH&%yNJg$3#n;50+#mj9tL3ndc_EU6R(?y3_%ulM+uCR zvn4m}O^HAp;9Lt>9_}pwVr-AOJDRLX4RDudjW$`c$Z&{~-({T2IW4b0%M@eWKnoBn z{)Y-m{G=Aq00Zb#% z5@}V45@as}_D32yMqegt$M=xml7&4EsxTHgN!$=+zl~TtlL>`6w7Y0**zJc5Z3RY_ zWHM$bDlv~gdyKo>F1QyYYQud-{cg$@@tX95CMrkjrkf_*nFjx21X z@E%ArqKs9oCnz}u`MF^wZYHWAF3HytIfqBIrS&f3WSi7r7FYfb-y5D5UK6ObMirm! zF@RKZ(CX*Oj;n4!J0mVX(^YDR@9=WYOcbj{c2lsv2Xd~RG*8v0Kzq?0wVXwFRgyYj zn8jO}6FyGHmp)QK0fQ2a+tHJL%-j$q#jc=cMxM7WRk}NT&X%LI$0C*3ipl2o_azQ* zQsGf5aE(TG1aOqQ^0mM|a>tgqLZ|@FdbwVfI8Z-zEvR z@+NU^4}lS~2Sw}k%C)Me3dzRUj6Mp3{r*U?*g5Msa|3Po5*f<~{f#d%B}r%6=+ZHV z)5mW^w(!@MOu??WX3o1IWu>?)&VBJU2qkAUylSaEu5gmw$?9 zjkqmFe;<8O42KvS5)}{=4WCA$lW9FJ!Jkfv^2kKVvR*`^ zilG#?i^)--O5r&4xf>1UM*&L@0*H=BNYjsWp*Sh4Jflj|4N`Dp7F%j!o!BpeGaou^Yq_3cw_7_1m_|~4&3QJ z^Gv;KxLaey5+w#7<8Q7GHNa)Rft3etWOPF5sO9%JiB9s#qm$TfnB^C7Opl?TTqOLurbVgPDO60+hIn}XzhcGw0kEF{7>em~&- zJ2tXOaz6i(KEeBhakC4n%#K-rI5Pnm_zWerKQW#FQKRO>(02TJtbke~IB`p=G5Vuc zr4vYOdS40O@V1!=tU_;fS!GNL2;9B86B&ZmRILAw+X2ICk!=5eOT{En;t!u)ayFjKEt$X8=6N z3{q{bB~%=YR;_(@Sk60gfLArTEu%hFH=Y?Hc1!TtW8+nJIBHB+kCMqWQOf4V+d;Z| zgO~k15Bsb&@CzIJ#|u~!&7-O$k`BnHXi7$VF6DE_ED85s5ZUrsJNK#$N5OV&m%5GP z;NGL&ZIsVTZ%5OSWtki>wIIdaEZM@-dcy8clnp1X*-@3R$zk3-zd1{8U&vwsrHTrCyda@CQq$ zNF^&%M;tsM?guL16`wyvkwCviYTS>u;d6a7@Tz^(xSt+I&QU2%nn&W|1(OIe@*al} z6CG#HA{g-m^Y+!mJv5MydcZG&4uNGf#)v9w=|7!#p_>up5!S#)xIQTG2mP9Xie1yX z4j3GCYWdgK^cp(>ih!`_ni)ljX68zzhRfV^{)?dPh6g090RhGbC2P8Ez=m@yUrg>; zbL7H<^bzSGxQUsly$2EV_bh=u+nztMz+5#&*{Z*QaywjDhfUik!C0*}=+)vM8q%`) zdNpg1aj|w{v&pmKU(KpIXwHIVk*lJ;hQe5b;4f# zl8J~t<466Lz8H#1)>!-Bsibve*OJ7rLbqQ`Ce~m zvu0=cP(MQP(&Ru0 zeTK50ZX6|rt2Af!%^czbJvntaGNa0&T)1f*{l(frKF)@ni{ssE8nTSZ2$UKWbX;_Z z@sdEE!HJC@nBr>;P%lfb&Nu5l8%8B)=Ji?5Ps;hIMIR2Jr-u>X&q~&?`|16ww;{1O z@XQ|;svZLtQh=`{@K5chW;L2}>OQjWgHY9^vl0(qfw_EPRkzL+hG`h62X693FaZ}l>A8Xy}plW7(q5p6*PNTZNJlT!(e z)bet&gbM2pw^GZo4>y!lEFJw}ZaBQysCE-h|6$DldH0w09YbkU?|z}!O6h8$$oHvf zcGsRetfjo0LY=Tgs_AAwqni&Kfb-^EE~{t!#2ORq(;y$9wA+qU!ak|r=0I)q3%VcY zgMu*XA#yje1c^LGfSZ0GjJBiGV59&hg_AK_m0+q8_yp0Hku&0 z-u(hMX{P&BTD+A<$G3jdHB?&oX6`2jO_$ryt0FbOi~G<1Y2F6yek?!He^h)i{ofGtnIe_Z%st+HBj~_M^$t z7V?Sjgp$7P%29p>TVuEq{z0nIcpa z8#8D)$!2iDSl!CcsbBTzH$&7X8^W+-H@r|@R!0hO7C*`11dSIu$>9;*3`!Xz;Dc3X zCFJI~gy#`WVv)Z#Lotvs3IJieoj-L7U}QGIS&)4UW|Y0IgcXs^tACUYT4uvWA%{TX zs<_H^pgQio5n|G68VhsmD(RD@F^EPbz5+m|bl2rIV1wc&on8jZ5(X3D3&b3II21Vf6Lrc{lc4W#2z!2#w&E-&_B@VIOu>RR=eE@4 zw!Bxm) zI?b+}zk`@AUlta?pm5L-<|Qd})#PJluLul*by#i0!j_x+FXYTQY+SV?N-EytE-|j2 zEH#CtbuvJ+_ac)744=Sv&RFQg+TU!%_p>G6;G^yQ3IbZ}qxr~6gjq<#C7;Iv&*nSg zC7z>Em5&Xp@tHY+%HxOD^e<PY{7GJW6OojTijk7h%HEnb`eu91Zq?tp==B>s-Uz-z#vh2^ zIxa5ps#dfE)-E38<6ntK z9g$gb6YlR<>eAugtHn)#Uu}mE=Ro(=WybQVcNV3Y83XuvL4F1cfWN~_>UV?N3DX(9 z^a+~ivk`OD3Fr!bYQ7%5(cHvY?Z%;@pLR8r2!1pTPhM&Y-kB7u)5QZpeILLMQK9iK zUs9j?{s`2fGkkjVvKH{SDgPWy3xAept?niRtwFDw>q~(2`}cAC(eTN2lf24bM^^JAhxcSHXoz-Yn=y%;x zf8GE)8L73V^_iCv&hxtVHG_J;J!Rt4b7tQ(@u2oLUyjD z)hph;$E)Y1ewrGodFj7{-KVPXy;4FgmCv*=^=TU5{UG+*GU5KCT{+g*M9H4!^ZI2P zDk1R7?EIzARx9}}Hg$b7FD(aKTSadn@~XeU%i>R5@Z^3Pq?%)&NB^T->EJ(U@C|)6 zeczY#{Kg&3uMZ>pJXrwvq7RY&iTnJAo19Y5Fm&X50e7h{$iKHZ>K-*i|2kjS;LVSWU&3{$1)YlYo<}n|-=tt^Dlj;760Jr6h zU(xPsWpD1>^{5`^oa+-=cT&HDKiaD21gh&3nY8=wh8p;;_aMmg^9TL(y)Ez~*$MoP z+PZS*NBOEyKa)TGIl0#;%kMRxI^a|4tE2Pf$tW4^5ncqyZ{%A?=@rWx=@}j>)c@}W zb>sz#8}Z3sA@{YqBVU?RuTK@`@Y`^IrT#RZxpt>V=#b>g*L1wTIe#d%9({6T+dr-P z>EhSTABl;Jp=q@5c7e>78Be=#7o& z<(*7SorLY}%q*R34P7kl?VRcUbILctR(enYBkZPl_Dst((~KVNgAH~Qo*^iK4+OYR zL~%E6tC`q2n$!D36|_`g9{yBZbS@K_h-5VH!Abv*pIu)4&5Jxh`1+cHKnnzFHkB1t zW5r}6=~QbJE@~G{R7B5yM4=JXS(mVxC*Y0h z%10I-KqTW(YRcVFFunn+KB6ZEK*vtADGg~%PN`{8CV9x5;jZTyl1H&BbP}FHpVI|7 z3Nb3eaAYl7(+A-HXmHDyLemfs0DukX-x>_bW0d`u0s&C}Zd^=l9c&C;OzHn?L1*Rc zkejS%zr=tNy8A(0M^O+wAM5%WVlY0l?Bv z0*Cw0!`JKO)0-?by~YyjfdT*~{xgguWpwf+B_Rqhk1~db`%`KgnD5HuWCQSSu@if@e)aJptva7;J z#tzO;nhx@OtD1rwe``{9CfTy4ZVqSR&6Q0nBlsq{cMA3+_-IJUBY1~S1|P*-QPcPj zUu!bO1?oiZf-HcDP{w3!U+2JAr3iWz)*X!uqs=)JRnBCZlSG1q1;5%@`REeY0iEX` z=uG7bbs!t@RhCO}Sb@x}zHR0`{nMCXzw9X!z@NY_^Kl}o4I?IU-?E_p%e! zWa~Tu-ssqdc!x{7(#``TrKXzTo4DyD?;dn`y!f%tJP5DZ%J;S=-}td!E5Z`q&5=PX zus!k7{x0D7pnGR#);xcYe;iE0KLJ8Jd-iR6ABH8)F|dBX{-gCw;`YSqzcBL!{%@@# z>QnzWn1TAMbt6MNJ5#5Buq8Cb5AY6)lH~Qm@vRzVge4peSF?D{1M=;!WH>Ktt*IA6Y#(tH!s*^WUMZcSyo5DJ zQ4wgCs>+|^r3a`h+^1N!M-7^ir@Lq+|CU^m8`Dw*nujrDnDwWqZFoL4sEzl z#nyIX64@xY9ffh^!YW>t&BY|p*8-EsiC!1t4yVGyOR|qQY@aVDzoO&3&#)q&fY|bT z`@vYX>b|8iMAs2(i2>UK1(h-lP?gl8xYwLFHGdG+!N>l1otKrhz9V3t%N&9?8Xim= zovU!(eCo;4?%3}7PmvX0)`?w_Ms9)Dw7u+0_Yaw`%PiHq$K%tRVdl*UF-SIER>>q4 zF+D*jvL#DZsu5TO0&?d5nqbqB-pbH5p|>EwMzPI_3J`Y&Fwhgvy(D zUNl<7JntRJ>y*{oD`!ZlL`9dQV9{CZI$kY0p>p2N68TeUND!+K=y=Snm@LHQ>TYcC zy@CE?Fk{PC!f$^KrVjYu2J=5*g6Ur{@&CuO_`e+s1zC9@Mg-p`Q_TS?f+#Ypn6}?5 z>)GhB;2l{Ghda7dnnbpZb>DQdBxE?RfZr5{1=zt6trOj?H^y0>-ubftIfiX;__bJ6 z>sje;0apOrAakT4v$E%-=idWWEQ&oo2KUy*SD;OlP2tftYa3fM_!mUZtthJW%-N{w zArB6&vwhzc@)a(>`w@=jQFiGD^)SAk>e;B%lOe?UVf(ZsmlqN%h!Qk}V;vfB`YZ@p z#NQRGxoyL%(qm+_5JWJZ9H)UFJ*)8S;XZgA@rnT)<6Y~L>_0x~FtG2aDflw`qvgpF z<}&C9!Puk?qZ2W{UO{)1CE4e71f%J(@c)tSTK`7p_g~p<{FU(kx8H{SFX`G?8qqr& z8d}jB+gO^~xzJe|I;CoOa-`g>wb^g9)euK9fgu`V4QpT@&<{AH zd72t6gT=ujK*QS0?-Iyz!X9Aq40@3nW3j0qq7)_kX5;~cl{bp{I4CpAurUA&2(0T4 zn&vLUOk>ANNE4 zyx@~AV&86)pBRHz`w;(t7ybgd&k!NKkF(fMIFxTxi=#g=_spViU*_ArqXRbMa9%`r9<-Ek z2TPyE4x-{uGp}!AIO@b|M>hR3%~NcPW#Bszr_6D3DFZ zT89DPUOgQpw4uT;Pt)+Fhr$W8ZYC}sBU6n{45DSj#phdLrAeL4W{O0M$BGte#^_F) z-)+oK$>KmP1YI`D?0Z4|L`L2<66hOWW!`u4%gLMWZQ>?IhzFWp>{38U4`j4zItTkv zb@gYoaXL>sW+Dlbnir22ULv63kDAKLeg0TAm5EvcpYnS1{Q}fI#7kMg28w?3O~zNK zB%5-UJt|)jwCFoYBxZ7~IHtL z^)%vJRV_IX%!!#?R3YIP!f6>c8W2Mzm~BVsxdCX6o)%l50yGGwz%hGHZ!Ct&Ew_9~p92LT;;-W9PU! zP$pfRz@tOr<|8S=Uag5zLXO-?w+CO|SB)l=HA8ZXh`*Vk?@2GWiLj9czso50d-tnb zr(-Cc=$C7Tw&v6URSA9@v&Iy#u$ghmP!&eXy(I3`>%oAKuQkMVlC$vv9YaGx+e1W0 z*bI^iApu4a+m$o3tB~iPR~oPUiIka9;T~`f(?#|67&f8ZE?ojJdKSpLNUhj^Jk?|184s+`*?oSI7S+pU?ThnTbjRzRTcb7AJMbY= zzpQ2_b;|qsXzC&C6ir`0H&vlxaq8oNb|#W&9DQN{-NqM0)Uf}?T45Q)X>wo{JBFOc zAm5`V&I`*$Fo%u?CYoGHk}6$UP`7$@cv_zG{S6w3g|>h`B=BBMkEc>Mz-eS3I_72t zYiye5IOpZ^Ix<>593;A`j*o@C)ZA&i?Mz{Abwz_1>5%9M8#CTrbD8=R_%WKBfit-e z-pl3(etuFgXYfTmA^c>X(OOx=_XG(5FO;|+igT(O=0)aiZ6hVSh}yEMX^uXV-CJ!l z&e-2k&CXEra(J|^RL1dfPaY(aOkI00`^WR#!@}0syV(-hgw6{I5M;K04a@|#y03lu zL?cGPT&1gVHnfTlp4x7Kn!b;Xm}UIS2axsmeD@Bg!twHNh^$|-ahA#=le&4-t@Tr?YtwWdBL8T&GWiYXwKA z04YZj2OSB(EF0i;{b0Jo_Xs7{Jj%R(5xQQMD7*7>XDIQVCL?svnue!a)PY(7+8uzIO?0d_(#z4jqZ2ndI&EFcN62vp^KJ46+?R*Ck z)w1SAofR~r=(AjJi(T?v^@lvZG4TE4Ns~+%MPEEO-A)7m#2E(swo`B%KO-A}1|)nx z69=IU`PUt;;n#og@lYh^{7>0zm_C|)zK&IVKR?0mJbKHecVv|mald>t;df|!QP2<6 z&7~8ryjS4I12eUo*|t$Qi&lNzKIwbm=~VU=3(5;P%)YX3e%#+tzhcY3wi76T+5M+) zP;l;ZgW{)z?`YXqh7mx*7kt#xRHu=_Xnz)lYp3AHg_QS=me7#3IY=<9&j0Z848SBc?aDJ&TWmdtC>>dAAxbop9Lb zCGT9OBC_||mmi-%^k=l9WCEU-?-avbxU3-wh1?tainn);tjb_#4Ps|4{geUii&{g}qT@`Z4E!F!^9I zA0ByBG7NdOzaMXxo{f}eq;0r`b!A@#t==GqV1xRKjayiWN%JN(D@&g@&1tVKHNZY# zC!}?Ok_QJxIk3NC{{nS}%vTSh`c(x+Ym=Sao4T$R{8Yy<4)ZG*tLEgiqE4+F0Dv_Z?CTyx8nYs}iK zu{QV1Lr0NOg@7T4r%c)_1>cI)QEl&ss4(c^oT%}_xMgq5ezoPxSvD;jJQ)ok9#-6U z1}{=*4?9?vQ~Be0+fc|B0?$kKrIt~*m$_fy3nZNnrP?4nHB#)2Grfai;bqmn?i9gS z8$rh2f>1#E_Id zrC9GA4lKM&+Es{*2f;E zfb>BQaI_y!pta&F@?w7h-|jB8;ViN;;M^l&!fDFqK_?FS(rjw|wzoy!STvnz zJ}Bnj=Oa0Tf%051rvd~bwsU3^tEQI4PC;Mtfz~g3L;HxiQ^??;8?E$NQfxNZ>eXg> zd3JpiB|S&dL$<`f9JHGVML}(Vcsvhh&wN|cQ}K3;sxuD?8C_uwqb-U0UF*8Rze z<0#K0r3+QP6L!$Dok0){S6^|d$;>5ffBK3Ee#c-(;?hLBxZI8y&$gX=O6wzeX>W6& zZMd&~_Zm^*`9Kiog_QF?^z_{<0(-)Zr(v$k^>LeC{WSw;#)%K#*mMnRQJsM4sHbxG zz3vFQqo5ER?E7h>6J&0xgxN$j*Y5NInJc?8+4T{YLA>{Rkwz+v9C~ZFdz4_EJMs#^Kg?)u=3+jQeZY>(!@8 zIc*UJxHVvHE>!C`!p(C#o7|`zWBxF2E(Z1{Z~hhHK~1ni$FYeo03?K2rb>XGZmXWv z;fsMggYZCCfz5; z&fB$$sO?gDJq8!8S#pNGiA>;zBWro@zH8I9HY)g@r?j)>U{m)?S|=a-OPe1l2!?8} z94hA+c`-|1p>6w7KSnAP+=M&L9$7cir&Cpn$er|#WFW{wcrkb4Z*!T!<{~wo13?AB zZ-y!z-OFS9%TR&0?by_uWTvbtwk-r~wXTuw0M+pez^Sv9?zX%MJ*x~Y?m_ji=@Z8F z$p&K+K!H0+rMr%8Ej$+#Xa2Y*%?F+-ATnDFF09(U9DG3aJ;s$u)xfPa~YYC zy|Cjx7#P!)e&D_u3SQXHL3cPPhtm^5_L}G??lt}D)vpw#RKmo!x`ZYp8&mpMdUWm3 zY&N|pPya-!5g^#kz>9|Dfo|2u;N6L{kr8X&iZsIQBNq)>(_yADi%u9m^ObZiH`HbC( z1kR5}q;!wx_eSYiJtv(bGv(1MAxGsB8d!Vu$cd6q7=|o(uEJ^3t8vrvv~yjW-z}(b zlv_I&L*q@oVwVD37L9K3i@ft>KbGzFyHAUWpJO9-fGf(6vvBF`BYiYaS<`iGnWz3T z5|_m&`$3Fqw2<R6tDN-2HJIIFubQ5@a5dL5=QrwQBQZ^^ zP`dGo&gvz=NaL3%kgPB6^P zDp$9+YAAFZ=RL5~MYx60FKueG^rv>_ThO!bvr3WH%dm@ug8G9wC>FRmJz=wS2eVNd zBpjB;N@s_IZF#m+j=SZTPc#iLYhcyqLB=r>$tsRU;w+?PSNE_-pbI7!JDRrtK*lp3r|l4mST zxX0d<)XF+eeOJGbE2tcZq(mB1wiK|z67jV3w17W*zC8tn%I{*=&+068g;$uc`!4zj zj69poJu^Mvc6OwsGrFM7%~Y7_;2XJ49Gyl+2!gKe5Bii!;0jKk))36I{@52EzV6UJ zNV*i2?Ug??_+Pe{DA-sieNmG9gWt5|Up0pgKPg1`-p}v{i~Oi%Z>6`=Q9p|Q-#7!e z(!*3Eb5`^D#d4oWBXV!qT#q-z-w>akE~wwf5mYHZ;aZR0Rr!4`3;If|OrPM%H#cW~ z*W!Wti?P4HmgWv#c=%sN>bIZ{U*WwrFvO%^+_xB%`g`p~Qy<38`~E}XCw3;nydVMq z&%LLcQwvRDxqAY zA`3j$y-ZQet(@NN=2h9!t{YfkirwRjF-C6p9yCj4fIv3j4*Q_D3()i7V^dU|o;0CJ zXDt<)vJ+VhugYDWxNXu+8ezVEwL?D!gY#TI%*`s%Uu#o|4e{3H*tl`lcYxUXu{v%|FX)_i0zXV;| zehkChQSh+2haH{JTnKpWs( z0v<|Yk$9%6l3sO_Ww}*sn^3-Ik_?$k44qs8YTF9)keLSNlKnImEzE0Z4HP5Z))MW6 z5qSnwq*B;I{j_6_I8Z#y&<9z|2F0@BoukE{MZXKMdc~s3q8&hym4WNsDg|!iZH$*z z(JPzMPr?Ncgt;+zbZ5)@z9=R^;ad}u)%l$0-5E;V@XVcfewCF^W#$chp8wv0a7C93VDaEK zYT(KZL?`e*GU@wIsGSQFRcY$4C1m}tggDjz%a!|As9jY_M#9v_;lD1OYvP97pa4qP zkKy0ubhn8b? zIuA8R;D`iOnf;cGGndMudaAk0Sgeyx)rQL^YHg71=dP(b+6arly+n#&soL`f+3@D~ zZ=anRyezD0m}Z)yv96jv&s8!Ovkf}98JJt4T+s>AGVrXk8wWnu$g5qbGmnFDyQ1NK znA5WQ?s0j9`x$l{+)E%{kB84|bBLh%Anhv^{3JIr&Z|Vqj=X8r7t8}Lh$BTQx&lM0 z0S21El#o=Nm{P4*ZQ1VfP=d-LOjA_@4;7-+zm+|IbJU z!~d>0B~uqeOB)3zOJh?ROJ|q=3o~QYExnOdQT)htuU(w7n+pNKXu#MP)7VBpT^*#g z=cPgyqcmPDohX4d&rO12KYHuiZ@NI;Rg|ny-T7Z9e)jzl=5k477s+_|Jo7TS&GmPj z&FEo2nx4faDm1KpS3F#$U&A{n5(u| z$C2_w!m45_Ge=uh53#nC!26eJ#Tz3C!^}B%2M8bCo}WG$7Y7HQ^>~L?Bq%o&g^9*d zBOGH0s0?IjaA8iEC?~F)h+u7`qPp1;v<=BX#i8FJjZJxk?yJVF-Es|KA!a118=$ry4hvOVX%0gChVnfn!hU-iMQ2I~=r?`F$qEx_rQ81RvL$PPmZu|g3LA|LvB!*sC<0l4!-5hxxTRdUtd04<=}&`Q)PTFL0> zttOFzH-hhqOp#$tE#B$u)EB{7YNTno0Xijv06>m>R9QSYef=x3TEs}JXjXc^BY_+X zGWDbtD4(Udx5QHbrc9aANuZK)9ZQd{HAktTr9{G%*{MDP6LE@bFjhd&9kwYo+Jqrj zg67<9xoC;&7mi`}^=W<0rqGZmS0z}QGHQdbnOS&-<94kZFd^kJpGta(!V#@%DE^!& zgiJ}=ELSvj%DKF)6lY2(LvqQyjhuY6iq633yCmHfRLNL{pc5u#M40tT6OXI0s1oC7 zR<25}%f1efr)$oUofaQyMZ$oV<09Gf1gsvO!DI}?mS|l->A`8&RJYv)km zu?0)>R5dluwHB^K96iId;sw?Z1#N}{jhfV|-3fgjC0k)o64feKqI(6;f z9Us=$MMBS6H__+W6-~sYjJ&$8vxWP96@75CTr4NadgH-SG?Dj}nv(%;y0tGIw4l>PjCY4I{&Lh}*YapAOb}Q3@OCWFMbPWv$CBottS?Eu#Q+ z$*-II{Iv7)W9OH9!*za8K7LTd3al`1F~|MVj__Lb@`Cuj;4ysJIXrW}2_rwp95lm1 z2iaXTk@<->;srg{iT%y{n6uy_4-fj%$mCt~@p;ito;6RJCU3@6>S_ z2*WI|A83$G3oq(_!uELh9x z7$2Z}<(Ui#maHo@jvEH%A%h)KOlfqYT%jQZ%?3#btcw(7Z`5RetMPg~v5MU|IWa)V zz?MnCIS-Uf!1j&!(t?I6_c9i5C&PPpx57qbZZQ?^>J6q(D44CAf(bNe(D=|WdKZ@j z4pJrnm^Vs4$vzUZtm8;zFHdRzrubp(%A=A=NwqlqtsJaoG4skSPDO!r9Ab%gX&Qt| z#gbYyI1%X(A+fzeg3)3(u1s!D+aH*9Mulw}lmQt9ckp@U#xah{nn(?~!nuTMAq1Ka z4=rGdOO?iyGLsoS%`Uc%%RGF|C@Vv8&6;%n=|0lP6;@K|*%GT!Ma82k%ij9*KoH6&$mv%`zqeWh0JngJ(TX>9hvU z(qtI_AL4_7-xcu2rIv3)dC;@WMp`=T`C-0TW(x*M>%kzggnSN>Q}Z9$KCah|-2_4Y zZLPfttlLU4?UVC=WVCmwrjBCa-IK#fFOruvc;~uULzp3KWR8P^hH#1aON^7hHes9; z8S<1O77Jg#9A2S&x{2Z?8A)NGQM7&pp8T#LeRt5lRnW zXYCV9{c;@-QD?3%7vjIQjJR5w8g5pzsMv;2g%_qYnEWt#!Q!>3ZLw6PBDqS%N`#cd zo~UvfwTXC&0!`#o3jR-JUjdX?(zJ^QcL|!{PH=a3cMb0D?(PH+5InfMySr;}cL^SH zU-sYKu=&1!@4Zb?bqeY{GiRh{rlZ)Qgc~YrvFkc_6F+Hveo!t{5wf#pIojU8NuT1BVCxfNI(* zc$4O`P^&rDdfGm!Wy*H!=Z^dIz*J{_Ew-k`tcdvs*{Lw9&vt$SUQtNTNNU50JPHQO z(&TkZ=vF5^*z~^s?Q5VP=sRs(GQNDY4hNwHB!6Az52pypUk!E5yp$uCMu2$Yok$2- zvJqG6L=2i}z91lrp~VBEq4C>~{xrGqUY3~1LnOxB#u=|;RW1C{7jLT|ShAn#fotK% zn~F#CN(7W9Lc7E%OQIa?{6b3BQa^&HP>recxvL90j=2p>E;ZsA(yuJ_W02O&`lC%l zS5IoV2d!-?88^d}<3nPdBmJQjj%Us@9$Z79+HYc2zR{hwt${fFMCJ^*ogCe>p$zVP z-yYUz>&XVQ68Yiq3E^e)&a5JJ7YguH>;-75Uyd@rt1*OEYK%|c{6&jJD*fTS=5 zli}zpPq>_5)nJ!nz~UF8l3!{#t5z%?b#h&&p{FgBZ|4qC5W$3 zuH&^NixFL9DC`eNdbr57R)QG{^ZDhQVRoY0ksl3lYn|LiI+0?hVGE`tIp7Zo-h4h7 zUd%1%Zpf#~7Q72xHnr=VXk-esW7>^(jSEa;t%@rA+N|qhq}=A}P70|^ETl@YH|X&k zl#%Pt)*MluxBVjFAY^X zsW(TR1Vz8YducE@J&TG2C@qm(%Tydq_NUow1PLo=3d(pMOKfg+6+qO7eDgdEl8hEs ztP0eK3Hm#-U>2(q?gpw6)f{qx?<+%5^l|2fv~CVAj{Q<)kwgmOH(wNw(AB6qcQTR( zHVY--q;N&@`DR6zx)P09_Pzmo({w9OhiA{S`>yiF4srC^n7Yrce5m`-T6}S~i9mxX zL*Hn-=eK=a#pSav5&aXK!vRIZHS&0AU~S&7vHme!1TWnCoe*$Bx1WTyNm0QGuy=6H z7euFwd6*`VvMLkUXfeC9nW+Q=bxmdFI+C$mmy#hW?GKe5&t3PRFY~UtDUyr>VCk^@ zhrj6Whi1BeKQs$i8yOiI^4l5en$y_WSp&=-4yK0olvGmGMKhGtLzSass`m}!gic^PR#NlQUI zsD+{lfe$tf-kX{h7B=tTRVgeLwZnx_jSJcVW@lX~QsVG2##E z%1(d85f+ZHjQ}KuQs7riMUDfU8txl}*#fDE;{+h}D~X7Wp}PfB7uDTMYuk?z+|M3c zGd`Tzd%JjzKWfj9V(+zr5}lOL%>hAz0cHLGJtqN{03slvA@>3zAjgMF2pSkLryLp{ z8p19xB{O};z^!X)WnpAyzcfDE_w6yaFvXpylY=$@i?6n;pQK+l?y0LFi<5@e1`hUn z-b4vaI*T0tK7s6#IAlDH_>)e(YEgS=Tv=UQSpzZgH7A?HTFzJFf>MK$ucf)xxzQ^u zgpskEZ-2@{Cma_Cz!A!M3?h+i+Hh&j+ye7W$rd~zT#5<_8IbkCqCD_~-%`FOhSdZn z`xrytK?)8c;p>tPWa0e=B$Eg1i5&4=vJS7TsH)&~M_ZOQ@;az*r^nMrU|_H3A6Ca+ z@79x$eQ@Tg5##$@VaS68zHd!K2Pj1`a2VhOb9W|F91=k zG+mn1XxqL?iTuz_ys1vN65LJ9$f6wJXHpS;=;jj@k!(gMR1S4p;#A!7B%B9?TF;Xc zQV@c*UZ5maj=G}s7VL5IWG78klKC*+_NT(qUJw0r*whi-LWf`6o=%d)_R47$TdwUq zXZd?!ZH)zushoh2=)A6zE5h!|*6X4oV0f=pVl>1>BQs)dR@-&E&uqHyE6rIt#w+C% z$LjhCyli8LD}T(i5}w41?Uq!_mUdNyJFn5&n;y%`e~-JlAv~!uU`wc4T@F;Ld-oO3 zW)~y0jF@lAS8Zp5Ks^E03BGb%pt$x{O74gfs*?CWPP8e*%Fb^N$oOzZw&I;KIe`}F^}VOhRK&C_Ytp`(QT&Kg zw-kcG7H)qCs#SH!NSzBPY3;HjNeXQQH(wcRB3DMJQ|U~g+mPd7LRN-nbS~JTyg3#J zo3AhZ^r`FtN0w=(Et~sZk}9?Ot099nQueG3_rBgI3OGg|(Lv46C$vrwJWOY1T4A5m zxg8j)FCfF3v%ed8E~e)l4W?xu+*cDKytP7OF))SQZ#kifw46AHyz%G+y*u@Td=t!0 z`Q>fHr4JDJ+^8}oAMD5}zs8zVddQe&6IRKm(~;2{T$@}~>7scPuI7?q)l`9S4x-1i z7(0WF<{%x_PWaFi9V_`@kmUX)77`n37(ZKA_3JExXbGlgiX|Yg4}O#kc>2?bAtezw zzGTLs<&YoFdd@0%C(vV1-kA508*|7V%e_XawNU|`_m5`58oN#3Nvk2n z!WzS*Qc)OybnE)s=2|2lZh60^S|l7O^<%XMMV$K()svRS&OelY3zJu$ptoi5*ykEC zY5nq9xT~QL8IU*O^8@~>@tlFO@ZK7TKydc5O5~ezjFuMDZ)|}dyR|KRy_*clj3k76q@$>;aY}y%z*K(`dzfK5X?1CZA^VU4XFVlyjrtS z)U9&Sr=x=(dNTzwUvt`eL%*H&wG?gv!@SWD)2v^*dFW_M!>rPCxmDe{6M$eIX;Gh~ zXxfT0T@~zh!J;WLA~W2dyDFn_fDQs9w|M}mmcScHON6)2Sla@2J+^!Y-AzT_J2a%L zbmLeFUvswj#TRS@hFth@hu1Ua6QPC~q4m(^Jq5dl8QQXjONTr$p4)r5o&KWxNP=yO z1X;|b%TMJ=T3j^Sy$kAVOm&x@wWLMF0|SgY+2_sWEe-AMb&UbhtpfZ~e?I=tO^xHMvoneaBG5TfRcWkdjG=y$T9Z^P zKR-VRd?zHRw1q_sK3#6QH09Cxf%HncD~^_ z?W>FQ_4N;rUwD3k_;5a@`HD5f2SK^8f=B0mMBkwALJJT|%f%C*TY| z=j?)k{6NqWa8BPv30Y3i5_Hbqg$-#<&=Ppg+{FQTM$i&`&fWC}@*ROkz&TwPDdZOd zkDzn5E(}N=0*}CRrY;u9H3E;|bFMA~@;f?k9%3NNweT8@K&bt8JHySQ+K*_O!=EW7 z6Uxmv*b{xCkoxVjx1dDf;dI1#H73jV!5qd83L4(B(=xWW(MBzlL7n-TvaW&eeWU>P zEOr`wo;Qh$gGYCuMF;bW@nNX;VvzN1o14+iwHUs75>2SB`r+0+8(X%WkXmSpminGa zq!dZ1xb5g+9@kph6mPE}yU-|YV0IYd%xpGZ(OojSFf-eK+Dlf3w=Z6)c*J(iVzQxpu5ub?3guj-?c)4+GtF=+mXYXq|1F_ub6dWda-_SuIW))BP_sjby~(}7 ztN4iPIITLFH&Ig77~?F|AMCQR1sOPLaQ)|UXV9Z1NJ(gD)_Nu}y)W{pQjUF!*vpD> zWV9t@b*l2@t2LdoIjMu!s?_8`?5e{%tGIgAG!t*HO-Uhh?3L3K6X^_Ri>|4d2RK&Q zPs}K1#6P2cc2tt`j((UJVb$#g&1(c)>Go4~Td1)`n6KjHd0I@_k?D{#IaMePy^Y=1 z8qTJ!{n#iibl~rJm|Y@HJfSO^;~+inA@jw2Za6KNMnS>0)}3(z-8<-KJ3+YH1V_Pn zSd~OyT!lsu}5WgDMDOh+UosK9i_-seu7WJaFc$A^SfOS2uu1Ooe1 z`d#u>mJ()mCWW8dhF|&0L%j0N){8=04j4Br^($FtO*~E0dwEsTMA1q!^{_T2cM};` zq^(zI7*4beQA%k)cPHkKr0Fg#gX7vAPHn}O4P(seN7ZNor7F`kY+KBi#L&>6Oityc z&+8PiMJkYpnbH&~H>SVIi!RAAu>z-%oaU0lAH4KDc9GHoC=UoN7l+=ST&v~xo~eNq z2WZE3S<+ueQ>S&aTvq`1uPI~nc>SDw83lqe1u{Qng}*1B7@ZLC0Wrs{0$XIwPs&Roh99cj zR^2S%PUKFk5#^EKkq|b(9cE9Ijs;ExPNa$bPKB-7B*a{0p?83^h;xSDtZV=?tejXf z@P3#%Q5&hZDxH|L%HNPw;>!R{;wse-0(aG$suC1TJxn7^#Kr!qFNUoHz={4;*n*c- zu8ENZ;E5cn%%M1XY&}(K+tP{6s&yeaMrE&Sscx%}5!uErfrh1HQK(2&okAn3BC3wj*&1D#Z$ePjq$`inF!k9+>51%uc3_7q z2GkO(sU8LU)cVwJ!Z`;nWecx4N=!ZF&p*6a1U}LzUGsng0hI%SME`dM&GP@Ppmhwb ze$&x%25N*X+kU2fC56mF&`?lNtYCz&td*5~K|L`6X)^z+q=o-eN#i`NKq%PIfqps{ z#ln;7#_1vs7>10-=ZrcB18D0PCG84^ofVLYGz19)i3av&gQAPTFI-mW9MK~HtBWZB z2wyM+@eoo1avmvzzroiAWy3VU7%@Z01%AUd00U85&;@G4FhB)STgU}&!!dvb@tdFv z%!XxvGvYTP7laMZ00cyC!8^ze{Qwz6ZlOEa4f}u(h;4#*&>Q9f)`)FFckmnT0q>^H z^|8FfftK1ZOg})QOgP_PZUaafhnf@XW4>gx7oF^zfT)Y$j)z7Ozh~pLqXVV}Z_h=U zXv@s$vNQR4KCsluYSv8B0&29b`6ey!0PMPKk?Bz0FJNi`;l)%;r7$(wAQXskI*l{^_Ip)YjqvAdZ83F(<;LQ!Xv zWJUu}A0qskMg>DlA{E3ztF4L;=UYYZ4VOMPmO!<{Wm_zTAM%$P2&oIT6-g9!)ehKo zuk3r+lzeof{t)so3$ixXlv~CjC$zfG`M~KK6&Gu|WN1cWW8v29QfB2Ei?aGYb;tJL zEh9-@or@+rovrN-Nz};0@P|Cpsvkwi4P|zmuGDY?(1p&_V-OjzPgC9|OD=9gy+l3NF9j7bQu%#BxE&P3Ay1e?DV&>qZoyx zln@7{wgMXa+#QgKny}9NYOPBCrhys}i6kd&@5;>?=~N=ah61b|R0Q#NYUZ6Q(2B`f z?%9HIJC6$&hfS&%=1fiJ`(dGCt9AGfj90p=!^>Cq6zR<7e8Kl!q2%P+lkpY6_89Yo z{i8DMx`K~cy-N>ZQrl*4vw!xHKa}TU^kJ|k#3|-KrhAPmlzz^Da?8JY1`gE$mYgRT z5w}-P)$sD?@S-b)#MoTl#uH^At~a<{^V`;>cZ5;jjpHiZ)Rd4hkM#ndf)$NH9-ys3 zs)4Rya6rrjXUA-Ul>LY+koX?E-=W%}x`&U8ii^rt@q@$%3E|x6yy!eB1Fm7WM5kD< zM6X2nSU4(dHFhE9N(-X{P1? zt5oi)bK$Vn5f#_r$A$n+&1b+f3=GiFY>7C-B(a>s=~SPE;Hz*9776SyhF7UT34&GO zD=p9(gLkwO`C_}Ng4OCmSNiRE!jaj!?BWeY4dQoz0ouA>70+N1-!5&36`-x@66q4P z2uKsh`>bL?hQ$)O2)3xcss;&3SEm_aBC&Pb1sRqPfDMBUbH@g&;?bac2XkP3L4AUG z(bI^L7+V4WJze#$dYb&d=;^;LpMr))rdFmeOfY}?hQ>r*%E};(Gu}DNy?hI$${Rwu{PU$S5+k!q z7X|-h)fPnKUgr41srQvYDfaln1uDimHlzj$v}8wP9;`PG?~~99^;ulY-kS~As2np? z(8VPnMR$=+GoNi3c^Tf^Ap#ZxN=Xuz^inRu+8<%$cn8BeG|^ollniKgyCKuuSvQ3Ghgh{#TDQqJQrqJxAj|z0l+(6j1mOpV{#j4b&im0+K>HjkT*bQ9^h4 zuJZ$l6^pK!#exj!j;)AMCcfka^O`1zAUu-|XAm_A&QaV>a4oOR>)bkwkL&2PgQ|At zhr%jPHH7(vDrrvdHieq5Ozh_SYLLK|*| zaySlVsYbBp%rHsg4BB26L%fY`D&f)^AtdG|lE%*MTkpb!HJ+oTMQLWKw_{j7YBYp9 zg5FY%=y!HyGheCB8HLi`*6&|^`<8KxsJu3m?+|TJoH-^4(_gmqp(Sy(%x2rDv&)l{ z_I#p?kh88LYZPT0YFZo*!ZIuO2mg3FEeiUg70y6D7R-sqp&f{fmQ#b3mkaKE{n~z` zoq{~h9Aq_;u67C}$U!aSY{7{pB;1Ev5lasvu<2Mc2QL0H7rHMD3PbNQpi(|Agqe6P zoP^}}u(uCJcu8>XU~1}p*=c`kbT1UA{brdh$|PWcbci%_d_qUv+8At)Rj9l0LrB77 z$QL^FpS{VDOo_q~R1A8@pLT}Gk@3Cmail@hq+?+(c97b9@7}i$p|y3oIQuCwuLcj! zk}Q7LwOt%SNRCix5Q&lrq)^E&ifHPvewp~D%dP%kfDyI&uMVnI|30ezn)r&ke~m81 zMR^oHRIcfRr!S6{Xfr-N#q0Z^zfx+CblS!QhI-n)M;&&c?|N`vmdf%H=w+!yeGu zN_V^Bj-ri$!(k-c#RUzsFWKaQtJq3W&ojYNE`-2?=FqK7*rL=kuFTm&>SOgWNz&G! z^+*iYLjym9d5E4J_q8iTfzQYXH`yVV)B zNy?PU8CsDFvZ4PTfKR`HI#8sIO0S}DES-;4WY!jw@V@EOcR4ciQLj;0ftq!y^K4%* zH#nSbTToJ)DPDvq28Wpx7TQp9IA_?EUal~$Fs1sQJX%ucD;C z%^NNI42<3YeThnZI8NTg>sy=%S3K{}wI0Z$ACjt84#SnmU}yOKGVT)J^us&$W1%|Q;&RWe@%~L5rd3r zC^}0@M4km_x=S^M2sTvOShh7N{^j)Xv_ZjTIHu&LFpDPZ)TO0?!a}U{=7xv*QaLQG^h&;@~*E!sj^+}rWtm8q(M;aEkka0s>g&8dq5 z?Vpkx4hb^JE?h}QS7^7!{+T9aU#2yeJF_Sk7vM%sCv1WQ1}%QTf-Pc!VSQp;kuaAp zFqAnw<-k(#i)B`*pJ-B6CB5FV2}x8&p8YU<1ST5rk63zj z=LzQFAVPm08{3MAn~j0k0TrB&F41KXOHQ=M@3n>Zf_d5@L`mZ@RcD6wAAD3>9%0~- zM~#M9TQIkcwwSmQuYdf(lA@0QhlT~1Z#jSk_t&B5clQK<3l@;|3(4AFE>`JEme$M6 zh|gs@wz3-apag?bo6Lh$)}={?zO~&8su|@9GOopz?^Y7)>Y87%qOpsT7ulP3#& z?s`LxpQ}b|GO4K->*RxxP%-hgmA2$&ah-yHLvtQZfieqS79{{l5;>bs9j(TDFu=f` zy<7<#>kCQ;Sw&suFp%9qo(WY~NxDSmhMJYc_L z*C<)pEn2H)fQ%t&v@j5Gc~;FcU%DYWg_`jVI;1G*ep)eWM*c9b`~;^_8JwZmXHKD} z2Tm#Ey15Igl!_R$f?DnrNlc?2Bz)|QwMcMv=-gt5PiQ!;BClf;C`y{A6N!RRl3R2E z`eTv_6_SsoDl~gv^(DE&V2R~hF1D7<1(&FwUkgu!vFa<&_IcfgQX-q^5mT%`L{udNsSynnpt{op);+@ib7l0zn@EtPE|X%{=) z;GNO`;iu&S$X9i?7Q4buZ}l3QomDsC_wxqEhs)#fr~;8?Q$pWNjz}hx$znG+b7AuA z;;VFp_##K0yTeRu+LwY{c?W~>Q|8X%LqDS_!AA6x(JPnh6h-Lf768&X@hNr+`pp#_T z-goG8(5fZ;9BkV`QLtelNq;2sBTJF_6`f-HGHgjU1{yexc{<6ANh|(P%>Y^YLX3m> zS(hI%)^BS+@#uUDXWrizhwwBqF-py!6kd`_;b$rZtv92M{=pT(H%adMoiO<4tP3r+ zLPAw*zyH_^3XEs zzNeMlpYCg2dRcq3WT&!ZeHj?s@xGQC%0}(80SkIG2o?c_;X7p%dXTbmeI_%+)Utf1o1B2KW?$A zb=CJ)y^V7Rw+Kx<HV?@_t}dt z&jA!d66F6)AsE`(S=-qFtko~xN_h&FFR?<;r#iL_)E0;uT91Zcq!zhZe}oDxzk~`M z8VsjxH)LJ6pKUh`GcWL~y|0UJ-rK<=Uo?#qL^?OtUB*4Ax;$5J^}VXD4u|4dYxCEL z8+t!Lf|1DU{-%noW^yV=V#A+~wgU%|J(qg-AmhAj3SPa6c#u7_Q)MJOzEorJ*g=7R z6g4+bSD63Xj^>)U<#y2bCK3_oWZwvE^EY*GMH7ei=kQCKA}67(YPy2zmr=*2tD&wF zl+h~gd?g=z^Df)cp(k%W!`!20$V%wy z5UNY%7DQ82?>ploYyCU!}i2dztBC|U*ZdqwmJp& zc|fZG=(f<9MW>#ClVJ@si25Pcaok4fJC%H>A{@#Ro`x^^bg?<{hG!zP5~Wzc4lOp^ zod{=w%Pmp%$cPXRLiWo#5zul8?cge%Fnp*(unVlsZaqr zKzdIuKD{kiIdOnFNib2lC8IZkJ;L`W>)6or8iIYQ+NA~dmQ(JqiDW07{8VdL$2y>@ zry#Ln0-;*9H7&E?2QZHXh(I!Ti|p>x(82n|h4&FTJGE=gz7v2OkD4)d?^g9`d~hK5$J_K6xYfPLaK z1hhutj}R{l0$xUP@#|jLlLjkOXO?CK5bs`|j$$JD2$DY1cTaMC z49ioQGy7Kb3>+%(Mbl%+LAJP9GzSe4 zlx713CnfMGY;XX_F&n0+7I>I>M$LH}e|$W2Q2Z5A;-DV!6l>e!F0EyXfezafQ;5|) z;BshkzZm>Q-kDs5%3Xh-vl7-UBH1t0+gF4QpHhx>Vk(8oiQc*i;KP*m431okEGEIO zGDIB>umz1pJRDQFny)a&2o817O21_dw}uNUgyTc35wX~T%m#1xyMXaS)_+sLN%oL(Y1q(7MrM@I`+j1 zm0r>v+fXjv6%GahosQqpveM+9-askLk`lF3SxB@P=OJ;sZXr>*6TjxYY}W3h_Ipe> ztQ|C((*D#u%cBRz>p>aEQSOrR!zJrgmyvGg;uX?~iApIm$w_-+=M@{Zhi*OUXcZob(M9U@7B!D39DeVL#qs)ZF5C{>x&&+F0p^U!-49zt#6TnL&~??2*2bU<2qiq^na{TG&r1?hnkas(Z}#FMsd78BglAr z7tq-nvW;qVFwZ;whmqPQPVdeSFs_aNL2mi`ehdY$AN$+b@tW^&?N7c#l{7yRUz5!; zcRnR`C~@*nB+8TcE{ zzQZK|-ywjEBXAO}zF!m@?GL`g?y~DC6A?c2m5g{1g70(hIOy*RoHVKYwBKNzor_fz)+g{*W>j6C2UZfPgP#d(a_G7 z-&GnAZT&w6n^xrm6%-ZJpIl<}0`$^x-ItR;u-5}@0?P73Y4!ClW?z*DaMm)kWY$57P5^w=8 zA99iEI)d$tH+{>wW0K!lQF9WpR1V+shTd&uvo-ZZ)&C-&Kp+mkLWqIU7+XNdViX@j z=Tpiqqk&>%&t7j-GxTPY*>&G7N21X+3HWkJ#8UrfaagAQQv)hO_EHY$ck6{|-M2dp zOarnS!lhq{GVB@C4IEp^D8Ji%6&Q_qT-M)#H5HCd$vVGwnP)Y%zQv5AF`;7OXJtmn zbx|&;BiEL1^Sk9-@}7>z*f72X?O5Z@|r<>vH7yK*YeM z7CM1~8c{@@)r}H0qWYjBcW4^mz^nv-S0LtZon|vxOZ~Mhp}BjFVJQc+K^H%dxG&jO z!Kn@7ytSaSG+Yjxej5U)!(1wr8t0^amdGK|n zAOmX5_&b(g2b2M^h1b|Eo~S6W3d10X*{4BN4P`*c zXH~vtGm=&;f=TWihB;cXPwJ>0;b?`^;i-d&Zk*#H9T#+=c~x z2|YQ~V*Jd{MmjVSP)w2GLP89roOb4%$mWzPPc%5Qe<;2)mWf7Go`;9Nuj>5Gy|mK6w`^_~hO? z+Hy#Eg{7;q!-cDC<~2}J!{NR&oO7?BE-7bsf>Vy zSxfpPqf)_&FS5<4tSxZ&L2=p{^;W^Q<4ZwqFQU;$Q0eT?G;1Vdlf7;UN90c$RQ z`2ok*>4xPzc|nI!=nM$7bid9TzK!;<{P}E>gC==CvPVabMco zJm1hps!%}C;_>m2&V~w9cet$>?sFskZ1fzUyK*B z>C_thq1g!oSFEa+TtK=%W3f`$>UvRvTW^81M?8%(4Xtf9@G(B?QHG5&&+`;=y6)`* zR=6e=9*#|t?zWECX;U3GOQ}oV*kVHvQ;9@%maYQ&{BlXM53HCgpV)1KyW%?kxO)^$ z1kML2&*5CqG+qs%{z@$~J>#6WLCm_w$G0n5^qhw-G6aieQ~1wiCa5hzS(e8;ri}K3 zTB(XrFmb)qO$Nt)IeGa?uMsLePOwIRSpCvqzO194J>0oE%QFH3Ofyy|nP(R0 zHPhq9r)EhR?#3}R9>ohj+QvhJ@(GQ!%?J;fLsY8Xwhq!rozxDf?Pw&UYY<%GnrII) zCb0qaXS1W0_QZGQ>E%~C#l`ochalTm&-XLNU}IwFjr4w#vY11pV4(D;9Q~3-5$6bk zL$dQzdvCb~mZL@{)_7c?ExEXqgaPYzKn|`B;I6;2mcij9jR5O}CWll@*c#I_o-OOM z{z8YjgE-y)uymLqYy9j5?Al=e^!z& zi3?hM6fj)L&mTXNO}hy6HReO~M_B~dJsvram6J$i(q2>q7hSC0rnhq}8&7X3QHVr; zESWeoX?b@VDU#U`6(}Cn*IqX6FSE6^|AV6`pxMW85rQ2Gp^uP=(w$M8H3=8lZX8d| z#2&!cjqHGAIQRoBvkSMZ#H3<)hhEbQwpMJwz}ouDil+9+9f&+Sq#>@tN_7cqP2dH; z{cf14vn12f2B{KW{ikJr8^bNSU1qFF)dk5a$4pgdr1t8Mv@+uCyC4I#b`^GfeXtTR zC|KcqP?uL_{NqXMUGASZ#s_UOnq>9h<)6qelM{8xOyxK_@lroPRoU zbAyc7_s-$;83B#-X+uh=#i-o@Ol)*B=tfU$ffR(Z(SEYvB5`CNHbUb~=%lN%tM+7x z+adQ|&RO;qRYJsx}v23Tjdur_85v z4)?O1(5)!}t71hf04#3;2==B??hGL*`u?`IB^LRSFmX8Llr0VKAD*`!F^L5-+=@u` zAF7#JdK3=@3rbOxMFIY}ZuF1rrBx!*Op+E_`28fQd{cO$#mSTt{B!Fn39aaLDc4@} z?aFdhC%4o93l?SV;dFC_6ck04ej)dxL#+p_n*(C)!l(t*I$f%O+I?1}4u(k@q z_%u=$a0h|Pwh(mANhiDH33Unu5=canzP#JjVgPJ4RjeP!7eRCr53+;6lf&dp!t@Fl z+7vnd_O#(s;IM2+PfaohXk}}_8svvj!+(BJX9ipuPR*FF?mV}eiR+dkT#9baDi@AO zQe)TP>^r$6^q$!f0|LVhN*%Q^_H;b~%ztM7k(3^*}#RLaG+ zUz7YW>K#K6W(_+F2&n(EKF!jla#BvsIirX7)qzwai8Dpw{DN9>%G-KQnWv%t%xMp% z_1Lg)j)<6PFvC9@Y6F=s%AK3$A~$}H&2~i2zSZ=YLU>v8n`)wIl>iO{p8%Te*EQ4c zYd(Mr3`j~yk?)T@KT>?sV!}cSiZoKfd5XjGTeOHRUnzdZysOZ%8G*wls{*$Wby+Q_ zq?g_vh%;l{y|^9lZ9v8`w!GPmb6Z;FVrT-UW^lmaBw#bWc5y(?fPE7Rvgb#BZpMiP zALOq=X2a>$6yiU4Vn|e^;SftJv@MPs%9x7puc#0QQl7WPHdV|I&oa;khSHZUvg2V` zlHisCbde?RZGc8AERC40{gI^B;A}RqvAWfJQb4VWzml0)2a7@vY_$kB6jqE{v9V(- z`!FulNz?;j7|(4iuew7oa7H=T0Bh%5S{aOAYzAkSSL$uj@pnJyIy-*laL~5HqcXmq zdEoMT4kU#><#<12Q~l<&f0jck0DG+X1tFNhN^Z9tQ04 zWF>$>P=S7>bz*GeCVU|?f&$D@Iv{|R>mTyhocxRI?G^Ksf{C?_jj5HffUcc`7{K`T zKcc`^1eBrqIT0SfT|M6crgDgp3R3~1B8O@H=(n6M50 z_I9#=xr%v>^)kb*PJu@-0ou?D5FGjv@A^v$0ig>2QelBtyc+y3QKWzL%J1+ZizHvp z0acve?q^sf-)Kk@k>)L02&taAJ7(nZ~40w{a1n8fteCOd`abKzOUvzh`(O<^P zYiIX1OJ=$`0tbi zzr(){MgyqIS8@n||9fEklOf=Dkk-fJ$vHf1cYgb>EU+{n@Dy;wC z68;Xu_`Q(V&Z;k7!@p$a-G3JHcia5#L;O4JYi~uOUzmU=XZ(MK{oC*Lcf{AeSTA0V zzhso~UlISq=kYc2%Rqna)bZlW^-K6jf&b~*_4})@FWUe4syrny&_8@YUcdS>#$VrM z{!?4sQ~%5N{B|$@8ujH{USDgy9OHh;B<-uA{p(irHNYRb>XrTRpE?DH;XkYON>}~Y zyRhHUU)yi~xh<$+`%m=0N85i|G=B$veX#wfx|!nq1^nkh_V<@xpTGXuXvn<3UVe2F q{vF`;mj30K_Dc%*fdA{EO;!RNuvG;DA_4r|!vFy#3II0WK>r71Lg>B# diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/jaxrpc-coffee-distributor.war b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/jaxrpc-coffee-distributor.war deleted file mode 100644 index bf62d3cbf33fb8e8455c39db354fa0517af92ad4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20802 zcmbTdb8xKfw=EjmSaGuAWW~0V72CFLJL%ZAZQHh1Y}@u--*4Bsd)KXVzjNz$S9f(+ z|MOOlcZ@loF~^jX1O-C_g8KVhP%x$g`X3MKzn@h_1Zl)&e$yFR={q_aJJK22TGKf? z+t3*r&TK7sY;>I2CNW!;j;fG^TCe=`pWwFCSp`ApwLRtky=gqyx=x zT#OeQW@;-9wKK8Eb3yl^c}`3ZIo`GhA)qy=(gAjM!+H+^C&7JaaRl}d-q_qI4){R= zP68t)=h0h@Bi`fMY#8uguEf%pz%iWmriUg}RcxA*IZ6uQk~k4oYZhRVBpsFYD)&Z1 z+pIz@&la3{tO&_`{LoE;oJ`}%e!s^$+HD(mLF-~KcO-9!ruvn^tT4AT}M6Z zU7gV*yAX1~z9>@PHjzaGdHX;XLx821a=+(|u!>|V-HSLpM62YeXUoLK#iXA>FW?=< zoET&XP)y>NjMsS51sr2cXEzhD;95*3^~j{4D`1naXLa_Su#(udi6o<#3ocMP)5Fi9 zyOX2;zGa8wKlK+t&-2onIC=T;*}>FaRdwmz8mCmH=@enb6kL)m2dI zPP87yBj6)UllTgu@?4L4vyU+Fc890Eg;&UUoRhn?MdolvYGrO36`C2?L7kK0`-fDTY@Xt=5bvA~THphg7PXUg=u4;cHB_@pDzS(~$emOvOHJz~O3c z%4c3Js0O2y_)Pl`!!gmjv}aKeX%Bu-IINS|L_VH|VvQg(Kq_hWnxa;I4-p};l(Sd!)e;}n1JPN_ZnE&MTFTFu~~Hfhn!9ff{jdLlONw+ z$C>K9JzIQ0Vk@XW_0mK|dSS}BRX*E>3#JXDL<0vnL*N4@<802Z7zFB9+sVWpE0IZ& z$o}B{8h@~uB`;;x{4Bf69R(Q39OPM^9~BDK4yK|yGB-Faz_;Qu(ehaELHwHe6I_Db z?l{mGiYpvYZn7yJZ7Pxe>#_1Sb-r3UNfRN1sJT|Um#eb;U=HExT&2+B6!@<&v7~ zen!LMtIO#D;d{`fe3fF~B;r=j1ekg#a05gw8uFC`Y5O1G^vg93_5T9r1M+WNr22Q@ zg!P?_|0i-$O6v}&qDVZJm(u6pu&*E*SatygmDGVy4D50KK`X!$b%c8Qa>_bO^BU?B zYefg>!F+x>qo@SAkaq@cd*xpIyuXsJy2Kb!L<-B(woV;A-X0z%`M$p%+5B+a$_N9| z!CP3g`tjgV)fR8?x=kxckiitL*vuYu741@v(ebY+TWfZ4eRg(5A!_I^ff4!aOP#@S zuuX255E0!E;{v3?je+m9N1Q+2K~PM5Wc^yN7OjCL2ArRM@mG`k)9-n%vY&g??`UjVd@09}Z}pEu@n?6SHTWc2)lNAdj((-!hV6hFg8k#<;) zHCJc{2qvtt{CSR5Y)p?|&3#Plhj3T$rxO1i4<7{=6(!C{wmREkka@~jE$V4nW~S9# zrZ}kt%QJaJtyu0z@Yaiid?NuSg$OKbR~NJR@)=sILsI%fOgu_DR^EWnf|>*iR^Qx%f(DtYU7U?V1#QXa%<9rmKBaHM$C;!#x z0my%&JMF*IUCzPW@c&tRfo71e(;EoP^f%ZSMW%0peR^7LxaSi!B05=XCYrP z8U}9?844-}uOFguXBD%A#=4OW=X2(D_NkXomoE_ekUX^e1xB0@mBt!20<#k{E@L9K zFDvREpd%p9hvztE!>QFYW1l`Y+k05f2da?tHxcHmr0w|Z2XY&CCmZB^H(Ih&n^1p$ z+k=r?UoQ407hq#H2c^NbFmE+zRH<2n{Uf1N--(HdhSk^;ONdA-$*y4Pr79?um)|)~ zp(X0O{%i$MEi{lEO(X%p$XAw@}EkJA@uGH&C zXT_S}WLY24fn)Z0k#mFbKy|_)UUv-TbB8-~Oa7ud$kj17&uqrK!R2|}%`>x+_VKkm z(*rcBuSptr>=wA+8E)vNC<10%#vTFtYil?F?b@!hg2*3MyfY*KEdm$gaQc1Ti_(Aj zMgW(fypT?EB0k)>(ynqmhDzKkD5i*F_%GTh;uYN z0J_24O=s9i1FOc`bkgD|-7+ozBw{I^-U<*mpKQN9$_C#Nr<>dz0T&j9x4wR@YY=KwV#`P|AtN0ty1-z;7&a0+!<%9-;7Zd`$L?JsOnR@xXsdD`BBAi5wt_a$ zCXgqJz4szD06)nj^<C5MCN0Q+?iwZL^mQSiWsT zQ;!Y@thW~I!g`I_5kc9!t1$VlI!9&2AHL%1n!jMXvS5}n!acK9_6bV|@@or09Agec zyGO?!Pg-0dIlw!nF3b`1GvMTHl`?P9opchOr&xmvUm+@Mx8qM(k z0B)9pj+Q(_bZ~Sb`0JI#n8Z=RA^gng&fNYqEtr@IeW4-4Aq-X%%AvBCq zpEHr)6S9M)i*IUYq>0YxGjB3r(r8#R_^qw^TO>JlI)P94Xx1}qR*Dac2y}|}dIRCvgTHnds*5<#DQP%SRITZ6OfFx9nt|Q|H+||2!`06J@5wX z*HA83mM1`v?k04@o)z!@A#4ygqBV!Kj4P{?+To12G%$g?oyuKxuDHKRHy}`6cS6uof_1crq!VIgX|oU+yHHXysFx02SJ#k zjV|Y97K1%cA5GvJ5u2vI#N1pQvYfQNq`L8XRx{~WfyPC*f7efU6gRfub&`d$HRuf< zZNc+wnmkisoFw=hRkImNEfJbv%Zi_Wybj~Wp5=d4JZkfVH1YvkeUQ^AC6cJpBHJ4e`I zfj=l<0+WXkfWr<*%h<1$w+ThW6A9`Lip?-K)zLy6r_(|J(KXxm)NY_<6s84scJAm9 zy(rlV&Dg_%naxn3}p+VRV~*3{WVHQ5^_t@0ITfYdN%qFa4UzAAivyL#O{ zvq1X%IzL!lQ_Yw{9*JR4wJpMHpGQWq$yL7K-=YQsXvfW-y^29#B|CfA< z>9t_Ls0NA}qVbrWe&r%CV`y36n3nLnO2|7(^*hG(y~B~Za4;n?`$H?gK|opJVxR76 z`iJlKvZ+`FW<+~$sBX7i%PeeE9_GB%Y=E8FTG68dD=0i;CP{y0H5306c8c=3JY?>dz z0RH~^rkvDI2zAWVNb_vTG7YHjmxcMq54K3E!Yoqu$u3D&60bHedSwlfK|O;Cgj0HO zjze(Cb2&jl$M`JFu^L8jcNFmW;!-0nhKZv6*Hko#`;F%9wU?zTyq02ff;q-b?NdQ~A*kfrNKYQEsNs5qxETuJ7!ZhKph4fEyn{)T3r+IBX)iY_C`&TRX#B?GJ#`o>Ut*3fxgD_$vX#e}#@y_BdNcZ#U$AOgpd z6&rgvwc*6t-kS3DO#Nge*q+uIPI#SI7!+i-xg=i<7|`9?R&l#={fGZE#j{eaf7SX1 z<=@nr`G4^Lf8$>MFE#j2Kj%nm=V1HSDRDA4c9djoe4LV%k@+J}KgUGBBf(k^FFPrt z3`HYnCo?%VCr`h~1RjpP-i}^$L~2R_c1Zps#ZMR>4y`p_+N$gR-cMtSKm4x`2MN^= zq^uzF_aY?zzW#sva{ucx#jWkE{>#VlR$RAP`0LAMtl3*ic@#(sN#>%3XJxdZ%Z0oB zR2C_06!}$-c6+cQc`#l_JR-1HvlA>Vya)P1F=(}yAC#(5FPhD9JUM+aS+mXO15&z^ z6mEQgwxJRyC^N+Bg0>+aH==#(C>tE9jgGaUJD42~=~k+z8w?PIaRLVffC#-cop;RP z0Khj}^FxoxRm61Xhhyqi0t=DRaF21y@PSsSn4DjAMbkLN;W{%ZyPHp+4 zr1le!p{}J;Oaikn>}TUEu z?+~|gRCUN9uwW^pN1|dZkZQ4jSef6k8AI1%DF8VLHEtT;DEExf;ZEmz%6gbFT9$BB zehD}exYGIR;vtoqvM9Cp!p3;=*M&VKw(@x>4Mh@)g^UDS~< zMypDTVUyQ^mR*WioZ@=ZAy%Nxk`0z%lza?W_2kcp+!pjbiJ24F)vrr#)1?4Uw$7q< zuiPFKso0&vnar(zQgJa${i}F&O%C^Y&1$*~DpQ8o!FGSlJqVOvm3?{?AI8kqvcDjN zELi;qHoKh{utKW~ho-VG;ue1xW^g?bU$cWKYdC{7^8Iy#fj^Pb?^2EH^KgkXKPYWx zX{6KS5teoPvh#SsOOEV<%?QWU!Iu$>XU{?uPaX>>1$~^c(|ir+X0wlO$m$*0g$%F{ zN2NwfY{BQ9bFyKJ&v|)b1c7)C7Fz01g>%?q=>CzCTTQWdm%kkk%U{*||1Bj#&W=vD z*2WJ14QN)}e=L5$H%%~%k{lW`H-SMd{u>ZBDvL+KUyuJ9L#?hDa)CzYMJZiO>c2c; zYV$y|nv0>2)z{;UtW%$Ve1?@F4`7I+`%!&?U=j3WB{kMs1HHvwY@x3uXk({7o<2E_ zp1)p$OWSr+O~LGKhbNpNt?b9%fc8#AMD{WYVIU>Q=p|P-DjvO2dIlTZ zoBb@|LFH@9@i$|6*(&YCTab#{fdfDo$9oy@@64CY9aXslPm3(n{ zLL7lyasd`9X`=LjJiWY9pOQW0~yNHJwL!SXEIKfNv*v60`I8FmPoQ#zh;zVZ>`3FMK| zld+i%Y9gLB(c1bkPkr6ns4|P!siOKhPC6B)_^Z(?_z8D?p>)_KSi_>QO`roTM|_Cs zpV)j9ra886U2R-4;po`pSKNVVp$af`dR&j3{obg5I@#~?@I-gybWO~SAP$&*1aw#; z2W>)))XlHub}!4@l(ya^D-44Mp`2%{&1KIJ6)J_oJa{4KT|nRnFs?s(Y-;+RF?91E zo0@t*>>s`L=?VsQ1i^%r<>Z24LD6)Y@Fsh#vL&CD@>zm2Ml=p#n}EE)-U{SKK{cK} zVA;A|$VwY6d^K(>a>@>Ep28Vkd=J8k?Jo&RQtKLGQqE{1G!QzV4X5rw1u66{d>S?G zInkR~h2oa!z$()`VbISms*WwvMsPRQ^XEU4La{^HgQp_M+vxwyWN3SQq{`E4Cqmxf z)p7%5v#r5EMAv{YKbHDB1x|t*D;c$>XpP#L z0c)Fb73mPWMWO>4+&TSVz8`%~m0aCAn?aG)*0jS)J?UwTUAG-XUzI;WX54l@=fj73 z+JP2#MY0tEw}nYC;TnIq?Dg(!ZqH)G%!wX-u)rJ36^_M9v zgrNRbd}V@vs}Z>Wqbs&DH=uJcHvL=U9o%Vb9ZYF0^c|wyowX9RJ80oHH$fGI5H=}= zj%O*On1x)~poGLJf6mhoLW!}>3sGJIDG-t7DtJ7so94)FfBIbWp1)RY-_LmKQeCM% zYotU&U~|%r*A$mp&xG7*4!o{5CBpsWwvaRC&B`%2pjhGK3+@Sx`=%`h_b;cUI>ouM zpv*_5}UnmDqh?oAXl4KXzIS(-6VT9-L z-Zs@j(wKsM`2oDahDsnqh+AbZga0cr?SmtYOI>J&JWcTJfwvYn#(0&sPTN)3oK@@AlIa`r?~vcmMbcQNgW8e0BA!nb>!e{f!U2sSD5f z!)i0rJM*H;{c^*~%S!<+`O%EMe42XiFH|J`I)wTz@~dcXWP0#RG~$Iy-AgrQj~s) zf=Br`HGTIT)9NV=X@A8|Ci{Ks-CQrQTOnmM5I~AZhl_ym7o&e7@P4F51}=d*-X-Q} z2Np&|wO&`B>RuC2 zyyRl$6C%E$p#iq_QY?_^URSU5ak##%V6I$&8sZ zPCrhc-*onNeUrO#gyV?RXsHPp&%975B#Wj{c~9{_-VRMpY%JrwwUzbi^*hNY0{aR9 z51W{39o9%~R4Mp+1HTo+mJq&eY)=*sOfv)xBLoEGv@hc`@91$zD>NT**3mLtVvnJ& zwa3BsiUl4{u?M8cd9i0gY9=tWyoNCaAv8xg3Ph>hsXZ!}k&Bt}!eA{oV+X<;Qi_#L zZXxrn#v3P@i1tl)fNmxqILsh2UywiLM{g;ZB2&mO%D(GNPC_>mT<+!k7xxRZ(5Wk9->Du#ABc|isX`LuSo$+yg(uJs+%nq-~d~N<|1In zsAqR6%q7>#nvOrhSz}IVXHgtPhpv-P3X+bXENVLL3Mq?nrj~t|1~eHx;!p4_OwN=k zw;0wH&fm*M;8@&Xj@fD?T za)#3cvj=+!fZTnrRh{DY(w>rlx~3yl|tI5b*PR8K$jb_y$=f=nrI#`jLsBMVgT!hMEEadhEcJFM_z}o_Llo z+)PjJT6*aKwD8(pvYz8MI!wCOz?h-Rg)}hyZdRB{>K~&BIV9OoAOeOLQusDT2P|Sg z^#Zv=gki3`$PEyFw{arTHJ2)~Y$>&nC&+mn5>R+(q=pSpn~c2AdKyN!+r9*Ym`%OF zky7wN4&Nk#uI~S`;hki-lcy#RX0UsQ333;iyNQh_&)HvG7f$HEX@nttu5{_vSNk{oN2O8Pliu92HrmIKA4pvLU(Nn$+UnLYn_-i-PY zmAR!ArV}`1hSrR-z~GI0j7Mr~{e=7kG6k7R4s2&=zVAx1nHB1cl_;VjT09>8hiRkF z3aftR7h&-TsVAq>MEpbyZ?=3Z6;s!B{z#9;iT5o}6nHrQ{g?sJukB|;tbxpmWH~Bo zMrD6whoCl%5O1Oa7K1bWU>h2_tNhh7_F$PEd`{phr40#T4+V4)D!|lu8*eMRQPOE_ zvi+!OC{YmAqLy=d7t5>%AbqiMi&ut{$%ZqJoF@#*_u2nE0Y09#PVT6C?-PcqQb0jg zurWs<@K#nI{DZ0T4XRWu7>ECi_ge*kSNWjO@8h|Z!b;DC=2xUc@6|fQ^>T}@J=`KkXV!35IUb81mR28RD95KBZu#mhr1QS~*UMcSCne6U#bGif&#}Cj!~PVFuy;Firk2!f18F z;QbGR8`@b(7kj~=Ud+0}Od2|=CU(lbPL6oV)TH^BE~p7cdBN7{uPwcUcVZbInkn_p zj*{i4W;(TtpF4=j`(jjdr)Z+l;m?h#6^h-XdPPbjOv`_s#h@dxa;n9CrF)p+8cm)m z*dyqD@E3wXOL+I7`}JI5#Pw@d8n}qQ z5&7E?YPUYy%Wd@u?Sh)%XV=!_(UxwN9Z=vs%H)1&$%?nKBUUy*?&h)xh!3D=>5PH2 zTJp7uSI;EP4s1n{GTAT5?jcBR0XEa4weEM13F7IYHoJ-mccG+KnoqE;19IL~PPdM8 z)W_OtKt3nk$)=`u<5^_(xwlc0-yScrB#AED9I<-PS{{xSSAa-=O_uSh27TEv@pLaj z50KM&s(g5I$F*7|n~m%a{OJ{302#)LwpA#2mSxJn^;0qh$;~1&ro=Xl2-&OuEa*KZ zH5QwndvEX9zG*8l&`}9hXjy^{y(g_o#BFU>+eOFBgXR>O^_Pe)^JCP{w~KMu3oQSL zso(q3^|ObTf*cbuiLdKM1+Gps3K4x7#+LpaSu>oaqYm~^s9L@q`O=fQ1npjI$#`mT zVjP#%yI-zrLw8rSAo!cgmr<J?*CPK!-?9xJ7!pYN`|}69?MFbP^|(#H<&N4<*Vy zbNw7bP51SHmP3xUBkL5*7IweU;*)EN16a*=y8^B--I*zxF?lkR zKDTQ;&wOoH%pigb#pAq@&=;S6<|z99I=6rWEVtP2$N-5Mf`v`vH-p~h#E$N}3KNA| zh_ro2mL|VuS0npI%n2ev+0VBMDk<4au2y!_M_OaTdi;d`fWh03@#Myf4a9)JA&7_m z`6$vAjhWKuaRGu3bNUY1M>vkiAW zsCauRfQOUK(!|W;Ezm0_Qm?GnG^5_Uwc*_lbSRGoxy@MsLH@q6WhApSiL{5yfOb5H>+ZBOoU zHzQIXnvMJT@kPBFW8Q+sF>g+TuEI0ETdwzffnsW{zLP)D_~ebV?cbi;N_H#m6b z@SDsL@pYyAncm~^nmlSfvNM3mO5w*S3jg48X9a6Wki%vDQjH^Mho`$Pdsj!edD;DZ zxs`8EvgJ}heR&m)rE~j=J8&x7ooi`aHKrHpo_kV%!5>Bv+-ltC(6a$@OdETr-5`9* z6i;;0_(rWj;~}d?U#nrd9{b5$0D%fVWhQcytE*5qcE;$nw5>a_QJ+K}K6weFo{Q!c((i4bhl>)9C{6({4z z64v2WLx2ByWe|9^3ov#$nP^{ss!b^KT6GN32JBSrBmKz>B>Z~I3vqk&R!>#1lbVW= zY_c67IW_~gezNDIC`N1<>_9;Aq>XO>U4&k^wVFzvJLl6Z{{SPDbBc-*x8%l<5I&fw z0!>x9iI7jz$rj+s*-LPtj4g}KmO&4&hMpnkTe`Vq#LU8kO01>cns$L^61K&(f4pS$ zn2U|*i;_yV5lJH8)~=iq{e~ha6t;D~Iukm3f5luPlcghQESLdPY8$O^+D>&`$(jjS zjZh}(U?}GeI7bI}ky4KCu~YLlR~5XQlDLA-EY6*8sCqJL3Zy-Yc&_%R-3L~7w|!=4tJL}_pNHQm+WgEG4x$6Sp+|Ma0N|< z<;7ucYvb=7l6U5jS!=z{pwMhjx%j50vV|y5i#IFCNB4pckFC^*>v+&1Tm3?*D@ z@XqU&h)o71|FJ^Tsr@rzE}USYrZ~2!73ughT%zg{N!G= z7rkYmq0pDeNTzwg05Fo!^p}6gSwil!3^q;BII3g9V$OEA_Jlimio(w}??TasW>xmN z)PPAh=D+zfEks4Ex*T)@~&6ucHnUn`mdmIqT zyh<+WdKDgIuLtE+g_+fCEKv5QBxBKe2OsTFFpQJf^wweLcKv2Y*iPzH^VU=bNLm3G zl^#{)S>`{>BazQca)0GBXT}US3M;SK5ikER4&s+Yuy@^V_^~t9q&1E@QlKR>dXkBC zFk7a{LB_d7Sxh0a^3jbw8OPzvLw`~IzV3Y62X0Fb$(~-Kd!4X`N#<75_AZXh z$@A``hmuWF*x^FnK~1yHKTG@cV#tfjY+KILPloVAX>Gew@tGNfXX|R_m>CV6#br5C z-ztQA>KvvQ8j2*5eX3K{)_6gnCg=Y4NZ4pE&diomo6!Yjoo4`UMa}}BXPXMxgNG~P z3UYc=!-;d3BB#%T0fUR9UcK*#NRVvPMoKkkbpVKUj`k@~cPfhO&uDM;unv$jmy9Ls z<2bz;7ddm0n36Y-A8gwqZiVS{SIw5^@&KER-U*VEV(;WGJz+NfKsK8twPp&jD$had z%`}5W`%u~u>$$hQ>Wvb8dP0PpucW(Lt-Mp@-&SNMv^86`h3*sNnwPl=Mdx*pT%=IO z)v7YlP&q(OEAo==Vs&rKE2%LRQ+~^jgoHU&vM}LY5p`GkcS1~)uiZ+P7Qgk@6NVfS z5*DW%3TIUAmt$RT6AOR5M3SKRB0j zm!}+-iL6a9qbfFCMK50AU6FXIEs|m!A**wp77*COR3$#|{BrqBui;mD*{;7`yBrqY zj!T*aD8nDsz7wEtc7p0ACRb=F>&%IhuI)eh51KigqWjKX}aSgn~7_ENj7_>GoKq<5EU+ z&)a69vQ6%?+?+p8z*q+!1{%KpVc(=$;muaPWC{$vwlUZ`0_qebpC4+va-Mp!{b&5o z&=8nHvG)GwLdsCWzA*}tOg^(l13IOk3{RZ_RTNdioo5rr!z*b9kV!EM5sv&C+M&A_ z6T=xAVM3fHViF{ce(Hl7$Wp$Oq97ShMo=A`1GGu&dnNzS}GyGp9MNM({O|*2i-b3n`fuxAY58wvF^H5y6oPU?9 zEO^fB@c?UO@QD-RYv2>D(N+Vp^avy`Nn9B7Q}MZtQBAH%1ghM?{qTG;3dh6RjQM7n zO!g{Dh^g3EkW%Z{Oa1T+Fuxydc6ijJf7$COK)1(YiI!}sSMc`3ds#5UIkvf^yDpy3 zR<+xJWfnv4_#TZ2vRcD#Gmu{+3|=r7a#LPF3IO2~EsLiw$5hig^wiPb5RD1fZir4? z@=cHgYZxA3ONi-a37!pppkcQI6?LG|xO1n&Z5}P2`)_oqk>Fi)KTCw8qRks%L9xzu z8-A9+g@335$cMFZ8!$ z%W2*>0O>5r?WnI*ehWgk(p(f-=01q1XHcI~i%88QM&K?ENz5@`BJr@eiM4K{&T4 zi#~JLN^v%oJvwWuCqO!4YGJi_6klBQQj3-?{1#59&93*cpRoA97f6s|mpcf)lQJ@R!I0T7ng#0+}5}{wZptHxi zdFV~NGj@jYhQeAz8NjuUT>-LLH z#7a?^@#7@UTu)MJwGt|w;MZ7BD^XVcBS}q8!@A&W$!o*c=Evg&UY564SD=q32sLOv zJkrl-uC{{MSIom&YSsSansExd;SB=AGQvg5Ca?+Lajw~QKuYM>oAT`YM=pJ=BIjz{ zZe*sh9|9DmRkTk@H5HowBcouASQ`GTjr)wqp1UAqF?6@xC%n4_3BatXpra+724E3mzg-3^6%)fcNAD^5_IYJh=QQHsCBkeeRKzSaSF#R> zM?}@y-7a>1@K?FwixQZx>P#6JEUHU|Osp(vAkifIuP&taH2=!`gc{?PU!7wvf$N>f zKhw04e@aESB-UGoziiRkpu_$qRHC1WaD1w<)QuLcBe|E&5qM9T$psmm`(j#n(T&19 zgt|Nb#<_lxyxgALzfL50wM84R6;!ToLU{x)iHh2bTp$ zK}Lba_X`o66!+2)ts67=&3o_rjXN{w`}Oq(zXN4!Nk6L_7%hYxEo>+3M%XWjSL4*V zbPEuG_5uvw%y+qD%|?w(yK}3JslU)0YN@&0tkmG3GxURn%ztyzb#de66LHlrZ;6SEw=z(Woc3R4$hHo(Cb? z3~vx7+zBivbT(TiNd(sk4Cnl~w;8XflGzZmQKG5%AeCms*|KS~eEe!LWl~qTRy#D% z*CD<)YiH}o(ckHbt$GiPeoJ0+KhsE>_uoo@?f0no)_@Kn}*hbs)^v4mKqv`Q8U(P4Q&k!1T)Yi&9 zX|1^%)-C;8+KA`**799%uh`*`&ZC7?>HYM880M4K$vw`97<8|EeIz!u4I_q;z2pFQ z^p@K)0P@D1TyH=?2R0llvz(CtYXtW6K7Ir#_yqPamV0L0h<%QTcwczH3>r6*oYi)O z5fe(Q+(vD4Wii&c-b7Md+r0L1`*Q7W&ZhSN~89Mi$Tc`@oB{i>TW#ECQ^EUb?2Nw>u zW7P_UWTPp<<>Y`7&hFk65FvqU3JgW3nQ}=y-QDv*40tNIoEKnZY1?s?>a*6wQB3`e zAnP?_$K7EIa}L@LnO0g*yzSn3d4Tk)gGTXwM$6c-{En~}4|qO}x>A}adx^fnamXw`i+c)V=~n%^-u zG-K^OL)E~7c*q9+j*wCwMRW?_h2()kJCcX+=8CXdUULPX`|eLb7l8`5(M~vCnPp=q zKGcCfvf|`j>fI7~S>`Ai&y<@DS^3}HYvyn8=+1B>oiq1F?Wf}5KG|yzr&cO%V9Sg; zYL4r_e_w-h54$#>Z!~#sWsh(Wm~hFpu#z5L%e$WdgKu#T-(ymrT>!5py5NrK)Pum1 zJMa+J#qBfZmX48cBs8jQrUsH(FC!lA%2>>CEuB(58G78s?fE>@phBsNX*k2=%D4S6 z#?)YO&rL&InLRPPnJy|PIq}0*ALGrYLL-AkOKzNw{AprTwr+$pR+Q_a+6-3xW%`<7 z(r}gjzFl_erraZ=ILtB@lTo6&U{e8$R{wqNT>spUp1y>d3t8+-5JQlD@L9OPOvEAG zA)cS!o+;v!MaT>u#aPQneS_l5$4$;c7!@mrcLo$7>6sP|=Eug#JSJr7!y1--&hglxSh(g{$NP~!X(=py zPTm!j;wyZ1s_Tnsfm3s_`;ne^xg&^EL(52+BwnVi;E7psp|gMS*Z)`sACPLf{f!ar zXuZGZQj%z#UO0*83;IvNs)O;tJouY^ll|9K%KyXW^#7ff{{3HBY3-OPi~sCVE}r~( zS+EJB^#a;-QqgW}P@{mNe1smp#U>+3pcfxBJsW>#YWBYTT6w4C<^VX56`1y)|K|_Ch3d#({UrLE5&VCTfFk}6 zg>^MH_$MQnrO;=wPmk0^_dpPN9Y1e{C@H5kE~uaKP`?_yH7=Y+0#i@I>~Qh%Iqnj_ zW}Z8nVRF>vZp%zekTGur30Ihvb^PoVZ)%pLY1xr={Qbq-K=5j4|17=KYOwRkrAEaPgc>=10$b=l9a*>-Z` zCl4Psm2lQpod?hE=s&%+;ktwGqwkkr%WJy5WHgbht!87-sMsYdS1?;lxbLl)?y7GB z^BrBq`)a%S>=rnSmb>mQyl{7&{!YfWGJ#2{Zl_c~8M$(3H``Xkyh-0H#>M4#ImBpz=Wx##H#h@r{4ff4GY{0XZ|C@Z%`)#w|89B{5l+fyA z&UX7o-oer<*J6{Tt#fzP+pCvO{!-j7v*i01mAxlER)jw}DAptD)feEwronJBRP9Mo zi=DmN55eBazjyCw+R3_ER3>LWaCru&hqcq{O;-e$W^YS9lBe=;)dIdnmo9x3IPiJV zTv6TatF(e_1yZM#SV**d`JMXhTzG(i&Jx|3PfDkXPRyNTd^GarmcPqGFH9Eyyr{AI z@#VQ^rQ%*qdZ{?OEz?7$>CPs{3(?}~2|ERM<=su-JKJ*A^7qk6q7(MyZ#l<0V}{&P z+pn80WIols=6E8_GOj~r()#D>HnnpvSUK}cE$K@FF21}u>ut}o9SKpp<9D^!ILt{m z-0SjTYt&33>+f48DR|G{yX{{|(ZvSinV(mAS47{@2{HcjcT1sG?ySBG$4+D{67lM5 zT#^0ZS<$^2Qty`V_cfo{BD8Mv?*lp#?MHk!?_Xp2(!Xl)BcD(atK-0Ny;hqU&Yi`I z^;Y~c#p~}nt(DrVR-SeHU(R}&puY{j{SO?i2W8CzPd!_@f${khZ+r?P#V7Ct9bIVl ztPMKtci2E+&v$K~a~9EBd>k_s7Px9XQjJovP)yE05SkRd&H2>*$2L(?EO+)8Z?-lL zyzz3E&Ixv_^*wf;e3uHH0=Si@)>(VXO`rZn!}6?KPJUJS#+rTe1>-ZL9&10nHtF~A z&#!;7dTJb4bm@s3XZoMz{1Lxujjk)P&d^)F?04t zH=Sm#XSvmu-@YS7OI(%jbDg2n*(*yOo<4l_=4InShIdo6b+7v0G{2Uq@@$XRBlCL_ zk;}IPOcTG|wzkUDF~uMwZ|C=|g`1vlOTPd9|LNQZbF+BZ{+|#BMPE?w$EZ4B^apj5#mUMX@DMFINbLYH_d65ji?|(+o=;2b-uNcoS$S{xwz=xhlHO`sFiR9K z2vrrhbx^&|s9pEHik?vY0kw5D_lp~fC4w1uziR(8WkbJ8Qu9^EA5Ar90+;E^@LBrL-kXrpN8<|21|Km#NQ5NLHBq^K2S{@TuQ84zuJHS9D?-+gn#voRTRPM zI;s$Brzf7Ca8HP}t24yY+XZ561%Y}Xtl?S+PcH+whmRB7OYpB4l(BChy)V_zT=1^W zw11AVAZxTirfM#cbE^KmG^v`byYX;I2||S0x3}tkC*J|xIi9%(oMX+=$gT5ImyF1UlRgK z;!h^p5nveXgH7Y{$&|7Y0a(_w+fUe{a1&1UctlfLb2h8VL!#57vXqNeYyeQVhhcr5 z5+SBqn7xNs-Wj$811if5ou&+=8}Iy>fD<$rz~^PQ4I@GbaXwxX=7f#O1^5`pVw4E7 zzFwlxN(|Xv50APJu}i(zfcY-@|abiC+l6AYP0lPD}lzvpPx>(1gBJvkav zXvK3yok*-KGxjdICx-jtxW^Bk}mUUO!2G-0!8<0mB*@su6L0W2~Y|F;^N?+yeYmE85Q- zpX3D_7)?C1E;kQG+`Ule17KECZIOJK9~C5fQs9JuOnonGzs9&4wnHg`l4V zD)h5U6R*XJF!iP5Ry~sa%*K?8fy<5=ri};Os8lyQgv} zjOev_FT~~=)B(ac(sguEWLxYiYaMHGH49xUwJtc;&U=1W?%wR36sYF6)!#gws;^-z zIV+A^-SA}#hM<9$?5Gz#wtIQX*CzdzC&t(ck&6iX)Rw3YLNes^qCH#b(B=IfteuWm zr2*}&j!Q})F{f_0iXL%zkH6TPN^L@ooVef3$uj{R6jm4;#ONQeNY- zGjD6x6nnrZo9B-(*OsraoZPg=G;)Eb^?Wp_PZWfydBO|y!_=T6%@aq=B_NDXaVAxZ z8uSXG$MPL4TRoI){6e3XX3!+bq!*1JADXz^rZ{~S5g5?O6E5K%qwHFGxH24uWn$U{Sc)Fk5e*JBksjR? z@XbU~42HrU-FWyLZibA3Js%Pnif`f7643?rrEnpZ9#Xeds_B@fYaf(^NK`q+6UDoo z>2RcA09$W<;(YXnZb^A{*(7DhK}jDRKETY)u30*@MYMO|OMd=1m0aI%Y2`pL@I5}R zgsyeTu#^)LTwqOcQ@Nn@Gq#NDGUow*^4uv|v3rt_x7cklUDcUs^&xQqq(L63vVd-iVpq#c0TRBV_wmjO??L0pkiy6n9X`d ziz#mxZPq{AVi}X)SXkAIjQo1bFvPbj!651Wmom27g?k2l3>E%mFF8FJnHuoy-1WSe zya~1o7_ybxrjwMc?MSu7wkD+`#eq5XK#2tQ)8l@HL-s0fKm7ILi(2{+dcvl}Z_fT@ zfb(%{@Pe77Jhxv;2%XoARhzu-3dvOCxU_`PWclYQ59k?B)@L`p-VwWiFQf0?GUl|l z+>IQ&XD)&~icYvXuvfpf@d^4AszD^@rfEiMhQAZedY)9E!jH6P2i~jSo+QVV<<8_H zCnv{ozb9|kXpH6}M`c`k&E9>Q-(fFD)|F35KFi;$J{)8Xls~J;Rb4%lUDuE44PEd| zT;ifNed~zs?G~RgSjFbbpbT#iV+P^x^m}}il5flfagJ%yX)vWv!IGYAdBC&Y$RzSh z=bN2Yv`gojcBOCX)r_($YN}JgcoSVrzel(96yO_n+!;h8>WM29wko7^Ekbd6I~LbR zdea$$QKluQl$SNZ;+RUt;CR!b1A*CE&fw~vT7&(x75$*+moYuH#``EojWhbF)wL7) zS=EwS!;a`nZPE@CXQLYMtfkVmIH@IU7Vjse(oX>nQncVOJ~mbNS$9-UJSZ2&(*<@R zoVyL|L=wG6a8&Q}Jn(TRLXyd&s>6R`Lp2F*xwb!ISS7&1+9bomg8oPKAolO-LCMv{ z7UALi#0%l-@(%$)7-;6r__JMNNYnC1+w{o%yK1Gzl6etqV|DID)UecCPooPdS&+8H zlG84d)qht?8Pn-_E6i^UhdeQ0MBb970tX_mYe`AiD(hGsam*ClHM;tC`t$H>-28UO_v;QR#2dKu{p`Q^rFZ*wVgYsZrraXT8U^P za3emxwU*5WMtD;Fa4Ph=d0! zD?s|&DDV0;nd7$yeRwxzNw+H7KLR_z449m9+XU+OJA;O~>&wF9kw6F0MJGQWDRP}G zQxWO>S2K&nKg_`nFU#3KfdcQNRhL^rXceokIQ#;}GIZ#1IP1gBf7It@s_z*2i8Wnh z_A3Xz$)ZbZUntA1-zZJydLr!kQHugSSRQBa0!4gW+J_PAMQTHbRq<0ID*Rze+9s(J@OzD)NML`F+!YML^>Bj90yCYI|AuRUhw)749 z?$#d0wpNO|>bDZkPY)1uOm`R^Urufi%1|T7n`tfx1L-bq2R=_Hmu5MEN%Iu=pJj|( zW_Hdmq`R)M5{kd#qx7R)P0N=$iKEhOJ`w(!$IYMU)CJbGeMz}f6W z@#Q|6_tAajZA7TthA!Y~zh%^bRxBtSPsj^keTIPLn5UvpEZV3Taj-scapCVWlJbVtm5Wu;?|dv+oz z{qh|O&YI6(KQFh#SPKg79G;a?^lz=g4tsVg_cSwCsX(O-`v=o#F<% zoSe8}ryofuvf zChuwio_uc8%ge0O2M!u7b|KnA*M~)bD@T*L^B=QfQe5rj)FC!4>zF*4#Rh8^xZvW@!*_pn%>^g|&IC0jCDsC!UEqB00M< zYWuXG91!W3`~}WT)9%|>@*C-F!wg91%B$sIme z(#;QiEpr1pSgs@c(WCjo>~5g> zCtK@%EPq-n5`N$3>r1AM_Rl=mfYZ1l`Bk$rE$sA6VXaR`Z_R^&6?>v&1r& zzEb>EVO&F3?a26(;MvN6JAw0;#hyH%t8Hp#Z{^nr?V7kEO++cp({Z8l7mBYF9_y;% z6bHYLe`V*M5U!w)6nv$3*36YV@WU2E4A7^3v_?9dlC466eUs)!Kf%Ca(D;Dw15pa4 zo?%}yHDQ^?$@OE7k2!rhKsH5^GPYPdJ!O7EPX+3UQfriHxe*-0AZ1iJTOk*lD{{bn zUBl2GaUy;%@DLEdOG~2~cDA!$Vem{saL>Ws$-b&`;HY_Swm#e#)=)Rp&jf35cP}=n zhGltL4UNX!yCmRMM)F#MW(Uxxjn(d7O1H9XDwjCCrx{OjJF%*Jy@lcK5So{f?X~=j zT-U(gGNP84NpS0zjHvln83Fu5M)<<51pSavLx`oKXk5S)AlaCu&x1a@Nq-rvH z<)G>h^djQ`)o5pbk^)!Dc_>R%o?#p3!Z#l~i7b*P*h{C*0+9gumMSICcxvfJL9h517}4wbv!*iA#g-bA zo8CCHllqz6FB9_^Wx)cFA>veVgqaA&j2@^E3(T|5)ImDM;t?*SaPU(u z>Idq9`3Ci(s8F`D1o_R4jfQI?D@n??x|}smFk7tySq7kfq8l6TmQLpT=1O8%TEt{4>cT~U#xkJ z)2smv`*k%*fbn(Jt@SGgJqhl3&3e+KJ}z%oJ%JOeznOpk!um`G8w+a>=idYz#UIT7 zvV6e*%|0xl>o@z#$KPVACmJMG7@$;PMCzQy)JeApbOya8#9&rtjWd%Swd=S|v!f0x zBh=~b&n!LK#RJAIl!rs=MZ7B~JblVmzQuvRa3J{_EBBiDyMURAr+p<2ukQ=U&GA2G zaF?^cbV7;#m>}4@5v^(fMXA6#8`8L%DQEt$E&O# zjeFf0RC)>F0jH&eMPA{;LYYDvH_m{4D6;jfl(vpRZVc_)ogm{)Liy4-QZK?~Itq_d z{U2`d%!sI~^@<0AJ&}1FJ(2NGe-os`F9TTnwSD1VB>iWFOZh88Tg6b}FM~{5K}TIx z#lTQdTQxqRi|8+gLa&vASqRTEic}O{m$2;IivYVIKntJFuc|GO7-`oPEt=a2omR*4 zaSgaL&8n3?38OwyUx-xstG{QkW(@4wLv9vcxe^^1jOC_p%*+7832O#Da7^vUF09XI zNt$M`J3%dyvxF(vTdt0D$sTEkXqOF~-^)jRE{+cRwYa`tA5;??K#BFY!S|JlP7s>x@;J=IYpM(EA*x&X2 tH-3`;J@}7m|7U_fsr`Nae}m;$zW=KlpqhC2zoYPewa{PnwEEY){{ - - -# This file contains properties common to the tutorial examples for SAAJ. - -client-jar=saaj-client.jar -build=build -src=src -common=../common/build - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.xml deleted file mode 100644 index e91daa8be4b..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - -]> - - - - - - - - - - &targets; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.dtd b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.dtd deleted file mode 100644 index 511ab564286..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.dtd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.xml deleted file mode 100644 index d2aa3530890..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - "1234" - - - - - "Pental" - - - "Ragni" - - - -

- - "9876 Central Way" - - - "Rainbow" - - - "CA" - - - "99999" - - - "908 873-6789" - - - "ragnip@aol.com" - -
- - - - "arabica" - - - "2" - - - "10.95" - - - - - "10.95" - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.dtd b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.dtd deleted file mode 100644 index 544c9af7985..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.dtd +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.xml deleted file mode 100644 index b802692c32e..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - "1234" - - - - "01-01-2001" - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.dtd b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.dtd deleted file mode 100644 index 507604abbd8..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.dtd +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.xml deleted file mode 100644 index ca2f4f0c6dd..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - PUBLIC "-//Sun Microsystems, Inc.//DTD priceList//EN" - "http://java.sun.com/webservices/dtds/price-list.dtd"> - - - Arabica - 4.50 - - - - HouseBlend - 5.00 - - - - Espresso - 5.00 - - - - Dorada - 6.00 - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.dtd b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.dtd deleted file mode 100644 index c64645e304d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.dtd +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.xml deleted file mode 100644 index f6c4568600f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - "Send current price list." - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/ConfirmationServlet.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/ConfirmationServlet.java deleted file mode 100644 index 6c66272d8e9..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/ConfirmationServlet.java +++ /dev/null @@ -1,193 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import jakarta.xml.soap.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; - -import javax.xml.transform.*; - -import java.util.*; -import java.io.*; - -public class ConfirmationServlet extends HttpServlet { - static MessageFactory fac = null; - - static { - try { - fac = MessageFactory.newInstance(); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - - public void init(ServletConfig servletConfig) - throws ServletException { - super.init(servletConfig); - } - - public void doPost( HttpServletRequest req, - HttpServletResponse resp) - throws ServletException, IOException { - try { - // Get all the headers from the HTTP request - MimeHeaders headers = getHeaders(req); - - // Get the body of the HTTP request - InputStream is = req.getInputStream(); - - // Now internalize the contents of a HTTP request - // and create a SOAPMessage - SOAPMessage msg = fac.createMessage(headers, is); - - SOAPMessage reply = null; - reply = onMessage(msg); - - if (reply != null) { - - /* - * Need to call saveChanges because we're - * going to use the MimeHeaders to set HTTP - * response information. These MimeHeaders - * are generated as part of the save. - */ - if (reply.saveRequired()) { - reply.saveChanges(); - } - - resp.setStatus(HttpServletResponse.SC_OK); - putHeaders(reply.getMimeHeaders(), resp); - - // Write out the message on the response stream - OutputStream os = resp.getOutputStream(); - reply.writeTo(os); - os.flush(); - } else { - resp.setStatus( - HttpServletResponse.SC_NO_CONTENT); - } - } catch (Exception ex) { - throw new ServletException("SAAJ POST failed: " + - ex.getMessage()); - } - } - - static MimeHeaders getHeaders(HttpServletRequest req) { - - Enumeration enum = req.getHeaderNames(); - MimeHeaders headers = new MimeHeaders(); - - while (enum.hasMoreElements()) { - String headerName = (String)enum.nextElement(); - String headerValue = req.getHeader(headerName); - - StringTokenizer values = - new StringTokenizer(headerValue, ","); - while (values.hasMoreTokens()) { - headers.addHeader(headerName, - values.nextToken().trim()); - } - } - return headers; - } - - static void putHeaders(MimeHeaders headers, - HttpServletResponse res) { - - Iterator it = headers.getAllHeaders(); - while (it.hasNext()) { - MimeHeader header = (MimeHeader)it.next(); - - String[] values = headers.getHeader(header.getName()); - if (values.length == 1) { - res.setHeader(header.getName(), - header.getValue()); - } else { - StringBuffer concat = new StringBuffer(); - int i = 0; - while (i < values.length) { - if (i != 0) { - concat.append(','); - } - concat.append(values[i++]); - } - res.setHeader(header.getName(), concat.toString()); - } - } - } - - // This is the application code for handling the message. - - public SOAPMessage onMessage(SOAPMessage message) { - - SOAPMessage confirmation = null; - - try { - // Retrieve orderID from message received - SOAPBody sentSB = - message.getSOAPPart().getEnvelope().getBody(); - Iterator sentIt = sentSB.getChildElements(); - SOAPBodyElement sentSBE = - (SOAPBodyElement)sentIt.next(); - Iterator sentIt2 = sentSBE.getChildElements(); - SOAPElement sentSE = (SOAPElement)sentIt2.next(); - - // Get the orderID text to put in confirmation - String sentID = sentSE.getValue(); - - // Create the confirmation message - confirmation = fac.createMessage(); - SOAPPart sp = confirmation.getSOAPPart(); - SOAPEnvelope env = sp.getEnvelope(); - SOAPBody sb = env.getBody(); - - Name newBodyName = env.createName("confirmation", - "Confirm", "http://sonata.coffeebreak.com"); - SOAPBodyElement confirm = - sb.addBodyElement(newBodyName); - - // Create the orderID element for confirmation - Name newOrderIDName = env.createName("orderId"); - SOAPElement newOrderNo = - confirm.addChildElement(newOrderIDName); - newOrderNo.addTextNode(sentID); - - // Create ship-date element - Name shipDateName = env.createName("ship-date"); - SOAPElement shipDate = - confirm.addChildElement(shipDateName); - - // Create the shipping date - Date today = new Date(); - long msPerDay = 1000 * 60 * 60 * 24; - long msTarget = today.getTime(); - long msSum = msTarget + (msPerDay * 2); - Date result = new Date(); - result.setTime(msSum); - String sd = result.toString(); - shipDate.addTextNode(sd); - - confirmation.saveChanges(); - - } catch (Exception ex) { - ex.printStackTrace(); - } - return confirmation; - } -} - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/OrderRequest.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/OrderRequest.java deleted file mode 100644 index 66c37d3c03c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/OrderRequest.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.net.*; -import java.io.*; -import java.util.*; -import java.text.SimpleDateFormat; -import java.math.BigDecimal; - -import jakarta.xml.soap.*; - -public class OrderRequest { - String url; - - public OrderRequest(String url){ - this.url = url; - } - - public ConfirmationBean placeOrder(OrderBean orderBean) { - ConfirmationBean cb = null; - - try { - SOAPConnectionFactory scf = - SOAPConnectionFactory.newInstance(); - SOAPConnection con = scf.createConnection(); - - MessageFactory mf = MessageFactory.newInstance(); - SOAPMessage msg = mf.createMessage(); - - // Access the SOAPBody object - SOAPPart part = msg.getSOAPPart(); - SOAPEnvelope envelope = part.getEnvelope(); - SOAPBody body = envelope.getBody(); - - // Create the appropriate elements and add them - Name bodyName = envelope.createName("coffee-order", "PO", - "http://sonata.coffeebreak.com"); - SOAPBodyElement order = body.addBodyElement(bodyName); - - // orderID - Name orderIDName = envelope.createName("orderID"); - SOAPElement orderID = order.addChildElement(orderIDName); - orderID.addTextNode(orderBean.getId()); - - // customer - Name childName = envelope.createName("customer"); - SOAPElement customer = order.addChildElement(childName); - - childName = envelope.createName("last-name"); - SOAPElement lastName = customer.addChildElement(childName); - lastName.addTextNode(orderBean.getCustomer().getLastName()); - - childName = envelope.createName("first-name"); - SOAPElement firstName = customer.addChildElement(childName); - firstName.addTextNode(orderBean.getCustomer().getFirstName()); - - childName = envelope.createName("phone-number"); - SOAPElement phoneNumber = customer.addChildElement(childName); - phoneNumber.addTextNode( - orderBean.getCustomer().getPhoneNumber()); - - childName = envelope.createName("email-address"); - SOAPElement emailAddress = - customer.addChildElement(childName); - emailAddress.addTextNode( - orderBean.getCustomer().getEmailAddress()); - - // address - childName = envelope.createName("address"); - SOAPElement address = order.addChildElement(childName); - - childName = envelope.createName("street"); - SOAPElement street = address.addChildElement(childName); - street.addTextNode(orderBean.getAddress().getStreet()); - - childName = envelope.createName("city"); - SOAPElement city = address.addChildElement(childName); - city.addTextNode(orderBean.getAddress().getCity()); - - childName = envelope.createName("state"); - SOAPElement state = address.addChildElement(childName); - state.addTextNode(orderBean.getAddress().getState()); - - childName = envelope.createName("zip"); - SOAPElement zip = address.addChildElement(childName); - zip.addTextNode(orderBean.getAddress().getZip()); - - LineItemBean[] lineItems=orderBean.getLineItems(); - for (int i=0;i < lineItems.length;i++) { - LineItemBean lib = lineItems[i]; - - childName = envelope.createName("line-item"); - SOAPElement lineItem = order.addChildElement(childName); - - childName = envelope.createName("coffeeName"); - SOAPElement coffeeName = - lineItem.addChildElement(childName); - coffeeName.addTextNode(lib.getCoffeeName()); - - childName = envelope.createName("pounds"); - SOAPElement pounds = lineItem.addChildElement(childName); - pounds.addTextNode(lib.getPounds().toString()); - - childName = envelope.createName("price"); - SOAPElement price = lineItem.addChildElement(childName); - price.addTextNode(lib.getPrice().toString()); - } - - // total - childName = envelope.createName("total"); - SOAPElement total = - order.addChildElement(childName); - total.addTextNode(orderBean.getTotal().toString()); - - URL endpoint = new URL(url); - SOAPMessage reply = con.call(msg, endpoint); - con.close(); - - // Extract content of reply - // Extract order ID and ship date - SOAPBody sBody = reply.getSOAPPart().getEnvelope().getBody(); - Iterator bodyIt = sBody.getChildElements(); - SOAPBodyElement sbEl = (SOAPBodyElement)bodyIt.next(); - Iterator bodyIt2 = sbEl.getChildElements(); - - // Get orderID - SOAPElement ID = (SOAPElement)bodyIt2.next(); - String id = ID.getValue(); - - // Get ship date - SOAPElement sDate = (SOAPElement)bodyIt2.next(); - String shippingDate = sDate.getValue(); - SimpleDateFormat df = - new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy"); - Date date = df.parse(shippingDate); - Calendar cal = new GregorianCalendar(); - cal.setTime(date); - cb = new ConfirmationBean(id, cal); - } catch(Exception e) { - e.printStackTrace(); - } - return cb; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListRequest.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListRequest.java deleted file mode 100644 index 8febd3579fa..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListRequest.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import jakarta.xml.soap.*; -import java.util.*; -import java.math.BigDecimal; - -import java.net.*; - -public class PriceListRequest { - String url; - - public PriceListRequest(String url){ - this.url = url; - } - - public PriceListBean getPriceList() { - PriceListBean plb = null; - try { - SOAPConnectionFactory scf = - SOAPConnectionFactory.newInstance(); - SOAPConnection con = scf.createConnection(); - - MessageFactory mf = MessageFactory.newInstance(); - SOAPMessage msg = mf.createMessage(); - - // Access the SOAPBody object - SOAPPart part = msg.getSOAPPart(); - SOAPEnvelope envelope = part.getEnvelope(); - SOAPBody body = envelope.getBody(); - - // Create SOAPBodyElement request - Name bodyName = envelope.createName("request-prices", - "RequestPrices", "http://sonata.coffeebreak.com"); - SOAPBodyElement requestPrices = - body.addBodyElement(bodyName); - - Name requestName = envelope.createName("request"); - SOAPElement request = - requestPrices.addChildElement(requestName); - request.addTextNode("Send updated price list."); - - msg.saveChanges(); - - // Create the endpoint and send the message - URL endpoint = new URL(url); - SOAPMessage response = con.call(msg, endpoint); - con.close(); - - // Get contents of response - - Vector list = new Vector(); - - SOAPBody responseBody = - response.getSOAPPart().getEnvelope().getBody(); - Iterator it1 = responseBody.getChildElements(); - - // Get price-list element - while (it1.hasNext()) { - SOAPBodyElement bodyEl = (SOAPBodyElement)it1.next(); - Iterator it2 = bodyEl.getChildElements(); - // Get coffee elements - while (it2.hasNext()) { - SOAPElement child2 = (SOAPElement)it2.next(); - Iterator it3 = child2.getChildElements(); - // get coffee-name and price elements - while (it3.hasNext()) { - SOAPElement child3 = (SOAPElement)it3.next(); - String value = child3.getValue(); - list.addElement(value); - } - } - } - - ArrayList items = new ArrayList(); - for (int i = 0; i < list.size(); i = i + 2) { - items.add( - new PriceItemBean(list.elementAt(i).toString(), - new BigDecimal(list.elementAt(i + 1).toString()))); - System.out.print(list.elementAt(i) + " "); - System.out.println(list.elementAt(i + 1)); - } - - PriceItemBean[] priceItems = new PriceItemBean[items.size()]; - int i=0; - for (Iterator it=items.iterator(); it.hasNext(); ) { - priceItems[i] = (PriceItemBean)it.next(); - i++; - } - Date today = new Date(); - Date endDate = DateHelper.addDays(today, 30); - Calendar todayCal = new GregorianCalendar(); - todayCal.setTime(today); - Calendar cal = new GregorianCalendar(); - cal.setTime(endDate); - plb = new PriceListBean(); - plb.setStartDate(todayCal); - plb.setPriceItems(priceItems); - plb.setEndDate(cal); - } catch (Exception ex) { - ex.printStackTrace(); - } - return plb; - } -} - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListServlet.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListServlet.java deleted file mode 100644 index adc284223ad..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListServlet.java +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import jakarta.xml.soap.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; - -import javax.xml.transform.*; - -import java.util.*; -import java.io.*; - -public class PriceListServlet extends HttpServlet { - static MessageFactory fac = null; - - static { - try { - fac = MessageFactory.newInstance(); - } catch (Exception ex) { - ex.printStackTrace(); - } - }; - - public void init(ServletConfig servletConfig) - throws ServletException { - super.init(servletConfig); - } - - public void doPost(HttpServletRequest req, - HttpServletResponse resp) - throws ServletException, IOException { - try { - // Get all the headers from the HTTP request - MimeHeaders headers = getHeaders(req); - - // Get the body of the HTTP request - InputStream is = req.getInputStream(); - - // Now internalize the contents of the HTTP request - // and create a SOAPMessage - SOAPMessage msg = fac.createMessage(headers, is); - - SOAPMessage reply = null; - reply = onMessage(msg); - - if (reply != null) { - - /* - * Need to call saveChanges because we're - * going to use the MimeHeaders to set HTTP - * response information. These MimeHeaders - * are generated as part of the save. - */ - if (reply.saveRequired()) { - reply.saveChanges(); - } - - resp.setStatus(HttpServletResponse.SC_OK); - putHeaders(reply.getMimeHeaders(), resp); - - // Write out the message on the response stream - OutputStream os = resp.getOutputStream(); - reply.writeTo(os); - os.flush(); - } else { - resp.setStatus( - HttpServletResponse.SC_NO_CONTENT); - } - } catch (Exception ex) { - throw new ServletException("SAAJ POST failed: " + - ex.getMessage()); - } - } - - static MimeHeaders getHeaders(HttpServletRequest req) { - - Enumeration enum = req.getHeaderNames(); - MimeHeaders headers = new MimeHeaders(); - - while (enum.hasMoreElements()) { - String headerName = (String)enum.nextElement(); - String headerValue = req.getHeader(headerName); - - StringTokenizer values = - new StringTokenizer(headerValue, ","); - while (values.hasMoreTokens()) { - headers.addHeader(headerName, - values.nextToken().trim()); - } - } - return headers; - } - - static void putHeaders(MimeHeaders headers, - HttpServletResponse res) { - - Iterator it = headers.getAllHeaders(); - while (it.hasNext()) { - MimeHeader header = (MimeHeader)it.next(); - - String[] values = headers.getHeader(header.getName()); - if (values.length == 1) { - res.setHeader(header.getName(), - header.getValue()); - } else { - StringBuffer concat = new StringBuffer(); - int i = 0; - while (i < values.length) { - if (i != 0) { - concat.append(','); - } - concat.append(values[i++]); - } - res.setHeader(header.getName(), concat.toString()); - } - } - } - - // This is the application code for responding to the message. - - public SOAPMessage onMessage(SOAPMessage msg) { - SOAPMessage message = null; - try { - // create price list message - message = fac.createMessage(); - - // Access the SOAPBody object - SOAPPart part = message.getSOAPPart(); - SOAPEnvelope envelope = part.getEnvelope(); - SOAPBody body = envelope.getBody(); - - // Create the appropriate elements and add them - - Name bodyName = envelope.createName("price-list", - "PriceList", "http://sonata.coffeebreak.com"); - SOAPBodyElement list = body.addBodyElement(bodyName); - - // coffee - Name coffeeN = envelope.createName("coffee"); - SOAPElement coffee = list.addChildElement(coffeeN); - - Name coffeeNm1 = envelope.createName("coffee-name"); - SOAPElement coffeeName = - coffee.addChildElement(coffeeNm1); - coffeeName.addTextNode("Arabica"); - - Name priceName1 = envelope.createName("price"); - SOAPElement price1 = - coffee.addChildElement(priceName1); - price1.addTextNode("4.50"); - - Name coffeeNm2 = envelope.createName("coffee-name"); - SOAPElement coffeeName2 = - coffee.addChildElement(coffeeNm2); - coffeeName2.addTextNode("Espresso"); - - Name priceName2 = envelope.createName("price"); - SOAPElement price2 = - coffee.addChildElement(priceName2); - price2.addTextNode("5.00"); - - Name coffeeNm3 = envelope.createName("coffee-name"); - SOAPElement coffeeName3 = - coffee.addChildElement(coffeeNm3); - coffeeName3.addTextNode("Dorada"); - - Name priceName3 = envelope.createName("price"); - SOAPElement price3 = - coffee.addChildElement(priceName3); - price3.addTextNode("6.00"); - - Name coffeeNm4 = envelope.createName("coffee-name"); - SOAPElement coffeeName4 = - coffee.addChildElement(coffeeNm4); - coffeeName4.addTextNode("House Blend"); - - Name priceName4 = envelope.createName("price"); - SOAPElement price4 = - coffee.addChildElement(priceName4); - price4.addTextNode("5.00"); - - message.saveChanges(); - - } catch(Exception e) { - e.printStackTrace(); - } - return message; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestOrderRequest.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestOrderRequest.java deleted file mode 100644 index 760be0e71b3..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestOrderRequest.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.net.*; -import java.io.*; -import java.util.*; - -import jakarta.xml.soap.*; - -public class TestOrderRequest { - public static void main(String [] args) { - try { - SOAPConnectionFactory scf = SOAPConnectionFactory.newInstance(); - SOAPConnection con = scf.createConnection(); - - MessageFactory mf = MessageFactory.newInstance(); - - SOAPMessage msg = mf.createMessage(); - - // Access the SOABBody object - SOAPPart part = msg.getSOAPPart(); - SOAPEnvelope envelope = part.getEnvelope(); - SOAPBody body = envelope.getBody(); - - // Create the appropriate elements and add them - - Name bodyName = envelope.createName("coffee-order", "PO", - "http://sonata.coffeebreak.com"); - SOAPBodyElement order = body.addBodyElement(bodyName); - - // orderID - Name orderIDName = envelope.createName("orderID"); - SOAPElement orderID = - order.addChildElement(orderIDName); - orderID.addTextNode("1234"); - - // customer - Name childName = envelope.createName("customer"); - SOAPElement customer = order.addChildElement(childName); - - childName = envelope.createName("last-name"); - SOAPElement lastName = customer.addChildElement(childName); - lastName.addTextNode("Pental"); - - childName = envelope.createName("first-name"); - SOAPElement firstName = customer.addChildElement(childName); - firstName.addTextNode("Ragni"); - - childName = envelope.createName("phone-number"); - SOAPElement phoneNumber = customer.addChildElement(childName); - phoneNumber.addTextNode("908 983-6789"); - - childName = envelope.createName("email-address"); - SOAPElement emailAddress = - customer.addChildElement(childName); - emailAddress.addTextNode("ragnip@aol.com"); - - // address - childName = envelope.createName("address"); - SOAPElement address = order.addChildElement(childName); - - childName = envelope.createName("street"); - SOAPElement street = address.addChildElement(childName); - street.addTextNode("9876 Central Way"); - - childName = envelope.createName("city"); - SOAPElement city = address.addChildElement(childName); - city.addTextNode("Rainbow"); - - childName = envelope.createName("state"); - SOAPElement state = address.addChildElement(childName); - state.addTextNode("CA"); - - childName = envelope.createName("zip"); - SOAPElement zip = address.addChildElement(childName); - zip.addTextNode("99999"); - - // line-item 1 - childName = envelope.createName("line-item"); - SOAPElement lineItem = order.addChildElement(childName); - - childName = envelope.createName("coffeeName"); - SOAPElement coffeeName = lineItem.addChildElement(childName); - coffeeName.addTextNode("arabica"); - - childName = envelope.createName("pounds"); - SOAPElement pounds = lineItem.addChildElement(childName); - pounds.addTextNode("2"); - - childName = envelope.createName("price"); - SOAPElement price = lineItem.addChildElement(childName); - price.addTextNode("10.95"); - - // line-item 2 - childName = envelope.createName("coffee-name"); - SOAPElement coffeeName2 = lineItem.addChildElement(childName); - coffeeName2.addTextNode("espresso"); - - childName = envelope.createName("pounds"); - SOAPElement pounds2 = lineItem.addChildElement(childName); - pounds2.addTextNode("3"); - - childName = envelope.createName("price"); - SOAPElement price2 = lineItem.addChildElement(childName); - price2.addTextNode("10.95"); - - // total - childName = envelope.createName("total"); - SOAPElement total = order.addChildElement(childName); - total.addTextNode("21.90"); - - URL endpoint = new URL( - URLHelper.getSaajURL() + "/orderCoffee"); - SOAPMessage reply = con.call(msg, endpoint); - con.close(); - - // extract content of reply - //Extracting order ID and ship date - SOAPBody sBody = reply.getSOAPPart().getEnvelope().getBody(); - Iterator bodyIt = sBody.getChildElements(); - SOAPBodyElement sbEl = (SOAPBodyElement)bodyIt.next(); - Iterator bodyIt2 = sbEl.getChildElements(); - - // get orderID - SOAPElement ID = (SOAPElement)bodyIt2.next(); - String id = ID.getValue(); - - // get ship date - SOAPElement sDate = (SOAPElement)bodyIt2.next(); - String shippingDate = sDate.getValue(); - - System.out.println(""); - System.out.println(""); - System.out.println("Confirmation for order #" + id); - System.out.print("Your order will be shipped on "); - System.out.println(shippingDate); - } catch(Exception e) { - e.printStackTrace(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestPriceListRequest.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestPriceListRequest.java deleted file mode 100644 index 5ef7036dd9f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestPriceListRequest.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import jakarta.xml.soap.*; -import java.util.*; - -import java.net.*; - -public class TestPriceListRequest { - - public static void main(String [] args) { - - try { - SOAPConnectionFactory scf = - SOAPConnectionFactory.newInstance(); - SOAPConnection con = scf.createConnection(); - - MessageFactory mf = MessageFactory.newInstance(); - SOAPMessage msg = mf.createMessage(); - - // Access the SOABBody object - SOAPPart part = msg.getSOAPPart(); - SOAPEnvelope envelope = part.getEnvelope(); - SOAPBody body = envelope.getBody(); - - // create SOAPBodyElement request - Name bodyName = envelope.createName("request-prices", - "RequestPrices", "http://sonata.coffeebreak.com"); - SOAPBodyElement requestPrices = - body.addBodyElement(bodyName); - - Name requestName = envelope.createName("request"); - SOAPElement request = - requestPrices.addChildElement(requestName); - request.addTextNode("Send updated price list."); - - msg.saveChanges(); - - // create the endpoint and send the message - URL endpoint = new URL( - URLHelper.getSaajURL() + "/getPriceList"); - SOAPMessage response = con.call(msg, endpoint); - con.close(); - - // get contents of response - Vector list = new Vector(); - - SOAPBody responseBody = - response.getSOAPPart().getEnvelope().getBody(); - Iterator it1 = responseBody.getChildElements(); - // get price-list element - while (it1.hasNext()) { - SOAPBodyElement bodyEl = (SOAPBodyElement)it1.next(); - Iterator it2 = bodyEl.getChildElements(); - // get coffee elements - while (it2.hasNext()) { - SOAPElement child2 = (SOAPElement)it2.next(); - Iterator it3 = child2.getChildElements(); - // get coffee-name and price elements - while (it3.hasNext()) { - SOAPElement child3 = (SOAPElement)it3.next(); - String value = child3.getValue(); - list.addElement(value); - } - } - } - for (int i = 0; i < list.size(); i = i + 2) { - System.out.print(list.elementAt(i) + " "); - System.out.println(list.elementAt(i + 1)); - } - } catch (Exception ex) { - ex.printStackTrace(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.properties deleted file mode 100644 index d50416da5a6..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.properties +++ /dev/null @@ -1,22 +0,0 @@ - - - -build=build -src=src -common=../common/build diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.xml deleted file mode 100644 index e7919303515..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - -]> - - - - - - - - - - &targets; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/CheckoutFormBean.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/CheckoutFormBean.java deleted file mode 100644 index 69a3240a1f8..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/CheckoutFormBean.java +++ /dev/null @@ -1,328 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.math.BigDecimal; -import java.util.*; - -public class CheckoutFormBean { - private String firstName; - private String lastName; - private String email; - private String areaCode; - private String phoneNumber; - private String street; - private String city; - private String state; - private String zip; - private int CCOption; - private String CCNumber; - private HashMap errors; - private ShoppingCart cart; - private RetailPriceList rpl; - private OrderConfirmations ocs; - private ResourceBundle messages; - - - public boolean validate() { - boolean allOk=true; - if (firstName.equals("")) { - errors.put("firstName",messages.getString("FirstNameError")); - firstName=""; - allOk=false; - } else { - errors.put("firstName",""); - } - - if (lastName.equals("")) { - errors.put("lastName",messages.getString("LastNameError")); - lastName=""; - allOk=false; - } else { - errors.put("lastName",""); - } - - if (email.equals("") || (email.indexOf('@') == -1)) { - errors.put("email",messages.getString("EMailError")); - email=""; - allOk=false; - } else { - errors.put("email",""); - } - - if (areaCode.equals("")) { - errors.put("areaCode",messages.getString("AreaCodeError")); - areaCode=""; - allOk=false; - } else { - errors.put("areaCode",""); - } - - if (phoneNumber.equals("")) { - errors.put("phoneNumber",messages.getString("PhoneNumberError")); - phoneNumber=""; - allOk=false; - } else { - errors.put("phoneNumber",""); - } - - if (street.equals("")) { - errors.put("street",messages.getString("StreetError")); - street=""; - allOk=false; - } else { - errors.put("street",""); - } - - if (city.equals("")) { - errors.put("city",messages.getString("CityError")); - city=""; - allOk=false; - } else { - errors.put("city",""); - } - - if (state.equals("")) { - errors.put("state",messages.getString("StateError")); - state=""; - allOk=false; - } else { - errors.put("state",""); - } - - if (zip.equals("") || zip.length() !=5 ) { - errors.put("zip",messages.getString("ZipError")); - zip=""; - allOk=false; - } else { - try { - int x = Integer.parseInt(zip); - errors.put("zip",""); - } catch (NumberFormatException e) { - errors.put("zip",messages.getString("ZipError")); - zip=""; - allOk=false; - } - } - - if (CCNumber.equals("")) { - errors.put("CCNumber",messages.getString("CCNumberError")); - CCNumber=""; - allOk=false; - } else { - errors.put("CCNumber",""); - } - - ocs.clear(); - - ConfirmationBean confirmation = null; - - if (allOk) { - String orderId = CCNumber; - - AddressBean address = - new AddressBean(street, city, state, zip); - CustomerBean customer = - new CustomerBean(firstName, lastName, - "(" + areaCode+ ") " + phoneNumber, email); - - for (Iterator d = rpl.getDistributors().iterator(); - d.hasNext(); ) { - String distributor = (String)d.next(); - System.out.println(distributor); - ArrayList lis = new ArrayList(); - BigDecimal price = new BigDecimal("0.00"); - BigDecimal total = new BigDecimal("0.00"); - for (Iterator c = cart.getItems().iterator(); - c.hasNext(); ) { - ShoppingCartItem sci = (ShoppingCartItem) c.next(); - if ((sci.getItem().getDistributor()). - equals(distributor) && - sci.getPounds().floatValue() > 0) { - price = sci.getItem().getWholesalePricePerPound(). - multiply(sci.getPounds()); - total = total.add(price); - LineItemBean li = new LineItemBean( - sci.getItem().getCoffeeName(), sci.getPounds(), - sci.getItem().getWholesalePricePerPound()); - lis.add(li); - } - } - - LineItemBean[] lineItems = new LineItemBean[lis.size()]; - int i=0; - for(Iterator j = lis.iterator(); j.hasNext();) { - lineItems[i] = (LineItemBean)j.next(); - i++; - } - - if (lineItems.length != 0) { - OrderBean order = new OrderBean(address, customer, - orderId, lineItems, total); - - String SAAJOrderURL = - URLHelper.getSaajURL() + "/orderCoffee"; - if (distributor.equals(SAAJOrderURL)) { - OrderRequest or = new OrderRequest(SAAJOrderURL); - confirmation = or.placeOrder(order); - } - else { - OrderCaller ocaller = new OrderCaller(distributor); - confirmation = ocaller.placeOrder(order); - } - OrderConfirmation oc = - new OrderConfirmation(order, confirmation); - ocs.add(oc); - } - } - } - return allOk; - } - - public HashMap getErrors() { - return errors; - } - - public String getErrorMsg(String s) { - String errorMsg =(String)errors.get(s.trim()); - return (errorMsg == null) ? "":errorMsg; - } - - public CheckoutFormBean(ShoppingCart cart, RetailPriceList rpl, ResourceBundle messages) { - firstName=""; - lastName=""; - email=""; - areaCode=""; - phoneNumber=""; - street=""; - city=""; - state=""; - zip=""; - CCOption=0; - CCNumber=""; - errors = new HashMap(); - this.cart = cart; - this.rpl = rpl; - this.messages = messages; - ocs = new OrderConfirmations(); - } - - public String getFirstName() { - return firstName; - } - - public String getLastName() { - return lastName; - } - - public String getEmail() { - return email; - } - - public String getZip() { - return zip; - } - - public String getAreaCode() { - return areaCode; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public String getStreet() { - return street; - } - - public String getCity() { - return city; - } - - public String getState() { - return state; - } - - - public int getCCOption() { - return CCOption; - } - - - public String getCCNumber() { - return CCNumber; - } - - - public OrderConfirmations getOrderConfirmations() { - return ocs; - } - - public void setMessages(ResourceBundle messages) { - this.messages=messages; - } - - public void setFirstName(String firstname) { - this.firstName=firstname; - } - - public void setLastName(String lastname) { - this.lastName=lastname; - } - - public void setEmail(String email) { - this.email=email; - } - - public void setZip(String zip) { - this.zip=zip; - } - - public void setAreaCode(String areaCode) { - this.areaCode=areaCode ; - } - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber=phoneNumber ; - } - - public void setStreet(String street) { - this.street=street ; - } - - public void setCity(String city) { - this.city=city ; - } - - public void setState(String state) { - this.state=state ; - } - - public void setCCOption(int CCOption) { - this.CCOption=CCOption ; - } - public void setCCNumber(String CCNumber) { - this.CCNumber=CCNumber ; - } - - public void setErrors(String key, String msg) { - errors.put(key,msg); - } - -} - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/Dispatcher.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/Dispatcher.java deleted file mode 100644 index 7fb47476eaa..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/Dispatcher.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import jakarta.servlet.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.math.BigDecimal; - -public class Dispatcher extends HttpServlet { - public void doGet(HttpServletRequest request, HttpServletResponse response) { - HttpSession session = request.getSession(); - ResourceBundle messages = (ResourceBundle)session.getAttribute("messages"); - if (messages == null) { - Locale locale=request.getLocale(); - messages = ResourceBundle.getBundle("com.sun.cb.messages.CBMessages", locale); - session.setAttribute("messages", messages); - } - - ServletContext context = getServletContext(); - RetailPriceList rpl = (RetailPriceList)context.getAttribute("retailPriceList"); - if (rpl == null) { - try { - rpl = new RetailPriceList(); - context.setAttribute("retailPriceList", rpl); - } catch (Exception ex) { - context.log("Couldn't create price list: " + ex.getMessage()); - } - } - ShoppingCart cart = (ShoppingCart)session.getAttribute("cart"); - if (cart == null) { - cart = new ShoppingCart(rpl); - session.setAttribute("cart", cart); - } - - - String selectedScreen = request.getServletPath(); - if (selectedScreen.equals("/checkoutForm")) { - CheckoutFormBean checkoutFormBean = new CheckoutFormBean(cart, rpl, messages); - - request.setAttribute("checkoutFormBean", checkoutFormBean); - try { - checkoutFormBean.setFirstName(request.getParameter("firstName")); - checkoutFormBean.setLastName(request.getParameter("lastName")); - checkoutFormBean.setEmail(request.getParameter("email")); - checkoutFormBean.setAreaCode(request.getParameter("areaCode")); - checkoutFormBean.setPhoneNumber(request.getParameter("phoneNumber")); - checkoutFormBean.setStreet(request.getParameter("street")); - checkoutFormBean.setCity(request.getParameter("city")); - checkoutFormBean.setState(request.getParameter("state")); - checkoutFormBean.setZip(request.getParameter("zip")); - checkoutFormBean.setCCNumber(request.getParameter("CCNumber")); - checkoutFormBean.setCCOption(Integer.parseInt(request.getParameter("CCOption"))); - } catch (NumberFormatException e) { - // not possible - } - } - try { - request.getRequestDispatcher("/template/template.jsp").forward(request, response); - } catch(Exception ex) { - ex.printStackTrace(); - } - } - public void doPost(HttpServletRequest request, HttpServletResponse response) { - HttpSession session = request.getSession(); - ResourceBundle messages = (ResourceBundle)session.getAttribute("messages"); - String selectedScreen = request.getServletPath(); - ServletContext context = getServletContext(); - - RetailPriceList rpl = (RetailPriceList)context.getAttribute("retailPriceList"); - if (rpl == null) { - try { - rpl = new RetailPriceList(); - context.setAttribute("retailPriceList", rpl); - } catch (Exception ex) { - context.log("Couldn't create price list: " + ex.getMessage()); - } - } - ShoppingCart cart = (ShoppingCart)session.getAttribute("cart"); - if (cart == null ) { - cart = new ShoppingCart(rpl); - session.setAttribute("cart", cart); - } - - if (selectedScreen.equals("/orderForm")) { - cart.clear(); - for(Iterator i = rpl.getItems().iterator(); i.hasNext(); ) { - RetailPriceItem item = (RetailPriceItem) i.next(); - String coffeeName = item.getCoffeeName(); - BigDecimal pounds = new BigDecimal(request.getParameter(coffeeName + "_pounds")); - BigDecimal price = item.getRetailPricePerPound().multiply(pounds).setScale(2, BigDecimal.ROUND_HALF_UP); - ShoppingCartItem sci = new ShoppingCartItem(item, pounds, price); - cart.add(sci); - } - - } else if (selectedScreen.equals("/checkoutAck")) { - CheckoutFormBean checkoutFormBean = new CheckoutFormBean(cart, rpl, messages); - - request.setAttribute("checkoutFormBean", checkoutFormBean); - try { - checkoutFormBean.setFirstName(request.getParameter("firstName")); - checkoutFormBean.setLastName(request.getParameter("lastName")); - checkoutFormBean.setEmail(request.getParameter("email")); - checkoutFormBean.setAreaCode(request.getParameter("areaCode")); - checkoutFormBean.setPhoneNumber(request.getParameter("phoneNumber")); - checkoutFormBean.setStreet(request.getParameter("street")); - checkoutFormBean.setCity(request.getParameter("city")); - checkoutFormBean.setState(request.getParameter("state")); - checkoutFormBean.setZip(request.getParameter("zip")); - checkoutFormBean.setCCNumber(request.getParameter("CCNumber")); - checkoutFormBean.setCCOption(Integer.parseInt(request.getParameter("CCOption"))); - } catch (NumberFormatException e) { - // not possible - } - if (!checkoutFormBean.validate()) { - try { - request.getRequestDispatcher("/checkoutForm.jsp").forward(request, response); - } catch(Exception e) { - e.printStackTrace(); - } - } - } - - try { - request.getRequestDispatcher("/template/template.jsp").forward(request, response); - } catch(Exception e) { - } - } -} - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/JAXRQueryByName.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/JAXRQueryByName.java deleted file mode 100644 index 177f44b9912..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/JAXRQueryByName.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import javax.xml.registry.*; -import javax.xml.registry.infomodel.*; -import java.net.*; -import java.util.*; - -/** - * The JAXRQueryByName class consists of a main method, a - * makeConnection method, an executeQuery method, and some - * helper methods. It searches a registry for - * information about organizations whose names contain a - * user-supplied string. - * - * To run this program, use the command - * - * ant -Dquery-string= run-query - * - * after starting Tomcat and Xindice. - */ -public class JAXRQueryByName { - static Connection connection = null; - - public JAXRQueryByName() {} - - public static void main(String[] args) { - String queryURL = URLHelper.getQueryURL(); - String publishURL = URLHelper.getPublishURL(); - - if (args.length < 1) { - System.out.println("Usage: ant " + - "-Dquery-string= run-query"); - System.exit(1); - } - String queryString = new String(args[0]); - System.out.println("Query string is " + queryString); - - JAXRQueryByName jq = new JAXRQueryByName(); - - connection = jq.makeConnection(queryURL, publishURL); - - jq.executeQuery(queryString); - } - - /** - * Establishes a connection to a registry. - * - * @param queryUrl the URL of the query registry - * @param publishUrl the URL of the publish registry - * @return the connection - */ - public Connection makeConnection(String queryUrl, - String publishUrl) { - - /* - * Edit to provide your own proxy information - * if you are going beyond your firewall. - * Host format: "host.subdomain.domain.com". - * Port is usually 8080. - * Leave blank to use Registry Server. - */ - String httpProxyHost = ""; - String httpProxyPort = ""; - - /* - * Define connection configuration properties. - * For simple queries, you need the query URL. - * To obtain the connection factory class, set a System - * property. - */ - Properties props = new Properties(); - props.setProperty("javax.xml.registry.queryManagerURL", - queryUrl); - props.setProperty("com.sun.xml.registry.http.proxyHost", - httpProxyHost); - props.setProperty("com.sun.xml.registry.http.proxyPort", - httpProxyPort); - - try { - // Create the connection, passing it the - // configuration properties - ConnectionFactory factory = - ConnectionFactory.newInstance(); - factory.setProperties(props); - connection = factory.createConnection(); - System.out.println("Created connection to registry"); - } catch (Exception e) { - e.printStackTrace(); - if (connection != null) { - try { - connection.close(); - } catch (JAXRException je) {} - } - } - return connection; - } - - /** - * Returns organizations containing a string. - * - * @param qString the string argument - * @return a collection of organizations - */ - public Collection executeQuery(String qString) { - RegistryService rs = null; - BusinessQueryManager bqm = null; - Collection orgs = null; - - try { - // Get registry service and query manager - rs = connection.getRegistryService(); - bqm = rs.getBusinessQueryManager(); - System.out.println("Got registry service and " + "query manager"); - - // Define find qualifiers and name patterns - Collection findQualifiers = new ArrayList(); - findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC); - Collection namePatterns = new ArrayList(); - // % still doesn't work - namePatterns.add(qString); - //namePatterns.add("%" + qString + "%"); - - // Find using the name - BulkResponse response = - bqm.findOrganizations(findQualifiers, - namePatterns, null, null, null, null); - orgs = response.getCollection(); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - - return orgs; - } - - /** - * Returns the name value for a registry object. - * - * @param ro a RegistryObject - * @return the String value - */ - public String getName(RegistryObject ro) - throws JAXRException { - - try { - return ro.getName().getValue(); - } catch (NullPointerException npe) { - return "No Name"; - } - } - - /** - * Returns the description value for a registry object. - * - * @param ro a RegistryObject - * @return the String value - */ - public String getDescription(RegistryObject ro) - throws JAXRException { - try { - return ro.getDescription().getValue(); - } catch (NullPointerException npe) { - return "No Description"; - } - } - - /** - * Returns the key id value for a registry object. - * - * @param ro a RegistryObject - * @return the String value - */ - public String getKey(RegistryObject ro) - throws JAXRException { - - try { - return ro.getKey().getId(); - } catch (NullPointerException npe) { - return "No Key"; - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmation.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmation.java deleted file mode 100644 index a95154964d1..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmation.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -public class OrderConfirmation { - - private OrderBean ob; - private ConfirmationBean cb; - - public OrderConfirmation(OrderBean ob, ConfirmationBean cb) { - this.ob = ob; - this.cb = cb; - } - - public OrderBean getOrderBean() { - return ob; - } - - public ConfirmationBean getConfirmationBean() { - return cb; - } -} - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmations.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmations.java deleted file mode 100644 index de66dcdc2d2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmations.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.util.*; - -public class OrderConfirmations { - ArrayList items = null; - - public OrderConfirmations() { - items = new ArrayList(); - } - - public synchronized void add(OrderConfirmation oc) { - items.add(oc); - } - - - public synchronized Collection getItems() { - return items; - } - - protected void finalize() throws Throwable { - items.clear(); - } - - public synchronized void clear() { - items.clear(); - } -} - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceItem.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceItem.java deleted file mode 100644 index 4818935dd86..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceItem.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.io.Serializable; -import java.math.BigDecimal; - -public class RetailPriceItem implements Serializable { - - private String coffeeName; - private BigDecimal wholesalePricePerPound; - private BigDecimal retailPricePerPound; - private String distributor; - - public RetailPriceItem() { - - this.coffeeName = null; - this.wholesalePricePerPound = new BigDecimal("0.00"); - this.retailPricePerPound = new BigDecimal("0.00"); - this.distributor = null; - } - - public RetailPriceItem(String coffeeName, BigDecimal wholesalePricePerPound, BigDecimal retailPricePerPound, String distributor) { - - this.coffeeName = coffeeName; - this.wholesalePricePerPound = wholesalePricePerPound; - this.retailPricePerPound = retailPricePerPound; - this.distributor = distributor; - } - - public String getCoffeeName() { - return coffeeName; - } - - public void setCoffeeName(String coffeeName) { - this.coffeeName = coffeeName; - } - - public BigDecimal getWholesalePricePerPound() { - return wholesalePricePerPound; - } - - public BigDecimal getRetailPricePerPound() { - return retailPricePerPound; - } - - public void setRetailPricePerPound(BigDecimal retailPricePerPound) { - this.retailPricePerPound = retailPricePerPound; - } - - public void setWholesalePricePerPound(BigDecimal wholesalePricePerPound) { - this.wholesalePricePerPound = wholesalePricePerPound; - } - public String getDistributor() { - return distributor; - } - - public void setDistributor(String distributor) { - this.distributor = distributor; - } -} - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceList.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceList.java deleted file mode 100644 index f0e3f35cafe..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceList.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.*; -import javax.xml.registry.*; -import javax.xml.registry.infomodel.*; - -public class RetailPriceList implements Serializable { - - private ArrayList retailPriceItems; - private ArrayList distributors; - - public RetailPriceList() { - String RegistryURL = URLHelper.getQueryURL(); - String RPCDistributor = "JAXRPCCoffeeDistributor"; - retailPriceItems = new ArrayList(); - distributors = new ArrayList(); - - JAXRQueryByName jq = new JAXRQueryByName(); - Connection connection = jq.makeConnection(RegistryURL, RegistryURL); - Collection orgs = jq.executeQuery(RPCDistributor); - Iterator orgIter = orgs.iterator(); - // Display organization information - try { - while (orgIter.hasNext()) { - Organization org = (Organization) orgIter.next(); - System.out.println("Org name: " + jq.getName(org)); - System.out.println("Org description: " + jq.getDescription(org)); - System.out.println("Org key id: " + jq.getKey(org)); - - // Display service and binding information - Collection services = org.getServices(); - Iterator svcIter = services.iterator(); - while (svcIter.hasNext()) { - Service svc = (Service) svcIter.next(); - System.out.println(" Service name: " + jq.getName(svc)); - System.out.println(" Service description: " + jq.getDescription(svc)); - Collection serviceBindings = svc.getServiceBindings(); - Iterator sbIter = serviceBindings.iterator(); - while (sbIter.hasNext()) { - ServiceBinding sb = (ServiceBinding) sbIter.next(); - String distributor = sb.getAccessURI(); - System.out.println(" Binding Description: " + jq.getDescription(sb)); - System.out.println(" Access URI: " + distributor); - - // Get price list from service at distributor URI - PriceListBean priceList = PriceFetcher.getPriceList(distributor); - - PriceItemBean[] items = priceList.getPriceItems(); - retailPriceItems = new ArrayList(); - distributors = new ArrayList(); - BigDecimal price = new BigDecimal("0.00"); - for (int i = 0; i < items.length; i++) { - price = items[i].getPricePerPound().multiply(new BigDecimal("1.35")).setScale(2, BigDecimal.ROUND_HALF_UP); - RetailPriceItem pi = new RetailPriceItem(items[i].getCoffeeName(), items[i].getPricePerPound(), price , distributor); - retailPriceItems.add(pi); - } - distributors.add(distributor); - } - } - // Print spacer between organizations - System.out.println(" --- "); - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - // At end, close connection to registry - if (connection != null) { - try { - connection.close(); - } catch (JAXRException je) {} - } - } - String SAAJPriceListURL = URLHelper.getSaajURL() + "/getPriceList"; - String SAAJOrderURL = URLHelper.getSaajURL() + "/orderCoffee"; - PriceListRequest plr = new PriceListRequest(SAAJPriceListURL); - PriceListBean priceList = plr.getPriceList();; - PriceItemBean[] priceItems = priceList.getPriceItems(); - for (int i = 0; i < priceItems.length; i++ ) { - PriceItemBean pib = priceItems[i]; - BigDecimal price = pib.getPricePerPound().multiply(new BigDecimal("1.35")).setScale(2, BigDecimal.ROUND_HALF_UP); - RetailPriceItem rpi = new RetailPriceItem(pib.getCoffeeName(), pib.getPricePerPound(), price, SAAJOrderURL); - retailPriceItems.add(rpi); - } - distributors.add(SAAJOrderURL); - } - - public ArrayList getItems() { - return retailPriceItems; - } - - public ArrayList getDistributors() { - return distributors; - } - - public void setItems(ArrayList priceItems) { - this.retailPriceItems = priceItems; - } - - public void setDistributors(ArrayList distributors) { - this.distributors = distributors; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceListServlet.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceListServlet.java deleted file mode 100644 index 417c4385f96..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceListServlet.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.io.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; - -/** - * This is a simple example of an HTTP Servlet. It responds to the GET - * method of the HTTP protocol. - */ -public class RetailPriceListServlet extends HttpServlet { - - public void doGet (HttpServletRequest request, - HttpServletResponse response) - throws ServletException, IOException { - - HttpSession session = request.getSession(); - ServletContext context = getServletContext(); - RetailPriceList rpl = new RetailPriceList(); - context.setAttribute("retailPriceList", rpl); - ShoppingCart cart = new ShoppingCart(rpl); - session.setAttribute("cart", cart); - - PrintWriter out = response.getWriter(); - - - // then write the data of the response - out.println("" + - "Reloaded price list." + ""); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCart.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCart.java deleted file mode 100644 index 2f71ed7cbb9..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCart.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.util.*; -import java.math.BigDecimal; -import com.sun.cb.RetailPriceList; -import com.sun.cb.RetailPriceItem; - -public class ShoppingCart { - ArrayList items = null; - BigDecimal total = new BigDecimal("0.00"); - int numberOfItems = 0; - - public ShoppingCart(RetailPriceList rpl) { - items = new ArrayList(); - - for(Iterator i = rpl.getItems().iterator(); i.hasNext(); ) { - RetailPriceItem item = (RetailPriceItem) i.next(); - ShoppingCartItem sci = new ShoppingCartItem(item, new BigDecimal("0.0"), new BigDecimal("0.00")); - items.add(sci); - numberOfItems++; - } - } - - public synchronized void add (ShoppingCartItem item) { - items.add(item); - total = total.add(item.getPrice()).setScale(2); - numberOfItems++; - } - - public synchronized int getNumberOfItems() { - return numberOfItems; - } - - public synchronized ArrayList getItems() { - return items; - } - - protected void finalize() throws Throwable { - items.clear(); - } - - public synchronized BigDecimal getTotal() { - return total; - } - - - public synchronized void clear() { - numberOfItems = 0; - total = new BigDecimal("0.00"); - items.clear(); - } -} - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCartItem.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCartItem.java deleted file mode 100644 index 3fe75134f82..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCartItem.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb; - -import java.math.BigDecimal; - -public class ShoppingCartItem { - RetailPriceItem item; - BigDecimal pounds; - BigDecimal price; - - - public ShoppingCartItem() {} - - public ShoppingCartItem(RetailPriceItem item, BigDecimal pounds, BigDecimal price) { - this.item = item; - this.pounds = pounds; - this.price = price; - } - - public void setItem(RetailPriceItem item) { - this.item = item; - } - - public void setPounds(BigDecimal pounds) { - this.pounds=pounds; - } - - public void setPrice(BigDecimal price) { - this.price=price; - } - - public RetailPriceItem getItem() { - return item; - } - - - public BigDecimal getPounds() { - return pounds; - } - - public BigDecimal getPrice() { - return price; - } -} - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/messages/CBMessages.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/messages/CBMessages.java deleted file mode 100644 index c48f7e6af04..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/messages/CBMessages.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb.messages; - -import java.util.*; - -public class CBMessages extends ListResourceBundle { - public Object[][] getContents() { - return contents; - } - - static final Object[][] contents = { - - {"ServerError", "Your request cannot be completed. The server got the following error: "}, - {"TitleServerError", "Server Error"}, - {"TitleOrderForm", "Order Form"}, - {"TitleCheckoutForm", "Checkout Form"}, - {"TitleCheckoutAck", "Confirmation"}, - {"OrderInstructions", "Enter the amount of coffee and click Update to update the totals.
Click Checkout to proceed with your order. "}, - {"OrderForm", "OrderForm"}, - {"Price", "Price"}, - {"Quantity", "Quantity"}, - {"Total", "Total"}, - {"Update", "Update"}, - {"Checkout", "Checkout"}, - {"CheckoutInstructions", "To complete your order, fill in the form and click Submit."}, - {"YourOrder", "Your order totals "}, - {"CheckoutForm", "Checkout Form"}, - {"FirstName", "First Name"}, - {"FirstNameError", "Please enter your first name."}, - {"LastName", "Last Name"}, - {"LastNameError", "Please enter your last name."}, - {"EMail", " E-Mail"}, - {"EMailError", "Please enter a valid e-mail address."}, - {"PhoneNumber", "Phone Number"}, - {"AreaCodeError", "Please enter your area code."}, - {"PhoneNumberError", "Please enter your phone number."}, - {"Street", "Street"}, - {"StreetError", "Please enter your street."}, - {"City", "City"}, - {"CityError", "Please enter your city."}, - {"State", "State"}, - {"StateError", "Please enter your state."}, - {"Zip", "Zip"}, - {"ZipError", "Please enter a valid zip code."}, - {"CCOption", "Credit Card"}, - {"CCNumber", "Credit Card Number"}, - {"CCNumberError", "Please enter your credit card number."}, - {"Submit", "Submit"}, - {"Reset", "Reset"}, - {"ItemPrice", "Price"}, - {"OrderConfirmed", "Your order has been confirmed."}, - {"ShipDate", "Ship Date"}, - {"Items", "Items"}, - {"Coffee", "Coffee"}, - {"Pounds", "Pounds"}, - {"ContinueShopping", "Continue Shopping"} - }; -} - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/messages/CBMessages_en.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/messages/CBMessages_en.java deleted file mode 100644 index 084e088a686..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/messages/CBMessages_en.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.cb.messages; - -import java.util.*; - -public class CBMessages_en extends ListResourceBundle { - public Object[][] getContents() { - return contents; - } - - static final Object[][] contents = { - - {"ServerError", "Your request cannot be completed. The server got the following error: "}, - {"TitleServerError", "Server Error"}, - {"TitleOrderForm", "Order Form"}, - {"TitleCheckoutForm", "Checkout Form"}, - {"TitleCheckoutAck", "Confirmation"}, - {"OrderInstructions", "Enter the amount of coffee and click Update to update the totals.
Click Checkout to proceed with your order. "}, - {"OrderForm", "OrderForm"}, - {"Price", "Price"}, - {"Quantity", "Quantity"}, - {"Total", "Total"}, - {"Update", "Update"}, - {"Checkout", "Checkout"}, - {"CheckoutInstructions", "To complete your order, fill in the form and click Submit."}, - {"YourOrder", "Your order totals "}, - {"CheckoutForm", "Checkout Form"}, - {"FirstName", "First Name"}, - {"FirstNameError", "Please enter your first name."}, - {"LastName", "Last Name"}, - {"LastNameError", "Please enter your last name."}, - {"EMail", " E-Mail"}, - {"EMailError", "Please enter a valid e-mail address."}, - {"PhoneNumber", "Phone Number"}, - {"AreaCodeError", "Please enter your area code."}, - {"PhoneNumberError", "Please enter your phone number."}, - {"Street", "Street"}, - {"StreetError", "Please enter your street."}, - {"City", "City"}, - {"CityError", "Please enter your city."}, - {"State", "State"}, - {"StateError", "Please enter your state."}, - {"Zip", "Zip"}, - {"ZipError", "Please enter a valid zip code."}, - {"CCOption", "Credit Card"}, - {"CCNumber", "Credit Card Number"}, - {"CCNumberError", "Please enter your credit card number."}, - {"Submit", "Submit"}, - {"Reset", "Reset"}, - {"ItemPrice", "Price"}, - {"OrderConfirmed", "Your order has been confirmed."}, - {"ShipDate", "Ship Date"}, - {"Items", "Items"}, - {"Coffee", "Coffee"}, - {"Pounds", "Pounds"}, - {"ContinueShopping", "Continue Shopping"} - }; -} - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Debug.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Debug.java deleted file mode 100644 index d339c00942a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Debug.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package template; - -public final class Debug { - - public static final boolean debuggingOn = true; - - public static void print(String msg) { - if (debuggingOn) { - System.err.print(msg); - } - } - - public static void println(String msg) { - if (debuggingOn) { - System.err.println(msg); - } - } - - public static void print(Exception e, String msg) { - print((Throwable)e, msg); - } - - public static void print(Exception e) { - print(e, null); - } - - public static void print(Throwable t, String msg) { - if (debuggingOn) { - System.err.println("Received throwable with Message: "+t.getMessage()); - if (msg != null) - System.err.print(msg); - t.printStackTrace(); - } - } - - public static void print(Throwable t) { - print(t, null); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Definition.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Definition.java deleted file mode 100644 index b276a2a4d3d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Definition.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package template; -import java.util.HashMap; - -public class Definition { - private HashMap params = new HashMap(); - - public void setParam(Parameter p) { - params.put(p.getName(), p); - } - public Parameter getParam(String name) { - return (Parameter) params.get(name); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/DefinitionTag.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/DefinitionTag.java deleted file mode 100644 index 46d681e9fb2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/DefinitionTag.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package template; -import jakarta.servlet.jsp.JspTagException; -import jakarta.servlet.jsp.PageContext; -import jakarta.servlet.jsp.tagext.SimpleTagSupport; -import java.util.*; - -public class DefinitionTag extends SimpleTagSupport { - private String definitionName = null; - private String screenId; - private HashMap screens = null; - - public DefinitionTag() { - super(); - } - public HashMap getScreens() { - return screens; - } - public void setName(String name) { - this.definitionName = name; - } - public void setScreen(String screenId) { - this.screenId = screenId; - } - public void doTag() { - try { - screens = new HashMap(); - - - getJspBody().invoke(null); - - Definition definition = new Definition(); - PageContext context = (PageContext)getJspContext(); - ArrayList params = (ArrayList) screens.get(screenId); - Iterator ir = null; - if (params != null) { - ir = params.iterator(); - while (ir.hasNext()) - definition.setParam((Parameter) ir.next()); - - // put the definition in the page context - context.setAttribute(definitionName, definition, context.APPLICATION_SCOPE); - } - else - Debug.println("DefinitionTag: params are not defined."); - } catch (Exception ex) { - ex.printStackTrace(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/InsertTag.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/InsertTag.java deleted file mode 100644 index c2c9b04a9db..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/InsertTag.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package template; - -import jakarta.servlet.ServletException; -import jakarta.servlet.jsp.JspTagException; -import jakarta.servlet.jsp.PageContext; -import jakarta.servlet.jsp.tagext.SimpleTagSupport; -import java.util.HashMap; - -public class InsertTag extends SimpleTagSupport { - private String parameterName = null; - private String definitionName = null; - - public InsertTag() { - super(); - } - public void setParameter(String parameter) { - this.parameterName = parameter; - } - public void setDefinition(String name) { - this.definitionName = name; - } - public void doTag() throws JspTagException { - Definition definition = null; - Parameter parameter = null; - boolean directInclude = false; - PageContext context = (PageContext)getJspContext(); - - // get the definition from the page context - definition = (Definition)context.getAttribute(definitionName, context.APPLICATION_SCOPE); - // get the parameter - if (parameterName != null && definition != null) - parameter = (Parameter) definition.getParam(parameterName); - - if (parameter != null) - directInclude = parameter.isDirect(); - - try { - // if parameter is direct, print to out - if (directInclude && parameter != null) - context.getOut().print(parameter.getValue()); - // if parameter is indirect, include results of dispatching to page - else { - if ((parameter != null) && (parameter.getValue() != null)) - context.include(parameter.getValue()); - } - } catch (Exception ex) { - Throwable rootCause = null; - if (ex instanceof ServletException) { - rootCause = ((ServletException) ex).getRootCause(); - } - throw new JspTagException(ex.getMessage(), rootCause); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Parameter.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Parameter.java deleted file mode 100644 index e35cc5cc07f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Parameter.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package template; -public class Parameter { - - private String name; - private boolean isDirect; - private String value; - - public Parameter(String name, String value, boolean isDirect) { - this.name = name; - this.isDirect = isDirect; - this.value = value; - } - - public String getName() { - return name; - } - - public boolean isDirect() { - return isDirect; - } - - public String getValue() { - return value; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ParameterTag.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ParameterTag.java deleted file mode 100644 index 86815ccce27..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ParameterTag.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package template; -import jakarta.servlet.jsp.tagext.*; -import jakarta.servlet.jsp.PageContext; -import java.util.*; - -public class ParameterTag extends SimpleTagSupport { - private String paramName = null; - private String paramValue = null; - private String isDirectString = null; - - public ParameterTag() { - super(); - } - public void setName(String paramName) { - this.paramName = paramName; - } - public void setValue(String paramValue) { - this.paramValue = paramValue; - } - public void setDirect(String isDirectString) { - this.isDirectString = isDirectString; - } - public void doTag() { - boolean isDirect = false; - - if ((isDirectString != null) && - isDirectString.toLowerCase().equals("true")) - isDirect = true; - - try { - // retrieve the parameters list - if (paramName != null) { - ArrayList parameters = ((ScreenTag)getParent()).getParameters(); - if (parameters != null) { - Parameter param = new Parameter(paramName, paramValue, isDirect); - parameters.add(param); - } else - Debug.println("ParameterTag: parameters do not exist."); - } - } catch (Exception e) { - Debug.println("ParameterTag: error in doTag: " + e); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ScreenTag.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ScreenTag.java deleted file mode 100644 index 185d2d7e6dc..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ScreenTag.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package template; -import jakarta.servlet.jsp.tagext.SimpleTagSupport; -import jakarta.servlet.jsp.PageContext; -import java.util.*; - -public class ScreenTag extends SimpleTagSupport { - private String screenId; - private ArrayList parameters = null; - - public ArrayList getParameters() { - return parameters; - } - public void setScreenId(String screenId) { - this.screenId = screenId; - } - - public ScreenTag() { - super(); - } - public void doTag() { - parameters = new ArrayList(); - HashMap screens = (HashMap)((DefinitionTag)getParent()).getScreens(); - if (screens != null) { - try { - if (!screens.containsKey(screenId)) - screens.put(screenId, parameters); - getJspBody().invoke(null); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - else - Debug.println("ScreenTag: Unable to get screens object."); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/banner.jsp b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/banner.jsp deleted file mode 100644 index 50c8d78c5a2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/banner.jsp +++ /dev/null @@ -1,29 +0,0 @@ -<%-- - - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - - -
- - - - - - -

Coffee Break

-
- diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/banner.txt b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/banner.txt deleted file mode 100644 index 7e993a31689..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/banner.txt +++ /dev/null @@ -1,29 +0,0 @@ -<%-- - - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - - -
- - - - - - -

Coffee Break

-
- diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutAck.jsp b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutAck.jsp deleted file mode 100644 index 0709ceea939..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutAck.jsp +++ /dev/null @@ -1,54 +0,0 @@ -<%-- - - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
- -
${item.coffeeName}${item.pounds}
 
-
 
-
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutAck.txt b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutAck.txt deleted file mode 100644 index b6c30292236..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutAck.txt +++ /dev/null @@ -1,54 +0,0 @@ -<%-- - - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
- -
${item.coffeeName}${item.pounds}
 
-
 
-
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutForm.jsp b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutForm.jsp deleted file mode 100644 index e59478561b1..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutForm.jsp +++ /dev/null @@ -1,127 +0,0 @@ -<%-- - - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - - - -
- - - - - - - -
-

\$${sessionScope.cart.total}.

 
- -
- -
${requestScope.checkoutFormBean.errors.firstName} -		 - -
- -
${requestScope.checkoutFormBean.errors.lastName} -
- -
- -
${requestScope.checkoutFormBean.errors.email} -		 - -
- - -
${requestScope.checkoutFormBean.errors.phoneNumber} -
- -
- -
${requestScope.checkoutFormBean.errors.street} -		 - -
- -
${requestScope.checkoutFormBean.errors.city} -
- -
- -
${requestScope.checkoutFormBean.errors.state} -		 - -
- -
${requestScope.checkoutFormBean.errors.zip} -
- -
- -		 - -
- -
${requestScope.checkoutFormBean.errors.CCNumber} -
-     -
-
-
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutForm.txt b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutForm.txt deleted file mode 100644 index 82e9b3f47ea..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/checkoutForm.txt +++ /dev/null @@ -1,128 +0,0 @@ -<%-- - - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - - - -
- - - - - - - -
-

\$${sessionScope.cart.total}.

 
- -
- -
${requestScope.checkoutFormBean.errors.firstName} -		 - -
- -
${requestScope.checkoutFormBean.errors.lastName} -
- -
- -
${requestScope.checkoutFormBean.errors.email} -		 - -
- - -
${requestScope.checkoutFormBean.errors.phoneNumber} -
- -
- -
${requestScope.checkoutFormBean.errors.street} -		 - -
- -
${requestScope.checkoutFormBean.errors.city} -
- -
- -
${requestScope.checkoutFormBean.errors.state} -		 - -
- -
${requestScope.checkoutFormBean.errors.zip} -
- -
- -		 - -
- -
${requestScope.checkoutFormBean.errors.CCNumber} -
-     -
-
-
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/errorpage.jsp b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/errorpage.jsp deleted file mode 100644 index 1b9cdb99e53..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/errorpage.jsp +++ /dev/null @@ -1,42 +0,0 @@ -<%-- - - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ page isErrorPage="true" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> - - -<fmt:message key="ServerError"/> - - -

- -

-

-${pageContext.errorData.throwable} - - - : ${pageContext.errorData.throwable.cause} - - - : ${pageContext.errorData.throwable.rootCause} - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/errorpage.txt b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/errorpage.txt deleted file mode 100644 index fa63fdfc70c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/errorpage.txt +++ /dev/null @@ -1,42 +0,0 @@ -<%-- - - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ page isErrorPage="true" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> - - -<fmt:message key="ServerError"/> - - -

- -

-

-${pageContext.errorData.throwable} - - - : ${pageContext.errorData.throwable.cause} - - - : ${pageContext.errorData.throwable.rootCause} - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/orderForm.jsp b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/orderForm.jsp deleted file mode 100644 index bb4fe8a52c2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/orderForm.jsp +++ /dev/null @@ -1,74 +0,0 @@ -<%-- - - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 
${sci.item.coffeeName}\$${sci.item.retailPricePerPound}\$${sci.price}
  - -\$${sessionScope.cart.total} 
${requestScope.orderError}
-
-
- - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/orderForm.txt b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/orderForm.txt deleted file mode 100644 index 421e70a7ff9..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/orderForm.txt +++ /dev/null @@ -1,73 +0,0 @@ -<%-- - - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 
${sci.item.coffeeName}\$${sci.item.retailPricePerPound}\$${sci.price}
  - -\$${sessionScope.cart.total} 
${requestScope.orderError}
-
-
- - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/banner.jsp b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/banner.jsp deleted file mode 100644 index 7de63ffecbc..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/banner.jsp +++ /dev/null @@ -1,29 +0,0 @@ -<%-- - - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - - -
- - - - - - -

Coffee Break

Coffee Bean
-
- diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/banner.txt b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/banner.txt deleted file mode 100644 index 7e993a31689..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/banner.txt +++ /dev/null @@ -1,29 +0,0 @@ -<%-- - - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - - -
- - - - - - -

Coffee Break

-
- diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/coffeebean.jpg b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/coffeebean.jpg deleted file mode 100644 index 6696f2ea8fff0a63e24de1b923a89aece801c5cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2554 zcmbW2dopsU+0|fyS~pK@B97Z`MmGD*2A6Pz5^s}t*}-A z2m}Bi-U7H&fCT^%6PFY}0FjiCgi1qXHRxSfBQDv9|L% zX=3UYMf3^`p+-gxl?g^?*fz7fXa2wffY z_Xa`IP^kP5@+d_`R4CRI8~Q(s`zs(N3|s*yV2~2PCj|mafw)}&jCThDpg#osB@iE& zUqDbuSVZ&yFVG+f@PWW!K7O!(06#x39mhKd_@x9Ohjq;brSV=uO5sqwg!DpT<>QP_ z8HeG|2&6YPQAG6M53+KHRF0^sscWFn`UZwZ#ug_mt*mXZwvJ8&XBSsDBH72+&p#kA zDB}Eui;1(*TrYDKBQA1<%?yb5H?Zd3_C@w^^IL`75q2hA#4mEfMj5ZI4qC+Emyu+XQB z2A)QKPAWI4EV~|y3oI;s{&l5P&h;*fO`dSc_Y9)vw}-tYKT3@FSSH-DFgg;~N2{(L zWD_==(*ThjhGx=(69+E0n-K?-y7vP79GXPsY_=T@jr>>Q!S|d|bJyXUbO&|C)K z-}<~^=IZ!a1o@NHK7o9?#r;z9V_A|;_(ZfbVkAV~n%GGSU2RVpIC5%i>1|CVg>nI4+m!W9Z$LS1t;u4}v$^a`T8(97*a+s;H=OyB)AWo6Wc?M6J+(s0D_rMv z)lV~faeWFd^hx)I>CvzXpruo_K(TjEBDkS_!#DY=_W>0Htt)C%&%|Qb`6J=udtbpWEuE zy507;9XJ`1J$a^2w@ai?dS9Zf$Tu@4M&d5^aJ<)&eI@POk#$qqV!FA4ty`Lx`^CMJ?bY7y<6_p7S=a}= z07l?NubKIL{Da6nf_znJPSdNIV;E;@W@i0FpgVP}yU2F;;wvRuv>1%j;DfBMH+i2DS_Ug4vR))&b7QZC z#zk`oeuf!`vlQ5>HQIJTYVUKOjqj1N&wsRM9~aW-H(lyn#KarVj?N}18=7b`iz&J} zX;!Oonpc_osuBK}K3{n|(1Q17@7irvrbhU%?4#)%g%-?xHmm6E*t*2-8EY7Os$(d! zvcH-}7_E{hph=xV+C(!@E$1F1J0hIUya<-FLrtwH$9-_}Y39$sUNkv*>;__8N@k8c z>;wr8#(lnA7i+H11^g}c9rHTMJV!DT-P7)OMfxA5FUF#0F}FyT`HLuhi@dJ0y{jD` zJS1}7O?l{9(l;(oth`p9gI)W=bWL_MKNGT+%0Q2vlk5rMv*6>u1rYEBINwOw6b2kxnEnbjy-#&q5>sh@0|NXJLl4yO*^dfr`)NyU;Og^pifwkbnd zGtyyB3;SFkpS9ynp_?YBT3Xt#$-XYphW0=EYajs&LW(hdxlnJ^)abVA=$rBazRIrF zI>nAwF0fohfF4Lv{;_&tvlz8TC02#D{^a9n+kg*wF}~h^jiq#7^@&O;Dk|NFB>e7c OY8+JfUo(>X+dly+2Brf5 diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/errorinclude.jsp b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/errorinclude.jsp deleted file mode 100644 index 04adaec10cc..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/errorinclude.jsp +++ /dev/null @@ -1,36 +0,0 @@ -<%-- - - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ page isErrorPage="true" %> -

- -

-

-${pageContext.errorData.throwable} - - - : ${pageContext.errorData.throwable.cause} - - - : ${pageContext.errorData.throwable.rootCause} - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/prelude.jspf b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/prelude.jspf deleted file mode 100644 index 16b721c3bc0..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/prelude.jspf +++ /dev/null @@ -1,22 +0,0 @@ -<%-- - - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/screendefinitions.jsp b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/screendefinitions.jsp deleted file mode 100644 index 4cdf9708888..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/screendefinitions.jsp +++ /dev/null @@ -1,45 +0,0 @@ -<%-- - - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/screendefinitions.txt b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/screendefinitions.txt deleted file mode 100644 index 81b638cd4fa..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/screendefinitions.txt +++ /dev/null @@ -1,45 +0,0 @@ -<%-- - - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/template.jsp b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/template.jsp deleted file mode 100644 index 9fe1eda75d9..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/template.jsp +++ /dev/null @@ -1,31 +0,0 @@ -<%-- - - Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@ taglib uri="/WEB-INF/tutorial-template.tld" prefix="tt" %> -<%@ page errorPage="/template/errorinclude.jsp" %> -<%@ include file="/template/screendefinitions.jsp" %> - - - - <tt:insert definition="coffeebreak" parameter="title"/> - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/template.txt b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/template.txt deleted file mode 100644 index 7e1c101134e..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/template.txt +++ /dev/null @@ -1,32 +0,0 @@ -<%-- - - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - - -<%@ taglib uri="/WEB-INF/tutorial-template.tld" prefix="tt" %> -<%@ page errorPage="/template/errorinclude.jsp" %> -<%@ include file="/template/screendefinitions.jsp" %> - - - - <tt:insert definition="coffeebreak" parameter="title"/> - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/tutorial-template.tld b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/tutorial-template.tld deleted file mode 100644 index 9665e0855b7..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/tutorial-template.tld +++ /dev/null @@ -1,87 +0,0 @@ - - - - A tag library exercising SimpleTag handlers. - 1.0 - SimpleTagLibrary - /SimpleTagLibrary - - definition - template.DefinitionTag - scriptless - - name - true - true - - - screen - true - true - - - - screen - template.ScreenTag - scriptless - - screenId - true - true - - - - parameter - template.ParameterTag - scriptless - - name - true - true - - - value - true - true - - - direct - true - true - - - - insert - template.InsertTag - scriptless - - definition - true - true - - - parameter - true - true - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/build.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/build.properties deleted file mode 100644 index 6ddb4708e65..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/build.properties +++ /dev/null @@ -1,45 +0,0 @@ - - - -j2ee.home=${S1AS_home} -sunone.home=${j2ee.home} -# -# The following settings have been commented out because they are performed by the devtests -# set-up instead. -# -#admin.password= -#admin.host=localhost -#admin.user=admin -#admin.port=4848 -#https.port=1043 - -domain.resources="domain.resources" -domain.resources.port=${http.port} # 8080 -#db.root=${j2ee.home}/pointbase -#db.driver=com.pointbase.jdbc.jdbcUniversalDriver -#db.host=localhost -#db.port=9092 -#db.sid=sun-appserv-samples -#db.url=jdbc:pointbase:server://${db.host}:${db.port}/${db.sid} -#db.user=pbpublic -#db.pwd=pbpublic -url.prop=DatabaseName -ds.class=com.pointbase.jdbc.jdbcDataSource -db.jvmargs=-ms16m -mx32m - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/targets.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/targets.xml deleted file mode 100644 index 1def8de1fc3..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/targets.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/Deployer.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/Deployer.java deleted file mode 100644 index f5b4f93db81..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/Deployer.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package tester; - -import java.io.*; -import java.util.*; -import java.beans.*; -import javax.enterprise.deploy.model.*; -import javax.enterprise.deploy.shared.factories.*; -import javax.enterprise.deploy.spi.factories.*; -import javax.enterprise.deploy.spi.*; -import javax.enterprise.deploy.spi.status.*; -import javax.enterprise.deploy.shared.ModuleType; - -import com.sun.enterprise.deployapi.DeploymentFactoryInstaller; - -public class Deployer implements ProgressListener { - - public static void main(String args[]) { - - try { - System.out.println(" inst at " + System.getProperty("com.sun.aas.installRoot")); - Deployer deployer = new Deployer(); - deployer.deploy(args); - System.exit(0); - } catch(Exception e) { - e.printStackTrace(); - System.exit(-1); - } - } - - - public void deploy(String args[]) throws Exception { - - DeploymentFactoryInstaller.getInstaller(); - DeploymentManager dm = DeploymentFactoryManager.getInstance().getDeploymentManager("deployer:Sun:S1AS::localhost:4848", "admin", "adminadmin"); - ProgressObject dpo; - File archive = new File(args[0]); - File deploymentPlan = new File(args[1]); - - if (!deploymentPlan.exists()) { - System.out.println("Warning, deploying with null deployment plan"); - dpo = dm.distribute(dm.getTargets(), archive, null); - } else { - System.out.println("Deploying " + archive.getAbsolutePath() + " with plan " + deploymentPlan.getAbsoluteFile()); - dpo = dm.distribute(dm.getTargets(), archive, deploymentPlan); - } - dpo.addProgressListener(this); - System.out.println("Deployment returned " + dpo); - if (dpo!=null) { - DeploymentStatus deploymentStatus = dpo.getDeploymentStatus(); - do { - Thread.currentThread().sleep(200); - } while (!(deploymentStatus.isCompleted() || deploymentStatus.isFailed())); - System.out.println("Deployment status is " + deploymentStatus); - } - TargetModuleID[] targetModuleIDs = dpo.getResultTargetModuleIDs(); - dumpResultModuleIDs("Deployed " , dpo); - -// ModuleType moduleType = ((SunTargetModuleID) targetModuleIDs[0]).getModuleType(); - -// listApplications(dm, moduleType , dm.getTargets(), null); - } - - private void dumpResultModuleIDs(String prefix, ProgressObject po) { - TargetModuleID[] targetModuleIDs = po.getResultTargetModuleIDs(); - for (int i=0;i - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/build.xml deleted file mode 100644 index 4fcbfbb5e45..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/build.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/Simple_Page.html b/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/Simple_Page.html deleted file mode 100644 index fc2140bf17d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/Simple_Page.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - Simple Page - - -

This is a very simple HTML page !
-
-

-
jerome.dochez@sun.com
-
-
-
- - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/build.xml deleted file mode 100644 index 45aef9e6daa..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/build.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/sun-web.xml deleted file mode 100644 index 30fcd26a1f4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/sun-web.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - simple - diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/web.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/web.xml deleted file mode 100644 index 18b7c2f1941..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Simplistic Web Application - - simple_page.html - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/build.xml b/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/build.xml index 48657d5f6a1..577574617e4 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/build.xml @@ -113,7 +113,7 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/JSR88Deployer.java b/appserver/tests/appserv-tests/devtests/deployment/util/JSR88Deployer.java deleted file mode 100644 index d7a17933d97..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/util/JSR88Deployer.java +++ /dev/null @@ -1,787 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package devtests.deployment.util; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.beans.*; -import java.util.jar.Manifest; -import javax.enterprise.deploy.model.*; -import javax.enterprise.deploy.shared.factories.*; -import javax.enterprise.deploy.spi.factories.*; -import javax.enterprise.deploy.spi.*; -import javax.enterprise.deploy.spi.status.*; -import javax.enterprise.deploy.shared.ModuleType; - -/** - * - * @author administrator - */ -public class JSR88Deployer implements ProgressListener { - - private String host; - private String port; - private String user; - private String password; - private String uri; - private DeploymentFactory deploymentFactory; - private DeploymentManager dm; - private Target[] targets; - private final String J2EE_DEPLOYMENT_MANAGER = - "J2EE-DeploymentFactory-Implementation-Class"; - private static List systemApps = new ArrayList(); - - /** Record all events delivered to this deployer (which is also a progress listener. */ - private Vector receivedEvents = new Vector(); - - /** Record the TargetModuleIDs that resulted from the most recent operation. */ - private TargetModuleID [] mostRecentTargetModuleIDs = null; - - /** Creates a new instance of JSR88Deployer */ - public JSR88Deployer(String uri, String user, String password) { - this.user = user; - this.password = password; - this.uri = uri; - loadDeploymentFactory(); - loadSystemApps(); //system apps to be filtered - - log("Connecting using uri = " + uri + "; user = " + user + "; password = " + password); - try { - dm = DeploymentFactoryManager.getInstance().getDeploymentManager(uri, user, password); - } catch (Exception ex) { - ex.printStackTrace(); - System.exit(-1); - } - - Target[] allTargets = dm.getTargets(); - if (allTargets.length == 0) { - log("Can't find deployment targets..."); - System.exit(-1); - } - - // If test being run on EE, exclude the DAS server instance from the deploy targets - String targetPlatform = System.getProperty("deploymentTarget"); - List filteredTargets = new ArrayList(); - if( ("SERVER".equals(targetPlatform)) || ("CLUSTER".equals(targetPlatform)) ) { - for(int i=0; i " + targets[i].getName()); - } - } - - private int waitTillComplete(ProgressObject po) throws Exception { - DeploymentStatus deploymentStatus = null; - do { - /* - *The progress object may return a DeploymentStatus object that is a snapshot of the - *current status and will never change. (The spec is unclear on this behavior.) So - *to be sure, get a new deployment status every time through the loop to be sure of - *getting the up-to-date status. - */ - deploymentStatus = po.getDeploymentStatus(); - Thread.currentThread().sleep(200); - } while (!(deploymentStatus.isCompleted() || deploymentStatus.isFailed())); - log("Deployment status is " + deploymentStatus.getState().toString()); - if(deploymentStatus.isFailed()) - return(-1); - return(0); - } - - public ProgressObject deploy(File archive, File deploymentPlan, - boolean startByDefault, boolean useStream, - ModuleType type) - throws Exception { - - ProgressObject dpo = null; - ProgressObject po = null; - if (deploymentPlan == null || deploymentPlan.getName().equals("null")) { - log("Warning, deploying with null deployment plan"); - if (useStream) { - if (type == null) { - dpo = dm.distribute(targets, - new FileInputStream(archive.getAbsolutePath()), - null); - } else { - dpo = dm.distribute(targets, type, - new FileInputStream(archive.getAbsolutePath()), - null); - } - } else { - dpo = dm.distribute(targets, archive, null); - } - } else { - if (useStream) { - if (type == null) { - dpo = dm.distribute(targets, - new FileInputStream(archive.getAbsolutePath()), - new FileInputStream(deploymentPlan.getAbsolutePath())); - } else { - dpo = dm.distribute(targets, type, - new FileInputStream(archive.getAbsolutePath()), - new FileInputStream(deploymentPlan.getAbsolutePath())); - } - } else { - dpo = dm.distribute(targets, archive, deploymentPlan); - } - } - if (dpo!=null) { - dpo.addProgressListener(this); - if(waitTillComplete(dpo) != 0) { - log("DEPLOY Action Failed"); - return(null); - } - - TargetModuleID[] targetModuleIDs = dpo.getResultTargetModuleIDs(); - this.mostRecentTargetModuleIDs = targetModuleIDs; - dumpResultModuleIDs("Deployed " , dpo); - - if (startByDefault) { - log("STARTINNG... " + targetModuleIDs); - po = dm.start(targetModuleIDs); - if (po!=null) { - po.addProgressListener(this); - if(waitTillComplete(po) != 0) { - log("START Action Failed"); - return(null); - } - } - return po; - } - } - return(dpo); - } - - public ProgressObject redeploy(String moduleID, File archive, - File deploymentPlan, boolean useStream) throws Exception { - - TargetModuleID[] list = null; - if (moduleID == null) { //redeploy all but system apps - throw new UnsupportedOperationException("DO NOT SUPPORT REDEPLOY MULTIPLE APPS"); - } else { - list = findApplication(moduleID, null); - } - - TargetModuleID[] modules = filterSystemApps(list); - if (modules != null && modules.length > 0) { - for (int i = 0; i < modules.length; i++) { - log("REDEPLOYING... " + modules[i]); - } - } - - ProgressObject dpo = null; - if (deploymentPlan == null || deploymentPlan.getName().equals("null")) { - log("Warning, redeploying with null deployment plan"); - if (useStream) { - dpo = dm.redeploy(modules, - new FileInputStream(archive.getAbsolutePath()), - null); - } else { - dpo = dm.redeploy(modules, archive, null); - } - } else { - if (useStream) { - dpo = dm.redeploy(modules, - new FileInputStream(archive.getAbsolutePath()), - new FileInputStream(deploymentPlan.getAbsolutePath())); - } else { - dpo = dm.redeploy(modules, archive, deploymentPlan); - } - } - if (dpo!=null) { - dpo.addProgressListener(this); - if(waitTillComplete(dpo) != 0) { - log("REDEPLOY Action Failed"); - return(null); - } - - TargetModuleID[] targetModuleIDs = dpo.getResultTargetModuleIDs(); - this.mostRecentTargetModuleIDs = targetModuleIDs; - dumpResultModuleIDs("Redeployed " , dpo); - } - return(dpo); - } - - public ProgressObject stop(String moduleID) throws Exception { - TargetModuleID[] list = null; - if (moduleID == null) { //stop all but system apps - list = getAllApplications(Boolean.TRUE); - } else { - list = findApplication(moduleID, Boolean.TRUE); - } - - ProgressObject dpo = null; - TargetModuleID[] modules = filterSystemApps(list); - if (modules != null && modules.length > 0) { - for (int i = 0; i < modules.length; i++) { - log("STOPPING... " + modules[i]); - } - dpo = dm.stop(modules); - if (dpo!=null) { - dpo.addProgressListener(this); - if(waitTillComplete(dpo) != 0) { - log("STOP Action Failed"); - return(null); - } - this.mostRecentTargetModuleIDs = dpo.getResultTargetModuleIDs(); - } - } - return(dpo); - } - - /** - *Starts an application, with an option of waiting between the time the operation is requested - *and the time the deployer is added as a listener. This option helps with the test for race - *conditions involved with managing the list of listeners and the list of delivered events. - */ - public ProgressObject start(String moduleID, int delayBeforeRegisteringListener) throws Exception { - TargetModuleID[] list = null; - if (moduleID == null) { //start all but system apps - list = getAllApplications(Boolean.FALSE); - } else { - list = findApplication(moduleID, Boolean.FALSE); - } - - TargetModuleID[] modules = filterSystemApps(list); - ProgressObject dpo = null; - if (modules != null && modules.length > 0) { - for (int i = 0; i < modules.length; i++) { - log("STARTINNG... " + modules[i]); - } - dpo = dm.start(modules); - if (delayBeforeRegisteringListener > 0) { - try { - log("Pausing before adding self as a progress listener"); - Thread.currentThread().sleep(delayBeforeRegisteringListener); - } catch (InterruptedException ie) { - throw new RuntimeException(this.getClass().getName() + " was interrupted sleeping before adding itself as a progresslistener", ie); - } - } - if (dpo!=null) { - dpo.addProgressListener(this); - if (delayBeforeRegisteringListener > 0) { - log("Now registered as a progress listener"); - } - if(waitTillComplete(dpo) != 0) { - log("START Action Failed"); - return(null); - } - this.mostRecentTargetModuleIDs = dpo.getResultTargetModuleIDs(); - } - } - return(dpo); - } - - public ProgressObject start(String moduleID) throws Exception { - return start(moduleID, 0); - } - - public ProgressObject undeploy(String moduleID) throws Exception { - TargetModuleID[] list = null; - //log ("000 trying to undeploy moduleID = " + moduleID); - if (moduleID == null) { //undeploy all but system apps - list = getAllApplications(null); - } else { - list = findApplication(moduleID, null); - } - - ProgressObject dpo = null; - TargetModuleID[] modules = filterSystemApps(list); - if (modules != null && modules.length > 0) { - for (int i = 0; i < modules.length; i++) { - log("UNDEPLOYING... " + modules[i]); - } - dpo = dm.undeploy(modules); - if (dpo!=null) { - dpo.addProgressListener(this); - if(waitTillComplete(dpo) != 0) { - log("UNDEPLOY Action Failed"); - return(null); - } - this.mostRecentTargetModuleIDs = dpo.getResultTargetModuleIDs(); - } - } - return(dpo); - } - - protected void dumpResultModuleIDs(String prefix, ProgressObject po) { - TargetModuleID[] targetModuleIDs = po.getResultTargetModuleIDs(); - dumpModulesIDs(prefix, targetModuleIDs); - } - - protected void dumpModulesIDs(String prefix, TargetModuleID[] targetModuleIDs) { - for (int i=0;i 6) { - deploymentFile = new File(args[6]); - if (!args[6].equals("null")) { - if (!deploymentFile.exists()) { - error("Deployment File not found : " + deploymentFile.getPath()); - System.exit(1); - } - } - } - try { - log("Deploying " + inputFile + " plan: " + deploymentFile); - if(deployer.deploy(inputFile, deploymentFile, - startByDefault, useStream, null) == null) - finalExitValue = -1; - } catch(Exception e) { - e.printStackTrace(); - System.exit(1); - } - } else if ("deploy-stream-withtype".equals(args[0])) { - if (args.length < 7) { - usage(); - System.exit(1); - } - boolean useStream = true; - boolean startByDefault = "true".equals(args[4]); - java.io.File inputFile = new java.io.File(args[5]); - if (!inputFile.exists()) { - error("File not found : " + inputFile.getPath()); - System.exit(1); - } - ModuleType t = - ModuleType.getModuleType((new Integer(args[6])).intValue()); - File deploymentFile = null; - if (args.length > 7) { - deploymentFile = new File(args[7]); - if (!args[7].equals("null")) { - if (!deploymentFile.exists()) { - error("Deployment File not found : " + deploymentFile.getPath()); - System.exit(1); - } - } - } - try { - log("Deploying " + inputFile + " plan: " + deploymentFile); - if(deployer.deploy(inputFile, deploymentFile, - startByDefault, useStream, t) == null) - finalExitValue = -1; - } catch(Exception e) { - e.printStackTrace(); - System.exit(1); - } - } else if ("list".equals(args[0])) { - - if (args.length != 5) { - usage(); - System.exit(0); - } - - try { - if ("all".equals(args[4])) { - deployer.listApplications(ModuleType.EAR, null); - deployer.listApplications(ModuleType.WAR, null); - deployer.listApplications(ModuleType.EJB, null); - deployer.listApplications(ModuleType.CAR, null); - deployer.listApplications(ModuleType.RAR, null); - } else if ("running".equals(args[4])) { - deployer.listApplications(ModuleType.EAR, Boolean.TRUE); - deployer.listApplications(ModuleType.WAR, Boolean.TRUE); - deployer.listApplications(ModuleType.EJB, Boolean.TRUE); - deployer.listApplications(ModuleType.CAR, Boolean.TRUE); - deployer.listApplications(ModuleType.RAR, Boolean.TRUE); - } else if ("nonrunning".equals(args[4])) { - deployer.listApplications(ModuleType.EAR, Boolean.FALSE); - deployer.listApplications(ModuleType.WAR, Boolean.FALSE); - deployer.listApplications(ModuleType.EJB, Boolean.FALSE); - deployer.listApplications(ModuleType.CAR, Boolean.FALSE); - deployer.listApplications(ModuleType.RAR, Boolean.FALSE); - } else { - usage(); - finalExitValue = 1; - } - } catch (Exception e) { - e.printStackTrace(); - System.exit(-1); - } - } else if ("redeploy".equals(args[0]) || "redeploy-stream".equals(args[0])) { - if (args.length < 6) { - usage(); - System.exit(-1); - } - - boolean useStream = "redeploy-stream".equals(args[0]); - java.io.File inputFile = new java.io.File(args[5]); - if (!inputFile.exists()) { - error("File not found : " + inputFile.getPath()); - System.exit(1); - } - File deploymentFile = null; - if (args.length > 6) { - deploymentFile = new File(args[6]); - if (!args[6].equals("null")) { - if (!deploymentFile.exists()) { - error("Deployment File not found : " + deploymentFile.getPath()); - System.exit(1); - } - } - } - try { - log("Redeploying " + inputFile + " plan: " + deploymentFile); - if ("all".equals(args[4])) { - if(deployer.redeploy(null, inputFile, deploymentFile, useStream) == null) - finalExitValue = -1; - } else { - if(deployer.redeploy(args[4], inputFile, deploymentFile, useStream) == null) - finalExitValue = -1; - } - } catch(Exception e) { - e.printStackTrace(); - System.exit(1); - } - } else { - if (args.length != 5) { - usage(); - System.exit(1); - } - - try { - if ("all".equals(args[4])) { - if ("undeploy".equals(args[0])) { - if(deployer.undeploy(null) == null) - finalExitValue = -1; - } else if ("start".equals(args[0])) { - if(deployer.start(null) == null) - finalExitValue = -1; - } else if ("stop".equals(args[0])) { - if(deployer.stop(null) == null) - finalExitValue = -1; - } else { - usage(); - finalExitValue = 1; - } - } else { - if ("undeploy".equals(args[0])) { - if(deployer.undeploy(args[4]) == null) - finalExitValue = -1; - } else if ("start".equals(args[0])) { - if(deployer.start(args[4]) == null) - finalExitValue = -1; - } else if ("stop".equals(args[0])) { - if(deployer.stop(args[4]) == null) - finalExitValue = -1; - } else { - usage(); - finalExitValue = 1; - } - } - } catch (Exception e) { - e.printStackTrace(); - System.exit(-1); - } - } - System.exit(finalExitValue); - } - - /** Invoked when a deployment progress event occurs. - * - * @param event the progress status event. - */ - public void handleProgressEvent(ProgressEvent event) { - DeploymentStatus ds = event.getDeploymentStatus(); - System.out.println("Received Progress Event state " + ds.getState() + " msg = " + ds.getMessage()); - TargetModuleID tmid = event.getTargetModuleID(); - System.out.println("Received Progress Event target module id " + tmid.getModuleID()); - /* - *Add this event to the vector collecting them. - */ - this.receivedEvents.add(event); - } - - /** - *Report all the events received by this deployer. - * - *@return array of Objects containing the received events - */ - public ProgressEvent [] getReceivedEvents() { - ProgressEvent [] answer = new ProgressEvent[this.receivedEvents.size()]; - return (ProgressEvent []) this.receivedEvents.toArray(answer); - } - - /** - *Clear the collection of received events recorded by this deployer. - */ - public void clearReceivedEvents() { - this.receivedEvents.clear(); - } - - public TargetModuleID [] getMostRecentTargetModuleIDs() { - return this.mostRecentTargetModuleIDs; - } - - public void clearMostRecentTargetModuleIDs() { - this.mostRecentTargetModuleIDs = null; - } - - private void loadDeploymentFactory() { - try { - File file = new File(System.getProperty("com.sun.aas.installRoot") - + File.separator+ "lib" + File.separator + "deployment" - + File.separator + "sun-as-jsr88-dm.jar"); - - Manifest mf = new java.util.jar.JarFile(file).getManifest(); - String className = mf.getMainAttributes().getValue(J2EE_DEPLOYMENT_MANAGER); - URL[] urls = new URL[]{file.toURL()}; - URLClassLoader urlClassLoader = new java.net.URLClassLoader(urls, getClass().getClassLoader()); - - Class factory = null; - try { - factory=urlClassLoader.loadClass(className); - } catch (ClassNotFoundException cnfe) { - cnfe.printStackTrace(); - } - - Object df = null; - try { - df = factory.newInstance(); - } catch (Exception ie) { - ie.printStackTrace(); - } - if (df instanceof DeploymentFactory) { - DeploymentFactoryManager.getInstance().registerDeploymentFactory((DeploymentFactory) df); - } else { - System.exit(-1); - } - - } catch (Exception ex) { - log("Failed to load the deployment factory."); - ex.printStackTrace(); - System.exit(-1); - } - } - - private static void usage() { - System.out.println("Usage: command [command-parameters]"); - System.out.println(" where command is one of [deploy<-stream> | redeploy<-stream> | undeploy | start | stop | list]"); - System.out.println(" where is: deployer:Sun:AppServer::${admin.host}:${admin.port} for PE"); - System.out.println(" where is: deployer:Sun:AppServer::${admin.host}:${admin.port}:https for EE"); - System.out.println(" where command-parameters are as follows"); - System.out.println(" deploy: []"); - System.out.println(" deploy-stream: []"); - System.out.println(" deploy-stream-withtype: []"); - System.out.println(" redeploy: []"); - System.out.println(" redeploy-stream: []"); - System.out.println(" undeploy: [all | moduleID]"); - System.out.println(" start: [all | moduleID]"); - System.out.println(" stop: [all | moduleID]"); - System.out.println(" list: [all | running | nonrunning]"); - } - - public static void log(String message) { - System.out.println("[JSR88Deployer]:: " + message); - } - - public static void error(String message) { - System.err.println("[JSR88Deployer]:: " + message); - } - - private void loadSystemApps() { - systemApps.add("MEjbApp"); - systemApps.add("__ejb_container_timer_app"); - systemApps.add("adminapp"); - systemApps.add("admingui"); - systemApps.add("com_sun_web_ui"); - } - - private TargetModuleID[] filterSystemApps(TargetModuleID[] list) { - - //Comment out the following logic as we will move to use the MBean - //that returns only non-system apps. -/* - List l = new ArrayList(); - for (int i = 0; i < list.length; i++) { - String moduleID = list[i].getModuleID(); - log("found module = " + moduleID); - if (!systemApps.contains(moduleID)) { - l.add(list[i]); - } - } - - TargetModuleID[] ids = new TargetModuleID[l.size()]; - for (int i = 0; i < l.size(); i++) { - ids[i] = (TargetModuleID) l.get(i); - } - return ids; -*/ - return list; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/AnnotationTest.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/AnnotationTest.java deleted file mode 100644 index 826e5688549..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/AnnotationTest.java +++ /dev/null @@ -1,238 +0,0 @@ -/* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package devtests.deployment.util; - -import java.io.File; -import java.util.HashSet; -import java.util.Set; -import javax.enterprise.deploy.shared.ModuleType; - -import com.sun.enterprise.deployment.ApplicationClientDescriptor; -import com.sun.enterprise.deployment.BundleDescriptor; -import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl; -import com.sun.enterprise.deployment.EjbDescriptor; -import com.sun.enterprise.deployment.WebBundleDescriptor; -import com.sun.enterprise.deployment.io.AppClientDeploymentDescriptorFile; -import com.sun.enterprise.deployment.io.DeploymentDescriptorFile; -import org.glassfish.ejb.deployment.io.EjbDeploymentDescriptorFile; -import org.glassfish.web.deployment.descriptor.WebBundleDescriptorImpl; -import org.glassfish.web.deployment.io.WebDeploymentDescriptorFile; -import org.glassfish.webservices.io.WebServicesDeploymentDescriptorFile; -import org.glassfish.hk2.api.ServiceLocator; - -import junit.extensions.TestSetup; -import org.junit.Assert; -import org.junit.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; -import junit.textui.TestRunner; -import org.glassfish.internal.api.Globals; -import org.glassfish.tests.utils.Utils; - -/** - * This is a annotation testing code using JUnit. - * It has one time setup with a default test comparing descriptors. - * One can subclass this by adding new method with name starting test - * and a new main method. - * - * @author Shing Wai Chan - */ -public class AnnotationTest extends TestCase { - private static final String META_INF_DIR = "META-INF/"; - private static final String WEB_INF_DIR = "WEB-INF/"; - private static final String GOLDEN_DIR = "goldenfiles/"; - - // the following need to be static so that it can initialize once - // and use in the given JVM - private static boolean initialized = false; - private static StandaloneProcessor processor = null; - private static String workDir = System.getProperty("workDir", "."); - private boolean hasGoldenFile = false; - - protected ModuleType type = ModuleType.EJB; - protected Set componentClassNames = new HashSet(); - - static { - final ServiceLocator serviceLocator = Utils.getServiceLocator(); - Globals.setDefaultHabitat(serviceLocator); - } - - public AnnotationTest(String name) { - super(name); - } - - /** - * Per test setup. - */ - public void setUp() { - if (!initialized) { - initialized = true; - processor = new StandaloneProcessor(type); - processor.setComponentClassNames(componentClassNames); - String testClasspath = System.getProperty("testClasspath"); - System.out.println("testClasspath = " + testClasspath); - try { - processor.run(new String[] { testClasspath }); - } catch(Exception ex) { - ex.printStackTrace(); - throw new IllegalStateException(ex); - } - } - } - - /** - * Per test cleanup. - */ - public void tearDown() { - } - - /** - * This test case compare descriptor files generated from annotation - * with the golden files if there is any. It will return silently - * if there is no golden files. - */ - public void testDescriptors() { - System.out.println("running testDescriptors"); - - BundleDescriptor[] bundleDescs = null; - if (ModuleType.EJB.equals(type)) { - bundleDescs = processEjbDescriptors(); - } else if (ModuleType.WAR.equals(type)) { - bundleDescs = processWebDescriptors(); - } else if (ModuleType.CAR.equals(type)) { - bundleDescs = processAppClientDescriptors(); - } else { - Assert.fail("ModuleType: " + type + " is not supported."); - } - if (!hasGoldenFile) { - Assert.fail("Goldenfile is not setup for this test."); - } - - DescriptorContentComparator dc = new DescriptorContentComparator(); - - Assert.assertTrue("BundleDescriptors do not match.", - dc.compareContent(bundleDescs[0], bundleDescs[1])); - } - - protected BundleDescriptor[] processEjbDescriptors() { - try { - processor.generateEjbJarXmlFile(workDir); - processor.generateWebServicesXmlFile(workDir); - } catch(Exception ex) { - ex.printStackTrace(); - throw new IllegalStateException(ex); - } - - BundleDescriptor[] bundleDescs = { new EjbBundleDescriptorImpl(), - new EjbBundleDescriptorImpl() }; - bundleDescs = loadDescriptorFiles(bundleDescs[0], bundleDescs[1], - new EjbDeploymentDescriptorFile(), - new EjbDeploymentDescriptorFile(), - META_INF_DIR, "ejb-jar.xml"); - - bundleDescs = loadDescriptorFiles(bundleDescs[0], bundleDescs[1], - new WebServicesDeploymentDescriptorFile(bundleDescs[0]), - new WebServicesDeploymentDescriptorFile(bundleDescs[1]), - META_INF_DIR, "webservices.xml"); - - return bundleDescs; - } - - protected BundleDescriptor[] processAppClientDescriptors() { - try { - processor.generateAppClientXmlFile(workDir); - } catch(Exception ex) { - ex.printStackTrace(); - throw new IllegalStateException(ex); - } - - BundleDescriptor[] bundleDescs = { new ApplicationClientDescriptor(), - new ApplicationClientDescriptor() }; - bundleDescs = loadDescriptorFiles(bundleDescs[0], bundleDescs[1], - new AppClientDeploymentDescriptorFile(), - new AppClientDeploymentDescriptorFile(), - META_INF_DIR, "application-client.xml"); - - return bundleDescs; - } - - protected BundleDescriptor[] processWebDescriptors() { - try { - processor.generateWebXmlFile(workDir); - processor.generateWebServicesXmlFile(workDir); - } catch(Exception ex) { - ex.printStackTrace(); - throw new IllegalStateException(ex); - } - - BundleDescriptor[] bundleDescs = { new WebBundleDescriptorImpl(), - new WebBundleDescriptorImpl() }; - bundleDescs = loadDescriptorFiles(bundleDescs[0], bundleDescs[1], - new WebDeploymentDescriptorFile(), - new WebDeploymentDescriptorFile(), - WEB_INF_DIR, "web.xml"); - - bundleDescs = loadDescriptorFiles(bundleDescs[0], bundleDescs[1], - new WebServicesDeploymentDescriptorFile(bundleDescs[0]), - new WebServicesDeploymentDescriptorFile(bundleDescs[1]), - WEB_INF_DIR, "webservices.xml"); - - return bundleDescs; - } - - private BundleDescriptor[] loadDescriptorFiles( - BundleDescriptor expBundleDescriptor, - BundleDescriptor genBundleDescriptor, - DeploymentDescriptorFile expDf, DeploymentDescriptorFile genDf, - String metaDir, String descFilename) { - - BundleDescriptor[] bundleDescs = new BundleDescriptor[] { - expBundleDescriptor, genBundleDescriptor }; - String goldenXml = workDir + "/" + GOLDEN_DIR + descFilename; - File goldenXmlFile = new File(goldenXml); - if (goldenXmlFile.exists()) { - hasGoldenFile = true; - bundleDescs[0] = loadDescriptor(expBundleDescriptor, - expDf, goldenXml); - - // load gen xml info into DOL for comparison due to various - // default values - String genXml = workDir + "/" + metaDir + descFilename; - File genXmlFile = new File(genXml); - if (genXmlFile.exists()) { - bundleDescs[1] = loadDescriptor(genBundleDescriptor, - genDf, genXml); - } - } - return bundleDescs; - } - - private BundleDescriptor loadDescriptor( - BundleDescriptor bundle, DeploymentDescriptorFile df, - String loc) { - File file = new File(loc); - if (!file.exists()) { - Assert.fail(loc + " does not exist."); - } - try { - return (BundleDescriptor)df.read(bundle, file); - } catch(Throwable t) { - Assert.fail(t.toString()); - return null; - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/DescriptorContentComparator.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/DescriptorContentComparator.java deleted file mode 100644 index a656f57c03e..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/DescriptorContentComparator.java +++ /dev/null @@ -1,380 +0,0 @@ -/* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package devtests.deployment.util; - -import java.lang.reflect.Array; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.logging.Handler; -import java.util.logging.Logger; -import java.util.logging.Level; - -import org.glassfish.deployment.common.Descriptor; -import com.sun.enterprise.util.LocalStringManagerImpl; - -/** - * This class compares deployment Descriptors for testing purpose. - * It is not thread safe. - * - * @author Shing Wai Chan - */ -public class DescriptorContentComparator { - private static final Class[] excludedClasses = new Class[] { - java.lang.Object.class, - java.beans.PropertyChangeSupport.class, - com.sun.enterprise.util.LocalStringManagerImpl.class, - java.util.Observable.class - }; - - private static final String[] excludedFieldNames = new String[] { - "propListeners", - "wsdlPortNamespacePrefix", - "specVersion" - }; - - private static Logger logger = null; - - // for easy debug - private Field lastField = null; - - public DescriptorContentComparator() { - initLogger(); - } - - public boolean compareContent(Descriptor d1, Descriptor d2) { - boolean result = compareContent(null, d1, d2, new HashSet()); - if (!result) { - logger.severe("last compared Field = " + lastField); - } - return result; - } - - /** - * Use reflection to look at fields for comparison. - * It is important to note that if instances under comparison are in - * parameter set, then the comparison result will always be - * true. This resolves the issues of circular references. - * @param field Field under comparison if known - * @param o1 Object to be compared - * @param o2 Object to be compared - * @param set stack of Descriptor instances under comparison - * @return boolean result of comparison - */ - private boolean compareContent(Field field, Object o1, Object o2, Set set) { - if (o1 == o2 || - isNullEquivalent(field, o1) && isNullEquivalent(field, o2)) { - return true; - } - - if (o1 == null && o2 != null || o1 != null && o2 == null || - !o2.getClass().equals(o1.getClass()) || - isExcludedClass(o1.getClass())) { - - if (logger.isLoggable(Level.FINE)) { - logger.fine("... null, class mismatch or excluded for " + - ((field != null)? field : "") + - ", o1 = " + o1 + ", o2 = " + o2); - } - - return false; - } - - // in the following, o1 and o2 are not null - Package p1 = o1.getClass().getPackage(); - Package p2 = o2.getClass().getPackage(); - - if (p1 != null && !p1.equals(p2) || p1 == null && p2 != null) { - - if (logger.isLoggable(Level.FINE)) { - logger.fine("... diff package: obj1 = " + o1); - logger.fine("... diff package: obj2 = " + o2); - } - - return false; - } else if (o1.getClass().isArray()) { - if (!compareArrayContent(o1, o2, set)) { - - if (logger.isLoggable(Level.FINE)) { - logger.fine("... diff array: obj1 = " + o1); - logger.fine("... diff array: obj2 = " + o2); - } - - return false; - } - } else if (o1 instanceof Collection) { - if (!compareCollectionContent((Collection)o1, - (Collection)o2, set)) { - - if (logger.isLoggable(Level.FINE)) { - logger.fine("... diff coll: obj1 = " + o1); - logger.fine("... diff coll: obj2 = " + o2); - } - - return false; - } - } else if (o1 instanceof Map) { - if (!compareMapContent((Map)o1, (Map)o2, set)) { - - if (logger.isLoggable(Level.FINE)) { - logger.fine("... diff map: obj1 = " + o1); - logger.fine("... diff map: obj2 = " + o2); - } - - return false; - } - } else if (p1 != null && - (p1.getName().startsWith("com.sun.enterprise.deployment") || p1.getName().startsWith("org.glassfish.ejb.deployment") || p1.getName().startsWith("org.glassfish.web.deployment")) - ) { - - if (o1 instanceof Descriptor) { - // to handle circular reference - ReferencePair rd = new ReferencePair(o1, o2); - if (!set.add(rd)) { - return true; // continue processing - } - } - - // looping from subclass to superclass - Class clazz = o2.getClass(); - while (clazz != null && !isExcludedClass(clazz)) { - if (logger.isLoggable(Level.FINER)) { - logger.finer("clazz = " + clazz); - } - Field[] declaredFields = clazz.getDeclaredFields(); - for (Field df : declaredFields) { - try { - - lastField = df; - if (logger.isLoggable(Level.FINER)) { - logger.finer("... \tdf = " + df); - } - - if (isExcludedNamedField(df) || - Modifier.isStatic(df.getModifiers())) { - continue; - } - df.setAccessible(true); // to see private fields - Object v1 = df.get(o1); - Object v2 = df.get(o2); - if (!compareContent(df, v1, v2, set)) { - return false; - } - } catch(Exception ex) { - throw new IllegalStateException(ex); - } - } - clazz = clazz.getSuperclass(); - } - } else { - boolean result = o1.equals(o2); - - if (!result && logger.isLoggable(Level.FINE)) { - logger.fine("... diff content: obj1 = " + o1); - logger.fine("... diff content: obj2 = " + o2); - } - - return result; - } - - return true; - } - - /** - * The following are regarded as null for comparison purposes: - * Collection, Map of size 0 - * String of size 0 - * @param df field under comparison if known - * @param o object under comparison - */ - private boolean isNullEquivalent(Field df, Object o) { - boolean result = false; - if (o == null) { - result = true; - } else if (o instanceof Collection) { - Collection coll = (Collection)o; - result = (coll.size() == 0); - } else if (o instanceof Map) { - - Map map = (Map)o; - int size = map.size(); - if (size == 0) { - result = true; - - // Need to ignore dynamicAttributes with prefix-mapping entry. - } else if (size == 1) { - if (df != null && "dynamicAttributes".equals(df.getName())) { - result = (map.get("prefix-mapping") != null); - } - } - } else if (o instanceof String) { - String s = (String)o; - result = (s.length() == 0); - } - return result; - } - - private boolean isExcludedClass(Class cl) { - boolean result = false; - for (Class clazz : excludedClasses) { - if (clazz.equals(cl)) { - result = true; - break; - } - } - return result; - } - - private boolean isExcludedNamedField(Field f) { - boolean result = false; - for (String ef : excludedFieldNames) { - if (ef.equals(f.getName())) { - result = true; - break; - } - } - return result; - } - - /** - * Assume arguments not null. - */ - private boolean compareArrayContent(Object value1, Object value2, Set set) { - int len1 = Array.getLength(value1); - int len2 = Array.getLength(value2); - if (len1 != len2) { - return false; - } else { - for (int i = 0; i < len1; i++) { - Object indObj1 = Array.get(value1, i); - Object indObj2 = Array.get(value2, i); - if (!(indObj1 == null && indObj2 == null) && - !(indObj1 != null && indObj2 != null && - compareContent(null, indObj1, indObj2, set))) { - return false; - } - } - } - return true; - } - - /** - * Assume arguments not null. - */ - private boolean compareCollectionContent(Collection coll1, - Collection coll2, Set set) { - int size1 = coll1.size(); - int size2 = coll2.size(); - - if (logger.isLoggable(Level.FINEST)) { - logger.finest("compare collection with sizes " + size1 + " and " + size2); - } - - if (size1 != size2) { - return false; - } - Iterator iter1 = coll1.iterator(); - // O(n^2) comparison!!! - while (iter1.hasNext()) { - Object obj1 = iter1.next(); - Iterator iter2 = coll2.iterator(); - boolean tempResult = false; - while (iter2.hasNext()) { - Object obj2 = iter2.next(); - if (compareContent(null, obj1, obj2, set)) { - tempResult = true; - break; - } - } - if (!tempResult) { - return false; - } - } - return true; - } - - /** - * Assume arguments not null. - */ - private boolean compareMapContent(Map map1, Map map2, Set set) { - Set keySet1 = map1.keySet(); - Set keySet2 = map2.keySet(); - if (!compareCollectionContent(keySet1, keySet2, set)) { - return false; - } - Iterator iter = keySet1.iterator(); - while (iter.hasNext()) { - Object key = iter.next(); - if (!compareContent(null, map1.get(key), map2.get(key), set)) { - return false; - } - } - return true; - } - - private void initLogger() { - logger = Logger.getLogger(DescriptorContentComparator.class.getName()); - Level logLevel = Boolean.getBoolean("debug") ? - Level.FINEST : Level.CONFIG; - for (Handler h : Logger.getLogger("").getHandlers()) { - h.setLevel(logLevel); - } - logger.setLevel(logLevel); - } - - - /** - * This class represents a pair of references where order is not important. - */ - class ReferencePair { - Object c1; - Object c2; - int hashCode = 0; - - ReferencePair(Object c1, Object c2) { - this.c1 = c1; - this.c2 = c2; - if (c1 != null) { - hashCode = c1.hashCode(); - } - if (c2 != null) { - hashCode ^= c2.hashCode(); - } - } - - public int hashCode() { - return hashCode; - } - - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof ReferencePair)) { - return false; - } - - ReferencePair rd = (ReferencePair)o; - return (c1 == rd.c1 && c2 == rd.c2 || - c1 == rd.c2 && c2 == rd.c1); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/LogFormatter.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/LogFormatter.java deleted file mode 100644 index 712feef97f2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/LogFormatter.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * LogFormatter.java - * - * Created on January 28, 2005, 1:58 PM - */ - -package devtests.deployment.util; - -import java.util.logging.Formatter; -import java.util.logging.LogRecord; - -/** - * I just hate the jdk formatters - * - * @author dochez - */ -public class LogFormatter extends Formatter { - - /** Creates a new instance of LogFormatter */ - public LogFormatter() { - } - - public String format(LogRecord record) { - return record.getMessage()+"\n"; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneErrorHandler.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneErrorHandler.java deleted file mode 100644 index 6977f399c64..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneErrorHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package devtests.deployment.util; - -import org.glassfish.apf.ErrorHandler; -import org.glassfish.apf.AnnotationProcessorException; -import org.glassfish.apf.impl.AnnotationUtils; - -/** - * Standalone Implementation of ErrorHandler. - * - * @author Shing Wai Chan - */ -public class StandaloneErrorHandler implements ErrorHandler { - /** Creates a new instance of StandaloneErrorHandler */ - public StandaloneErrorHandler() { - } - - /** - * Receive notication of a fine error message - * @param ape The warning information - * @throws any exception to stop the annotation processing - */ - public void fine(AnnotationProcessorException ape) throws - AnnotationProcessorException { - AnnotationUtils.getLogger().fine("Fine : " + ape); - } - - /** - * Receive notification of a warning - * @param ape The warning information - * @throws any exception to stop the annotation processing - */ - public void warning(AnnotationProcessorException ape) throws - AnnotationProcessorException { - AnnotationUtils.getLogger().warning("Warning : " + ape); - } - - /** - * Receive notification of an error - * @param ape The error information - * @throws any exception to stop the annotation processing - */ - public void error(AnnotationProcessorException ape) throws - AnnotationProcessorException { - AnnotationUtils.getLogger().severe("Error : " + ape); - throw ape; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneProcessor.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneProcessor.java deleted file mode 100644 index b565fed8939..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneProcessor.java +++ /dev/null @@ -1,294 +0,0 @@ -/* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * StandaloneProcessor.java - * - * Created on January 7, 2005, 9:26 AM - */ - -package devtests.deployment.util; - -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.Set; -import java.util.StringTokenizer; -import java.util.logging.*; - -import javax.enterprise.deploy.shared.ModuleType; - -import com.sun.enterprise.deployment.ApplicationClientDescriptor; -import com.sun.enterprise.deployment.BundleDescriptor; -import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl; -import com.sun.enterprise.deployment.WebBundleDescriptor; -import com.sun.enterprise.deployment.WebComponentDescriptor; - -import org.glassfish.apf.AnnotatedElementHandler; -import org.glassfish.apf.AnnotationHandler; -import org.glassfish.apf.AnnotationProcessor; -import org.glassfish.apf.ProcessingContext; -import org.glassfish.apf.ProcessingResult; -import org.glassfish.apf.Scanner; -import com.sun.enterprise.deployment.annotation.context.AppClientContext; -import com.sun.enterprise.deployment.annotation.context.EjbBundleContext; -import com.sun.enterprise.deployment.annotation.context.WebBundleContext; -import com.sun.enterprise.deployment.annotation.factory.SJSASFactory; -import org.glassfish.apf.impl.AnnotationUtils; -import com.sun.enterprise.deployment.annotation.impl.AppClientScanner; -import org.glassfish.apf.impl.DirectoryScanner; -import org.glassfish.ejb.deployment.annotation.impl.EjbJarScanner; -import org.glassfish.web.deployment.annotation.impl.WarScanner; -import org.glassfish.web.deployment.descriptor.WebBundleDescriptorImpl; -import org.glassfish.web.deployment.descriptor.WebComponentDescriptorImpl; -import com.sun.enterprise.deployment.annotation.impl.ModuleScanner; - -import com.sun.enterprise.deployment.io.AppClientDeploymentDescriptorFile; -import org.glassfish.ejb.deployment.io.EjbDeploymentDescriptorFile; -import org.glassfish.web.deployment.io.WebDeploymentDescriptorFile; -import org.glassfish.webservices.io.WebServicesDeploymentDescriptorFile; - -import com.sun.enterprise.deployment.util.ApplicationValidator; -import com.sun.enterprise.deployment.util.AppClientVisitor; -import com.sun.enterprise.deployment.util.AppClientValidator; -import org.glassfish.ejb.deployment.util.EjbBundleValidator; -import com.sun.enterprise.deployment.util.EjbBundleVisitor; -import org.glassfish.web.deployment.util.WebBundleVisitor; -import org.glassfish.web.deployment.util.WebBundleValidator; - -import org.glassfish.api.deployment.archive.ReadableArchive; -import com.sun.enterprise.deploy.shared.ArchiveFactory; -import com.sun.enterprise.module.ModulesRegistry; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.utilities.ServiceLocatorUtilities; -import com.sun.enterprise.module.single.StaticModulesRegistry; -import com.sun.enterprise.module.bootstrap.StartupContext; -import org.glassfish.api.admin.ProcessEnvironment; -import org.glassfish.api.admin.ProcessEnvironment.ProcessType; - - -/** - * - * @author dochez - */ -public class StandaloneProcessor { - private BundleDescriptor bundleDescriptor = null; - private AnnotatedElementHandler aeHandler = null; - private ModuleType type = null; - private Set compClassNames = null; - private static ServiceLocator serviceLocator = null; - - /** Creates a new instance of StandaloneProcessor */ - public StandaloneProcessor() { - this(ModuleType.EJB); - } - - public StandaloneProcessor(ModuleType type) { - this.type = type; - if (ModuleType.EJB.equals(type)) { - bundleDescriptor = new EjbBundleDescriptorImpl(); - aeHandler = new EjbBundleContext((EjbBundleDescriptorImpl) bundleDescriptor); - - } else if (ModuleType.WAR.equals(type)) { - bundleDescriptor = new WebBundleDescriptorImpl(); - aeHandler = new WebBundleContext( - (WebBundleDescriptor)bundleDescriptor); - } else if (ModuleType.CAR.equals(type)) { - bundleDescriptor = new ApplicationClientDescriptor(); - aeHandler = new AppClientContext( - (ApplicationClientDescriptor)bundleDescriptor); - } else { - throw new UnsupportedOperationException( - "ModuleType : " + type + " is not supported."); - } - } - - public void setComponentClassNames(Set compClassNames) { - this.compClassNames = compClassNames; - } - - public static void main(String[] args) throws Exception { - StandaloneProcessor processor = new StandaloneProcessor(); - processor.run(args); - processor.generateEjbJarXmlFile("."); - processor.generateWebServicesXmlFile("."); - } - - public int run(String[] args) throws Exception { - for (String arg : args) { - System.out.println("Annotation log is set to " + System.getProperty("annotation.log")); - String logWhat = System.getProperty("annotation.log"); - if (logWhat!=null) { - AnnotationUtils.setLoggerTarget(logWhat); - initLogger(); - } - AnnotationUtils.getLogger().info("processing " + arg); - File f = new File(arg); - if (f.exists()) { - try { - prepareServiceLocator(); - ArchiveFactory archiveFactory = serviceLocator.getService(ArchiveFactory.class); - ReadableArchive archive = archiveFactory.openArchive(f); - ClassLoader classLoader = null; - if (ModuleType.WAR.equals(type)) { - classLoader = new URLClassLoader( - new URL[] { new File(f, "WEB-INF/classes").toURL() }); - } else { - classLoader = new URLClassLoader(new URL[]{ f.toURL() }); - } - ModuleScanner scanner = null; - - if (ModuleType.EJB.equals(type)) { - EjbBundleDescriptorImpl ejbBundleDesc = - (EjbBundleDescriptorImpl)bundleDescriptor; - scanner = serviceLocator.getService(EjbJarScanner.class); - scanner.process(archive, ejbBundleDesc, classLoader, null); - - } else if (ModuleType.WAR.equals(type)) { - WebBundleDescriptor webBundleDesc = - (WebBundleDescriptor)bundleDescriptor; - for (String cname : compClassNames) { - WebComponentDescriptor webCompDesc = - new WebComponentDescriptorImpl(); - webCompDesc.setServlet(true); - webCompDesc.setWebComponentImplementation(cname); - webBundleDesc.addWebComponentDescriptor(webCompDesc); - } - scanner = serviceLocator.getService(WarScanner.class); - scanner.process(archive, webBundleDesc, classLoader, null); - - } else if (ModuleType.CAR.equals(type)) { - String mainClassName = compClassNames.iterator().next(); - ApplicationClientDescriptor appClientDesc = - (ApplicationClientDescriptor)bundleDescriptor; - appClientDesc.setMainClassName(mainClassName); - scanner = serviceLocator.getService(AppClientScanner.class); - scanner.process(archive, appClientDesc, classLoader, null); - - } - - AnnotationProcessor ap = serviceLocator.getService(SJSASFactory.class).getAnnotationProcessor(false); - - - // if the user indicated a directory for handlers, time to add the - String handlersDir = System.getProperty("handlers.dir"); - if (handlersDir!=null) { - addHandlers(ap, handlersDir); - } - - ProcessingContext ctx = ap.createContext(); - ctx.setErrorHandler(new StandaloneErrorHandler()); - bundleDescriptor.setClassLoader(scanner.getClassLoader()); - ctx.setProcessingInput(scanner); - ctx.pushHandler(aeHandler); - ProcessingResult result = ap.process(ctx); - if (ModuleType.EJB.equals(type)) { - EjbBundleDescriptorImpl ebd = (EjbBundleDescriptorImpl)bundleDescriptor; - ebd.visit(new EjbBundleValidator()); - } else if (ModuleType.WAR.equals(type)) { - WebBundleDescriptor wbd = (WebBundleDescriptor)bundleDescriptor; - wbd.visit(new WebBundleValidator()); - } else if (ModuleType.CAR.equals(type)) { - ApplicationClientDescriptor acbd = (ApplicationClientDescriptor)bundleDescriptor; - acbd.visit(new AppClientValidator()); - } - // display the result ejb bundle... - // AnnotationUtils.getLogger().info("Resulting " + bundleDescriptor); - - } catch(Exception e) { - e.printStackTrace(); - throw e; - } - } - } - return 0; - } - - public void generateAppClientXmlFile(String dir) throws IOException { - AppClientDeploymentDescriptorFile appClientdf = new AppClientDeploymentDescriptorFile(); - appClientdf.write(bundleDescriptor, dir); - - } - - public void generateEjbJarXmlFile(String dir) throws IOException { - EjbDeploymentDescriptorFile ejbdf = new EjbDeploymentDescriptorFile(); - ejbdf.write(bundleDescriptor, dir); - - } - - public void generateWebXmlFile(String dir) throws IOException { - WebDeploymentDescriptorFile webdf = new WebDeploymentDescriptorFile(); - webdf.write((WebBundleDescriptorImpl)bundleDescriptor, dir); - } - - public void generateWebServicesXmlFile(String dir) throws IOException { - WebServicesDeploymentDescriptorFile ddf = new WebServicesDeploymentDescriptorFile(bundleDescriptor); - ddf.write(bundleDescriptor, dir); - } - - private void addHandlers(AnnotationProcessor ap, String handlersDir) { - try { - System.out.println("Handlers dir set at " + handlersDir); - DirectoryScanner scanner = new DirectoryScanner(); - scanner.process(new File(handlersDir),null,null); - - Set elements = scanner.getElements(); - for (Class handlerClass : elements) { - Class[] interfaces = handlerClass.getInterfaces(); - for (Class interf : interfaces) { - if (interf.equals(org.glassfish.apf.AnnotationHandler.class)) { - AnnotationHandler handler = (AnnotationHandler) handlerClass.newInstance(); - if (AnnotationUtils.shouldLog("handler")) { - AnnotationUtils.getLogger().fine("Registering handler " + handlerClass - + " for type " + handler.getAnnotationType()); - } - ap.pushAnnotationHandler(handler); - } - } - } - } catch(Exception e) { - AnnotationUtils.getLogger().severe("Exception while registering handlers : " + e.getMessage()); - } - } - - private void initLogger() { - try { - FileHandler handler = new FileHandler("annotation.log"); - handler.setFormatter(new LogFormatter()); - handler.setLevel(Level.FINE); - Logger logger = Logger.global; - logger.setLevel(Level.FINE); - logger.addHandler(handler);} catch(Exception e) { - e.printStackTrace(); - } - } - - private void prepareServiceLocator() { - if ( (serviceLocator == null) ) { - // Bootstrap a hk2 environment. - ModulesRegistry registry = new StaticModulesRegistry(getClass().getClassLoader()); - serviceLocator = registry.createServiceLocator("default"); - - StartupContext startupContext = new StartupContext(); - - ServiceLocatorUtilities.addOneConstant(serviceLocator, startupContext); - ServiceLocatorUtilities.addOneConstant(serviceLocator, - new ProcessEnvironment(ProcessEnvironment.ProcessType.Other)); - } - } - -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/Utils.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/Utils.java deleted file mode 100644 index 69cee328b50..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/Utils.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.tests.utils; - -import com.sun.enterprise.module.bootstrap.StartupContext; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.module.single.StaticModulesRegistry; - -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.config.ConfigParser; -import org.jvnet.hk2.config.DomDocument; - -import java.net.URL; -import java.util.logging.Logger; -import java.io.File; -import java.util.Map; -import java.util.HashMap; -import java.util.Properties; - -/** - * Utilities to create a configured Habitat and cache them - * - * Shamelessly copied from nucleus/tests/util - * - * @author Jerome Dochez - */ -public class Utils { - - final static String habitatName = "default"; - final static String inhabitantPath = "META-INF/inhabitants"; - - public static final Utils instance = new Utils(); - - public static ServiceLocator getServiceLocator() { - - Properties p = new Properties(); - p.put(com.sun.enterprise.glassfish.bootstrap.Constants.INSTALL_ROOT_PROP_NAME, System.getProperty("java.io.tmpdir")); - p.put(com.sun.enterprise.glassfish.bootstrap.Constants.INSTANCE_ROOT_PROP_NAME, System.getProperty("java.io.tmpdir")); - ModulesRegistry registry = new StaticModulesRegistry(Utils.class.getClassLoader(), new StartupContext(p)); - ServiceLocator serviceLocator = registry.createServiceLocator("default"); - - return serviceLocator; - } -} - diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/basic-scenarios.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/basic-scenarios.xml index 8c4d18fd039..6fbadf451bb 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/versioning/basic-scenarios.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/basic-scenarios.xml @@ -79,70 +79,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RC-1.0.0 + diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/META-INF/glassfish-application.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/META-INF/glassfish-application.xml index 255df937b80..5fc964294df 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/META-INF/glassfish-application.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/META-INF/glassfish-application.xml @@ -19,5 +19,5 @@ --> - RC-1.0.0 + ALPHA-1.0.0 diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/build.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/build.xml index b94369965ea..54e558ca13a 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/build.xml @@ -34,58 +34,57 @@ file contains a version identifier as a property and is used by the servlet to display the version informations. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/META-INF/glassfish-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/META-INF/glassfish-ejb-jar.xml index cef074dd2b0..2cd578ffddc 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/META-INF/glassfish-ejb-jar.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/META-INF/glassfish-ejb-jar.xml @@ -19,5 +19,5 @@ --> - RC-1.0.0 + ALPHA-1.0.0 diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/versioning-common.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/versioning-common.xml index 77c051308f1..7488e71c539 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/versioning/versioning-common.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/versioning-common.xml @@ -105,42 +105,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/sun-web.xml deleted file mode 100644 index 6fc6e963072..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/sun-web.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - /war/appmgt - - - - Keep a copy of the generated servlet class' java code. - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/web.xml deleted file mode 100644 index a13ed51585c..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/web.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - This context-param was defined in the web app itself. - builtin - in-app - - - TestServlet - appmgttest.TestServlet - - - TestServlet - /* - - - - 30 - - - - index.jsp - - - This env-entry was defined in the web app app itself. - builtin - java.lang.String - in-app - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/build.xml index 7fdda321b82..97c39b0a63c 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/war/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/war/build.xml @@ -26,29 +26,11 @@ &commonBuild; - - - - - - - - - - - - - - - - - - + + diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/build.xml index f5d5667bfc7..f64f004982e 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/build.xml @@ -129,7 +129,7 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/TestClient.java deleted file mode 100644 index 431c3fdb0af..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/TestClient.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package htmlonly.client; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - -public class TestClient { - - public static void main (String[] args) { - TestClient client = new TestClient(); - client.doTest(args); - } - - public void doTest(String[] args) { - - String url = args[0]; - boolean testPositive = (Boolean.valueOf(args[1])).booleanValue(); - try { - log("Test: devtests/deployment/war/htmlonly"); - int code = invokeServlet(url); - report(code, testPositive); - } catch (IOException ex) { - if (testPositive) { - ex.printStackTrace(); - fail(); - } else { - log("Caught EXPECTED IOException: " + ex); - pass(); - } - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private int invokeServlet(String url) throws Exception { - log("Invoking URL = " + url); - URL u = new URL(url); - HttpURLConnection c1 = (HttpURLConnection)u.openConnection(); - int code = c1.getResponseCode(); - InputStream is = c1.getInputStream(); - BufferedReader input = new BufferedReader (new InputStreamReader(is)); - String line = null; - while ((line = input.readLine()) != null) { - log(line); - } - return code; - } - - private void report(int code, boolean testPositive) { - if (testPositive) { //expect return code 200 - if(code != 200) { - log("Incorrect return code: " + code); - fail(); - } else { - log("Correct return code: " + code); - pass(); - } - } else { - if(code != 200) { //expect return code !200 - log("Correct return code: " + code); - pass(); - } else { - log("Incorrect return code: " + code); - fail(); - } - } - } - - private void log(String message) { - System.out.println("[war.client.Client]:: " + message); - } - - private void pass() { - log("PASSED: devtests/deployment/war/htmlonly"); - System.exit(0); - } - - private void fail() { - log("FAILED: devtests/deployment/war/htmlonly"); - System.exit(-1); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/build.xml deleted file mode 100644 index 250f821348d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/build.xml +++ /dev/null @@ -1,238 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/index.html b/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/index.html deleted file mode 100644 index 27361f8a59f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/index.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - -HTML Only Test - - -

-This is a simple HTML page used for HTML only deployment unit test -

-What else can be put ? - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/sun-web.xml deleted file mode 100644 index af121f2eea8..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/sun-web.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - war/htmlonly - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/web.xml deleted file mode 100644 index 7633c907112..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/web.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - htmlonly - - index.html - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/TestClient.java deleted file mode 100644 index 1cf017b69ab..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/TestClient.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package jsponly.client; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - -public class TestClient { - - public static void main (String[] args) { - TestClient client = new TestClient(); - client.doTest(args); - } - - public void doTest(String[] args) { - - String url = args[0]; - boolean testPositive = (Boolean.valueOf(args[1])).booleanValue(); - try { - log("Test: devtests/deployment/war/jsponly"); - int code = invokeServlet(url); - report(code, testPositive); - } catch (IOException ex) { - if (testPositive) { - ex.printStackTrace(); - fail(); - } else { - log("Caught EXPECTED IOException: " + ex); - pass(); - } - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private int invokeServlet(String url) throws Exception { - log("Invoking URL = " + url); - URL u = new URL(url); - HttpURLConnection c1 = (HttpURLConnection)u.openConnection(); - int code = c1.getResponseCode(); - InputStream is = c1.getInputStream(); - BufferedReader input = new BufferedReader (new InputStreamReader(is)); - String line = null; - while ((line = input.readLine()) != null) { - log(line); - } - return code; - } - - private void report(int code, boolean testPositive) { - if (testPositive) { //expect return code 200 - if(code != 200) { - log("Incorrect return code: " + code); - fail(); - } else { - log("Correct return code: " + code); - pass(); - } - } else { - if(code != 200) { //expect return code !200 - log("Correct return code: " + code); - pass(); - } else { - log("Incorrect return code: " + code); - fail(); - } - } - } - - private void log(String message) { - System.err.println("[war.client.Client]:: " + message); - } - - private void pass() { - log("PASSED: devtests/deployment/war/jsponly"); - System.exit(0); - } - - private void fail() { - log("FAILED: devtests/deployment/war/jsponly"); - System.exit(-1); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/build.xml deleted file mode 100644 index d0769a0241e..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/build.xml +++ /dev/null @@ -1,218 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/glassfish-web.xml deleted file mode 100644 index 20c15066de4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/glassfish-web.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - war/jsponly - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/header.jsp b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/header.jsp deleted file mode 100644 index e78f2d87e76..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/header.jsp +++ /dev/null @@ -1,27 +0,0 @@ -<%-- - - Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - - - - - -
- - JSP Only test header - -
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/index.jsp b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/index.jsp deleted file mode 100644 index f87cc494430..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/index.jsp +++ /dev/null @@ -1,31 +0,0 @@ -<%-- - - Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - - - -JSP Only Test - - -<%@ include file="header.jsp" %> -

-This is a simple JSP page with one simple include used for JSP only deployment unit test -

-What else can be put ? - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/web.xml deleted file mode 100644 index 963fd1cd40d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/web.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - jsponly - - index.jsp - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestClient.java deleted file mode 100644 index 80f4e677def..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestClient.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package webinflib.client; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - -public class TestClient { - - public static void main (String[] args) { - TestClient client = new TestClient(); - client.doTest(args); - } - - public void doTest(String[] args) { - - String url = args[0]; - boolean testPositive = (Boolean.valueOf(args[1])).booleanValue(); - try { - log("Test: devtests/deployment/war/nojarexpansion"); - int code = invokeServlet(url); - report(code, testPositive); - } catch (IOException ex) { - if (testPositive) { - ex.printStackTrace(); - fail(); - } else { - log("Caught EXPECTED IOException: " + ex); - pass(); - } - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private int invokeServlet(String url) throws Exception { - log("Invoking URL = " + url); - URL u = new URL(url); - HttpURLConnection c1 = (HttpURLConnection)u.openConnection(); - int code = c1.getResponseCode(); - InputStream is = c1.getInputStream(); - BufferedReader input = new BufferedReader (new InputStreamReader(is)); - String line = null; - while ((line = input.readLine()) != null) { - log(line); - } - return code; - } - - private void report(int code, boolean testPositive) { - if (testPositive) { //expect return code 200 - if(code != 200) { - log("Incorrect return code: " + code); - fail(); - } else { - log("Correct return code: " + code); - pass(); - } - } else { - if(code != 200) { //expect return code !200 - log("Correct return code: " + code); - pass(); - } else { - log("Incorrect return code: " + code); - fail(); - } - } - } - - private void log(String message) { - System.out.println("[war.client.Client]:: " + message); - } - - private void pass() { - log("PASSED: devtests/deployment/war/nojarexpansion"); - System.exit(0); - } - - private void fail() { - log("FAILED: devtests/deployment/war/nojarexpansion"); - System.exit(-1); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestProp.xml b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestProp.xml deleted file mode 100644 index 589e9becae2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestProp.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - Result for file ${file}: ${result} - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestServlet.java deleted file mode 100644 index b721e9798b4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestServlet.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package webinflib; - -import java.io.IOException; -import java.io.PrintWriter; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import dummypkg.DummyLib; - -public class TestServlet extends HttpServlet -{ - public void - init () throws ServletException - { - super.init(); - } - - public void - service (HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException - { - try { - DummyLib d = new DummyLib(); - PrintWriter out = response.getWriter(); - response.setContentType("text/html"); - out.println(""); - out.println(""); - out.println("TestServlet"); - out.println(""); - out.println(""); - out.println("

"); - out.println("Dummy Lib returned a String"); - out.println("

"); - out.println("Value is [" + d.getDummyString() + "]"); - out.println(""); - out.println(""); - out.flush(); - out.close(); - } catch (Exception ex) { - ex.printStackTrace(); - ServletException se = new ServletException(); - se.initCause(ex); - throw se; - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/build.xml deleted file mode 100644 index 94376452cf8..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/build.xml +++ /dev/null @@ -1,271 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - In ensure.no.file -Current setting of result is ${result}. -File to check is ${file.to.check} - - After available check, result is now ${result} - - - - - - After final check of results, value is now ${result} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/dummylib/DummyLib.java b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/dummylib/DummyLib.java deleted file mode 100644 index 1a39a4b77f2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/dummylib/DummyLib.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package dummypkg; - -public class DummyLib { - - public DummyLib() {} - - public String getDummyString() { - return "This is the string from dummy lib"; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/sun-web.xml deleted file mode 100644 index 5279cd2feb6..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/sun-web.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - war - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/web.xml deleted file mode 100644 index 4c742585632..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/web.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - nojarexpansion - - TestServlet - webinflib.TestServlet - 0 - - - TestServlet - /nojarexpansion - - - 54 - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/rollingupgrade/README b/appserver/tests/appserv-tests/devtests/deployment/war/rollingupgrade/README deleted file mode 100644 index 0c9104b85e0..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/rollingupgrade/README +++ /dev/null @@ -1,37 +0,0 @@ -The manual steps to test the rolling upgrade (will try to automate later) - -cd $SPS_HOME/ee/util -sh eesetup -asadmin deploy --target sqe-cluster old/foo.war -ping old foo's context root on instance 1 (positive test) -ping old foo's context root on instance 2 (positive test) -asadmin set sqe-cluster.dynamic-reconfiguration-enabled=false -asadmin deploy --target domain new/foo.war (upgraded version) -ping old foo's context root on instance 1(positive test) -ping new foo's context root on instance 1(negative test) -ping old foo's context root on instance 2(positive test) -ping new foo's context root on instance 2(negative test) -asadmin stop-instance clustered_server_1 -asadmin start-instance clustered_server_1 -ping old foo's context root on instance 1(negative test) -ping new foo's context root on instance 1 (positive test) -ping old foo's context root on instance 2 (positive test) -ping new foo's context root on instance 2 (negative test) -asadmin stop-instance clustered_server_2 -asadmin start-instance clustered_server_2 -ping old foo's context root on instance 1(negative test) -ping new foo's context root on instance 1 (positive test) -ping old foo's context root on instance 2 (negative test) -ping new foo's context root on instance 2 (positive test) -asadmin set sqe-cluster.dynamic-reconfiguration-enabled=true -asadmin deploy --target sqe-cluster bar.war -ping new foo's context root on instance 1 (positive test) -ping new foo's context root on instance 2 (positive test) -ping bar's context root on instance 1 (positive test) -ping bar's context root on instance 2 (positive test) -asadmin undeploy --target domain foo -ping new foo's context root on instance 1 (negative test) -ping new foo's context root on instance 2 (negative test) -ping bar's context root on instance 1 (positive test) -ping bar's context root on instance 2 (positive test) - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/META-INF/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/META-INF/MANIFEST.MF deleted file mode 100644 index 1b01187f08e..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/META-INF/MANIFEST.MF +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.7.0 -Created-By: 1.6.0_07-b06-57 (Apple Inc.) -Main-Class: not.Here diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestClient.java deleted file mode 100644 index 8f9e2245b2a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestClient.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package servletonly.client; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - -public class TestClient { - - /* to test .reload look for a changed value from one run to the next */ - private String changeableValue = null; - private String expectedChangeableValue = null; - - public static void main (String[] args) { - TestClient client = new TestClient(); - client.doTest(args); - } - - public void doTest(String[] args) { - - String url = args[0]; - if (args.length > 2) { - expectedChangeableValue = args[2]; - } - boolean testPositive = (Boolean.valueOf(args[1])).booleanValue(); - try { - log("Test: devtests/deployment/war/servletonly"); - int code = invokeServlet(url); - report(code, testPositive, expectedChangeableValue, changeableValue); - } catch (IOException ex) { - if (testPositive) { - ex.printStackTrace(); - fail(); - } else { - log("Caught EXPECTED IOException: " + ex); - pass(); - } - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private int invokeServlet(String url) throws Exception { - log("Invoking URL = " + url); - URL u = new URL(url); - HttpURLConnection c1 = (HttpURLConnection)u.openConnection(); - int code = c1.getResponseCode(); - InputStream is = c1.getInputStream(); - BufferedReader input = new BufferedReader (new InputStreamReader(is)); - String line = null; - while ((line = input.readLine()) != null) { - log(line); - if (line.startsWith("changeableValue=")) { - changeableValue = line.substring("changeableValue=".length()); - } - } - return code; - } - - private void report(int code, boolean testPositive, String expectedChangeableValue, String changeableValue) { - if (testPositive) { //expect return code 200 - if(code != 200) { - log("Incorrect return code: " + code); - fail(); - } else { - log("Correct return code: " + code); - if (expectedChangeableValue != null && expectedChangeableValue.length() > 0 && - ! expectedChangeableValue.equals("${extra.args}")) { - if (expectedChangeableValue.equals(changeableValue)) { - log("Correct changeable value: " + changeableValue); - pass(); - } else { - log("Incorrect changeable value: expected " + expectedChangeableValue + " but found " + changeableValue); - fail(); - } - } else { - // No expected changeable value to check. - pass(); - } - } - } else { - if(code != 200) { //expect return code !200 - log("Correct return code: " + code); - pass(); - } else { - log("Incorrect return code: " + code); - fail(); - } - } - } - - private void log(String message) { - System.err.println("[war.client.Client]:: " + message); - } - - private void pass() { - log("PASSED: devtests/deployment/war/servletonly"); - System.exit(0); - } - - private void fail() { - log("FAILED: devtests/deployment/war/servletonly"); - System.exit(-1); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestServlet.java deleted file mode 100644 index e70e0ec8177..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestServlet.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package servletonly; - -import java.io.IOException; -import java.io.PrintWriter; -import javax.naming.Context; -import javax.naming.InitialContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -public class TestServlet extends HttpServlet -{ - public void - init () throws ServletException - { - super.init(); - log("init()..."); - } - - public void - service (HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException - { - log("service()..."); - try { - Context ic = new InitialContext(); - - //test: looking up the env-entry - String name = (String) ic.lookup("java:comp/env/name"); - Integer value = (Integer) ic.lookup("java:comp/env/value"); - log("[" + name + "] = [" + value + "]"); - - /* - * The following line will compile correctly only when the ant - * devtest is running. The ChangeableClass class is generated - * by the ant task (two different ways at two different points - * in the processing). - */ - final String changeableValue = ChangeableClass.changeableValue(); - PrintWriter out = response.getWriter(); - response.setContentType("text/html"); - out.println(""); - out.println(""); - out.println("TestServlet"); - out.println(""); - out.println(""); - out.println("

"); - out.println("So what is your lucky number?"); - out.println("

"); - out.println("Mine is [" + value + "]"); - out.println("

"); - out.println("changeableValue=" + changeableValue); - out.println(""); - out.println(""); - out.flush(); - out.close(); - - } catch (Exception ex) { - ex.printStackTrace(); - ServletException se = new ServletException(); - se.initCause(ex); - throw se; - } - } - - public void log (String message) { - System.out.println("[war.servletonly.TestServlet]:: " + message); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/alt-glassfish-web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/alt-glassfish-web.xml deleted file mode 100644 index e7bd03ff27f..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/alt-glassfish-web.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - altwar - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/build.xml deleted file mode 100644 index 4d74acf8679..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/build.xml +++ /dev/null @@ -1,404 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - -package servletonly; -public class ChangeableClass { - public static String changeableValue() { - return "${expectedChangeableValue}"; - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/glassfish-web.xml deleted file mode 100644 index 8a412639d56..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/glassfish-web.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - war - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/sun-web.xml deleted file mode 100644 index b2d9e519ba1..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/sun-web.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - foo - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/web.xml deleted file mode 100644 index 6af6b4d3470..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/web.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - servletonly - - TestServlet - servletonly.TestServlet - 0 - - - TestServlet - /servletonly - - - 54 - - - name - java.lang.String - LuckyNumber - - - value - java.lang.Integer - 888 - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/build.xml index 6aee5636e84..60bc48a61be 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/build.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/build.xml @@ -132,7 +132,7 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestClient.java deleted file mode 100644 index d816e777bcb..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestClient.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package webinflib.client; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - -public class TestClient { - - public static void main (String[] args) { - TestClient client = new TestClient(); - client.doTest(args); - } - - public void doTest(String[] args) { - - String url = args[0]; - boolean testPositive = (Boolean.valueOf(args[1])).booleanValue(); - try { - log("Test: devtests/deployment/war/webinflib"); - int code = invokeServlet(url); - report(code, testPositive); - } catch (IOException ex) { - if (testPositive) { - ex.printStackTrace(); - fail(); - } else { - log("Caught EXPECTED IOException: " + ex); - pass(); - } - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private int invokeServlet(String url) throws Exception { - log("Invoking URL = " + url); - URL u = new URL(url); - HttpURLConnection c1 = (HttpURLConnection)u.openConnection(); - int code = c1.getResponseCode(); - InputStream is = c1.getInputStream(); - BufferedReader input = new BufferedReader (new InputStreamReader(is)); - String line = null; - while ((line = input.readLine()) != null) { - log(line); - } - return code; - } - - private void report(int code, boolean testPositive) { - if (testPositive) { //expect return code 200 - if(code != 200) { - log("Incorrect return code: " + code); - fail(); - } else { - log("Correct return code: " + code); - pass(); - } - } else { - if(code != 200) { //expect return code !200 - log("Correct return code: " + code); - pass(); - } else { - log("Incorrect return code: " + code); - fail(); - } - } - } - - private void log(String message) { - System.out.println("[war.client.Client]:: " + message); - } - - private void pass() { - log("PASSED: devtests/deployment/war/webinflib"); - System.exit(0); - } - - private void fail() { - log("FAILED: devtests/deployment/war/webinflib"); - System.exit(-1); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestServlet.java deleted file mode 100644 index b721e9798b4..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestServlet.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package webinflib; - -import java.io.IOException; -import java.io.PrintWriter; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import dummypkg.DummyLib; - -public class TestServlet extends HttpServlet -{ - public void - init () throws ServletException - { - super.init(); - } - - public void - service (HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException - { - try { - DummyLib d = new DummyLib(); - PrintWriter out = response.getWriter(); - response.setContentType("text/html"); - out.println(""); - out.println(""); - out.println("TestServlet"); - out.println(""); - out.println(""); - out.println("

"); - out.println("Dummy Lib returned a String"); - out.println("

"); - out.println("Value is [" + d.getDummyString() + "]"); - out.println(""); - out.println(""); - out.flush(); - out.close(); - } catch (Exception ex) { - ex.printStackTrace(); - ServletException se = new ServletException(); - se.initCause(ex); - throw se; - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/build.xml deleted file mode 100644 index 50842859816..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/build.xml +++ /dev/null @@ -1,235 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/dummylib/DummyLib.java b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/dummylib/DummyLib.java deleted file mode 100644 index 1a39a4b77f2..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/dummylib/DummyLib.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package dummypkg; - -public class DummyLib { - - public DummyLib() {} - - public String getDummyString() { - return "This is the string from dummy lib"; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/sun-web.xml deleted file mode 100644 index 5279cd2feb6..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/sun-web.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - war - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/web.xml deleted file mode 100644 index 241168f0214..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/web.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - webinflib - - TestServlet - webinflib.TestServlet - 0 - - - TestServlet - /webinflib - - - 54 - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/build.xml deleted file mode 100644 index fab18eba1d3..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/build.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/build.xml deleted file mode 100644 index f688edf4c27..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/build.xml +++ /dev/null @@ -1,219 +0,0 @@ - - - - -]> - - - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/config-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/config-interface.xml deleted file mode 100644 index 894789a180a..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/config-interface.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHello.java b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHello.java deleted file mode 100644 index d715c4ff28b..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHello.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - - package helloservice; - -import java.rmi.Remote; -import java.rmi.RemoteException; - - /* - * This is a minimum WebService interface - */ - public interface SayHello extends Remote { - - /* - * @return a hello string - */ - public String sayHello(String name) throws RemoteException; - - } - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHelloImpl.java b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHelloImpl.java deleted file mode 100644 index 59ac4c81f26..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHelloImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package helloservice; - -import java.rmi.RemoteException; - -public class SayHelloImpl implements SayHello { - - public String message ="Bonjour "; - - public String sayHello(String s) throws RemoteException { - return message + s; - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/staticstubclient/SayHelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/staticstubclient/SayHelloClient.java deleted file mode 100644 index d65a7ea738d..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/staticstubclient/SayHelloClient.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package staticstubclient; - -import javax.xml.rpc.Stub; -import helloservice.*; - -public class SayHelloClient { - - private String endpointAddress; - - public static void main(String[] args) { - - System.out.println("Endpoint address = " + args[0]); - boolean testPositive = (Boolean.valueOf(args[1])).booleanValue(); - try { - Stub stub = createProxy(); - stub._setProperty - (javax.xml.rpc.Stub.ENDPOINT_ADDRESS_PROPERTY, - args[0]); - SayHello hello = (SayHello)stub; - System.out.println(hello.sayHello("Jerome !")); - } catch (Exception ex) { - if(testPositive) { - ex.printStackTrace(); - System.exit(-1); - } else { - System.out.println("Exception recd as expected"); - } - } - System.exit(0); - } - - private static Stub createProxy() { - // Note: MyHelloService_Impl is implementation-specific. - return - (Stub) (new SayHelloService_Impl().getSayHelloPort()); - } -} diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/sun-web.xml deleted file mode 100644 index 0fa56a9c1ac..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/sun-web.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - HelloService - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/web.xml deleted file mode 100644 index 2d64676b131..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/web.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - HelloServiceWS - - HelloService - helloservice.SayHelloImpl - 0 - - - HelloService - /HelloService - - - 54 - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/webservices.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/webservices.xml deleted file mode 100644 index e4ea4b154d5..00000000000 --- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/webservices.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - Very simple web services - - A WebService Servlet that says Hello - WEB-INF/wsdl/SayHelloService.wsdl - mapping.xml - - port component description - SayHelloPort - tns:SayHelloPort - helloservice.SayHello - - HelloService - - - - diff --git a/appserver/tests/appserv-tests/devtests/deployment/webservices/annotations-common.xml b/appserver/tests/appserv-tests/devtests/deployment/webservices/annotations-common.xml index a37975d2d10..db84100913c 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/webservices/annotations-common.xml +++ b/appserver/tests/appserv-tests/devtests/deployment/webservices/annotations-common.xml @@ -16,181 +16,188 @@ --> - - + + - - - - + + + + - + - + - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - + includes="${pkg-name}/*.java" + > + + - + includes="${client-src-name}" + > + - - - - - + + + + + - + basedir="${env.APS_HOME}/build/module/classes" includes="${pkg-name}/**" + > + - - + + - - - - + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - - - + + + - - - + + + + Current time (ISO): ${TIMESTAMP} + + + - - + + - - + + - - + + - + - - - - - - - + + + + + + + - + - + diff --git a/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/client/Client.java index c0bbafc9b36..0dda22265fc 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/client/Client.java @@ -25,8 +25,7 @@ public class Client { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); + private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests"); @WebServiceRef(wsdlLocation="http://localhost:8080/HelloImplService/HelloImpl?WSDL") static HelloImplService service; From bb5b9bd3689161eb5b0bad8fb25b96012e843f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 21:22:06 +0100 Subject: [PATCH 12/33] #23507 EJB tests cleanup - still used j2ee.jar - mixed tabs and spaces - removed dead tests --- .../appserv-tests/devtests/ejb/run_test.sh | 96 +++--- .../devtests/ejb/sfsb/stress/build.xml | 2 +- .../ejb/stubs/standaloneclient/build.xml | 6 +- .../stubs/webclient/descriptor/sun-web.xml | 6 - .../ejb/stubs/webclient/servlet/Servlet.java | 17 +- .../devtests/ejb/util/methodmap/build.xml | 4 +- .../ejb/webservice/commit/build.properties | 31 -- .../devtests/ejb/webservice/commit/build.xml | 115 ------- .../ejb/webservice/commit/client/Client.java | 66 ---- .../ejb/webservice/commit/client/MANIFEST.MF | 2 - .../ejb/webservice/commit/ejb/CommitBean.java | 103 ------ .../commit/ejb/CommitStatefulBean.java | 48 --- .../commit/ejb/CommitStatefulLocal.java | 23 -- .../commit/sql/create_pointbase.sql | 8 - .../webservice/commit/sql/drop_pointbase.sql | 1 - .../ejb/webservice/ksink/GoogleSearch.wsdl | 104 ------ .../ksink/GoogleSearch_partial.wsdl | 223 ------------- .../webservice/ksink/GoogleSearch_types.wsdl | 161 --------- .../ejb/webservice/ksink/build.properties | 37 --- .../devtests/ejb/webservice/ksink/build.xml | 311 ----------------- .../ejb/webservice/ksink/client/Client.java | 312 ------------------ .../ksink/client/ClientHandler.java | 68 ---- .../ejb/webservice/ksink/client/MANIFEST.MF | 2 - .../ksink/descriptor/application-client.xml | 109 ------ .../ksink/descriptor/application.xml | 35 -- .../webservice/ksink/descriptor/ejb-jar.xml | 82 ----- .../descriptor/sun-application-client.xml | 89 ----- .../ksink/descriptor/sun-application.xml | 26 -- .../ksink/descriptor/sun-ejb-jar.xml | 37 --- .../ksink/descriptor/war/sun-web.xml | 42 --- .../webservice/ksink/descriptor/war/web.xml | 52 --- .../ksink/descriptor/war/webservices.xml | 54 --- .../ksink/descriptor/webservices.xml | 54 --- .../ejb/webservice/ksink/ejb/FooHandler.java | 68 ---- .../ejb/webservice/ksink/ejb/FooHome.java | 26 -- .../ejb/webservice/ksink/ejb/FooRemote.java | 25 -- .../ejb/webservice/ksink/ejb/GoogleEJB.java | 217 ------------ .../ksink/standalone/StandAloneClient.java | 86 ----- .../ejb/webservice/ksink/web/FooHandler.java | 68 ---- .../ksink/web/GoogleServletImpl.java | 135 -------- .../ksink/wscompile_config_appclient.xml | 25 -- .../webservice/ksink/wscompile_config_ejb.xml | 25 -- .../ksink/wscompile_config_standalone.xml | 25 -- .../webservice/ksink/wscompile_config_web.xml | 25 -- 44 files changed, 55 insertions(+), 2996 deletions(-) delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulLocal.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch_partial.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch_types.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml delete mode 100644 appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml diff --git a/appserver/tests/appserv-tests/devtests/ejb/run_test.sh b/appserver/tests/appserv-tests/devtests/ejb/run_test.sh index af86eeb3e10..07dc1a4b561 100755 --- a/appserver/tests/appserv-tests/devtests/ejb/run_test.sh +++ b/appserver/tests/appserv-tests/devtests/ejb/run_test.sh @@ -98,19 +98,19 @@ test_run_ejb_web(){ rm -rf $S1AS_HOME/domains/domain1 export ADMIN_PORT=45707 \ - JMS_PORT=45708 \ - JMX_PORT=45709 \ - ORB_PORT=45710 \ - SSL_PORT=45711 \ - INSTANCE_PORT=45712 \ - INSTANCE_HTTPS_PORT=45718 \ - INSTANCE_PORT_2=45719 \ - INSTANCE_PORT_3=45720 \ - ALTERNATE_PORT=45713 \ - ORB_SSL_PORT=45714 \ - ORB_SSL_MUTUALAUTH_PORT=45715 \ - DB_PORT=45716 \ - DB_PORT_2=45717 + JMS_PORT=45708 \ + JMX_PORT=45709 \ + ORB_PORT=45710 \ + SSL_PORT=45711 \ + INSTANCE_PORT=45712 \ + INSTANCE_HTTPS_PORT=45718 \ + INSTANCE_PORT_2=45719 \ + INSTANCE_PORT_3=45720 \ + ALTERNATE_PORT=45713 \ + ORB_SSL_PORT=45714 \ + ORB_SSL_MUTUALAUTH_PORT=45715 \ + DB_PORT=45716 \ + DB_PORT_2=45717 env cd ${APS_HOME} @@ -182,20 +182,20 @@ test_run_ejb_timer_cluster(){ rm -rf ${S1AS_HOME}/domains/domain1 export ADMIN_PORT=45707 \ - JMS_PORT=45708 \ - JMX_PORT=45709 \ - ORB_PORT=45710 \ - SSL_PORT=45711 \ - INSTANCE_PORT=45712 \ - INSTANCE_HTTP_PORT=45721 \ - INSTANCE_HTTPS_PORT=45718 \ - INSTANCE_PORT_2=45719 \ - INSTANCE_PORT_3=45720 \ - ALTERNATE_PORT=45713 \ - ORB_SSL_PORT=45714 \ - ORB_SSL_MUTUALAUTH_PORT=45715 \ - DB_PORT=45716 \ - DB_PORT_2=45717 + JMS_PORT=45708 \ + JMX_PORT=45709 \ + ORB_PORT=45710 \ + SSL_PORT=45711 \ + INSTANCE_PORT=45712 \ + INSTANCE_HTTP_PORT=45721 \ + INSTANCE_HTTPS_PORT=45718 \ + INSTANCE_PORT_2=45719 \ + INSTANCE_PORT_3=45720 \ + ALTERNATE_PORT=45713 \ + ORB_SSL_PORT=45714 \ + ORB_SSL_MUTUALAUTH_PORT=45715 \ + DB_PORT=45716 \ + DB_PORT_2=45717 env cd ${APS_HOME} @@ -278,32 +278,32 @@ get_test_target(){ run_test_id(){ - if [[ ${1} = "ejb_web_all" ]]; then - unzip_test_resources ${WORKSPACE}/bundles/web.zip - else - unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip - fi - dname=`pwd` - cd `dirname ${0}` - test_init - get_test_target ${1} - if [[ ${1} = "ejb_all" || ${1} = "ejb_group"* ]]; then - test_run_ejb - elif [[ ${1} = "ejb_timer_cluster_all" ]]; then - test_run_ejb_timer_cluster - elif [[ ${1} = "ejb_web_all" ]]; then - test_run_ejb_web - else - echo "Invalid Test ID" - exit 1 - fi - check_successful_run + if [[ ${1} = "ejb_web_all" ]]; then + unzip_test_resources ${WORKSPACE}/bundles/web.zip + else + unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip + fi + dname=`pwd` + cd `dirname ${0}` + test_init + get_test_target ${1} + if [[ ${1} = "ejb_all" || ${1} = "ejb_group"* ]]; then + test_run_ejb + elif [[ ${1} = "ejb_timer_cluster_all" ]]; then + test_run_ejb_timer_cluster + elif [[ ${1} = "ejb_web_all" ]]; then + test_run_ejb_web + else + echo "Invalid Test ID" + exit 1 + fi + check_successful_run generate_junit_report ${1} change_junit_report_class_names } list_test_ids(){ - echo ejb_all ejb_timer_cluster_all ejb_web_all ejb_group_1 ejb_group_2 ejb_group_3 ejb_group_embedded + echo ejb_all ejb_timer_cluster_all ejb_web_all ejb_group_1 ejb_group_2 ejb_group_3 ejb_group_embedded } OPT=${1} diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml index cede30f7974..49fc0c0e167 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml +++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml @@ -91,7 +91,7 @@ diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml index 0da9b7b0cce..cbdcbc9e579 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml +++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml @@ -48,7 +48,7 @@ @@ -65,7 +65,7 @@ @@ -96,7 +96,7 @@ ejb/hello ejb/ejb_stubs_ejbapp_HelloBean - diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java index ce6e779382d..9059386235c 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java +++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java @@ -43,22 +43,7 @@ public void service ( HttpServletRequest req , HttpServletResponse resp ) throws InitialContext ic = new InitialContext(); - System.out.println("Skipping mejb test for now. NEED TO REENABLE"); - // System.out.println("Calling DummyMEJBBean"); - - /* TODO reenable once javax.management classes are available - Object objref = ic.lookup("java:comp/env/ejb/dummymejb"); - ManagementHome mHome = (ManagementHome) - PortableRemoteObject.narrow(objref, ManagementHome.class); - Management dummyMejb = mHome.create(); - - System.out.println("Invoking dummy mejb to force context class loader test."); - dummyMejb.getMBeanCount(); - System.out.println("dummy mejb test successful"); - - */ - - System.out.println("Looking up ejb ref "); + System.out.println("Looking up ejb ref "); // create EJB using factory from container Object objref2 = ic.lookup("java:comp/env/ejb/hello"); System.out.println("objref = " + objref2); diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml index c426b9fcf1c..aab0dc21c1a 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml +++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml @@ -48,7 +48,7 @@ @@ -57,7 +57,7 @@ diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties deleted file mode 100644 index d590a1d8f2a..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml deleted file mode 100644 index 7b4f97a9dee..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - -]> - - - - &commonSetup; - &commonBuild; - &testproperties; - &run; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java deleted file mode 100644 index e841e979e7a..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.commit.client; - -import jakarta.xml.ws.WebServiceRef; - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - private static final String TEST_ID = "ejb-webservices-commit"; - - @WebServiceRef(wsdlLocation="http://localhost:8080/CommitBeanService/CommitBean?WSDL") - private static CommitBeanService service; - - public static void main(String[] args) { - stat.addDescription(TEST_ID); - Client client = new Client(); - client.doTest(args); - stat.printSummary(TEST_ID); - } - - public void doTest(String[] args) { - try { - CommitBean port = service.getCommitBeanPort(); - - try { - // now do another create that should fail at commit - // time and return an error. - port.updateCustomer(); - System.out.println("call to updateCustomer() should" + - " have failed."); - stat.addStatus(TEST_ID, stat.FAIL); - } catch(FinderException_Exception e) { - System.out.println("incorrectly received Application exception" - + " instead of system exception"); - stat.addStatus(TEST_ID, stat.FAIL); - } catch(Throwable e) { - System.out.println("Successfully received " + e + - "for commit failure"); - stat.addStatus(TEST_ID, stat.PASS); - } - - } catch(Exception e) { - e.printStackTrace(); - stat.addStatus(TEST_ID, stat.FAIL); - } - } -} - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/MANIFEST.MF deleted file mode 100644 index 81485c33fca..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: com.sun.s1asdev.ejb.webservice.commit.client.Client diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java deleted file mode 100644 index ef6ecae7931..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.commit; - -import jakarta.ejb.*; -import jakarta.annotation.Resource; -import jakarta.jws.WebService; -import javax.sql.*; -import java.util.*; -import java.sql.*; - -@Stateless -@WebService -@EJB(name="csb", beanInterface=CommitStatefulLocal.class) -public class CommitBean { - - @Resource(mappedName="jdbc/__default") - private DataSource ds; - - @Resource - private SessionContext sessionCtx; - - public int findCustomer(int i) throws FinderException { - Connection c = null; - PreparedStatement ps = null; - int returnValue = -1; - try { - c = ds.getConnection(); - ps = c.prepareStatement( - "SELECT c_id from O_customer where c_id = ?"); - ps.setInt(1, i); - ResultSet rs = ps.executeQuery(); - if (!rs.next()) - throw new FinderException("No cust for " + i); - returnValue = rs.getInt(1); - System.out.println("findCustomer = " + returnValue); - } catch (SQLException e) { - e.printStackTrace(); - throw new FinderException("SQL exception " + e); - } finally { - try { - if (ps != null) - ps.close(); - if (c != null) - c.close(); - } catch (Exception e) {} - } - - return returnValue; - } - - public void updateCustomer() throws FinderException { - - System.out.println( "In updateCustomer caller" ); - - Connection c = null; - PreparedStatement ps = null; - try { - c = ds.getConnection(); - ps = c.prepareStatement( - "UPDATE O_customer SET c_phone = ? WHERE c_id = 2 AND c_phone = 'foo'"); - ps.setString(1, "webservice"); - int result = ps.executeUpdate(); - System.out.println("execute update returned " + result); - } catch (SQLException e) { - e.printStackTrace(); - throw new FinderException("SQL exception " + e); - } finally { - try { - if (ps != null) - ps.close(); - if (c != null) - c.close(); - } catch (Exception e) {} - } - - System.out.println("Adding CommitStatefulBean with SessionSynch " + - " to transaction"); - - - CommitStatefulLocal csb = (CommitStatefulLocal) - sessionCtx.lookup("csb"); - csb.foo(); - - return; - - } - -} diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java deleted file mode 100644 index ae72c11e8a9..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.commit; - -import jakarta.ejb.*; -import jakarta.annotation.Resource; - -@Stateful -public class CommitStatefulBean - implements CommitStatefulLocal, SessionSynchronization { - - - @Resource SessionContext sessionCtx; - - public void foo() { - System.out.println("In CommitStatefulBean::foo"); - } - - public void afterBegin() { - System.out.println("In CommitStatefulBean::afterBegin()"); - } - - public void beforeCompletion() { - System.out.println("In CommitStatefulBean::beforeCompletion() " + - "marking tx for rollback"); - sessionCtx.setRollbackOnly(); - } - - public void afterCompletion(boolean committed) { - System.out.println("In CommitStatefulBean::afterCompletion()"); - } - - -} diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulLocal.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulLocal.java deleted file mode 100644 index b132f746204..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulLocal.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.commit; - -public interface CommitStatefulLocal { - - public void foo(); - -} diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql deleted file mode 100644 index b0a3497c7f5..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql +++ /dev/null @@ -1,8 +0,0 @@ -Drop table O_Customer; - -CREATE TABLE O_Customer ( - c_id integer NOT NULL PRIMARY KEY, - c_phone char(32) -); - -INSERT INTO O_Customer values (2, 'foo'); \ No newline at end of file diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql deleted file mode 100644 index d854b956da1..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql +++ /dev/null @@ -1 +0,0 @@ -Drop table O_Customer; diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch.wsdl b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch.wsdl deleted file mode 100644 index b6186340dbe..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch.wsdl +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch_partial.wsdl b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch_partial.wsdl deleted file mode 100644 index 845af9e954b..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch_partial.wsdl +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch_types.wsdl b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch_types.wsdl deleted file mode 100644 index 8bd283930c5..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch_types.wsdl +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties deleted file mode 100644 index a602c92b76e..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml deleted file mode 100644 index 4352160c371..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &commonRun; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Usage: - ant all (Executes the WebServices test) - ant contactgoogle (Executes the appclient contacting the Google.com WebServices) - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java deleted file mode 100644 index f3e96b6ba6d..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java +++ /dev/null @@ -1,312 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.ksink.googleclient; - -import java.io.*; -import java.util.*; -import java.net.URL; -import javax.naming.*; -import javax.xml.namespace.QName; -import javax.xml.rpc.Stub; -import javax.xml.rpc.Call; -import javax.xml.rpc.Service; -import java.rmi.Remote; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import java.lang.reflect.Method; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - private static final QName PORT_QNAME = - new QName("urn:GoogleSearch", "GoogleSearchPort"); - private static final QName OPERATION_QNAME = - new QName("urn:GoogleSearch", "doSpellingSuggestion"); - - private String word; - private String targetEndpointAddress; - private String testName; - - public static void main (String[] args) { - - stat.addDescription("googleserver appclient"); - Client client = new Client(args); - client.doTest(); - stat.printSummary("googleserver-applientID"); - } - - public Client(String[] args) { - word = (args.length > 0) ? args[0] : "spellng"; - targetEndpointAddress = (args.length > 1) ? args[1] : null; - testName = (args.length > 1) ? args[1] : "ksink_standalone"; - } - - public void doTest() { - - - try { - Context ic = new InitialContext(); - String googleKey = (String) - ic.lookup("java:comp/env/googlekey"); - GoogleSearchService googleSearchService = (GoogleSearchService) - ic.lookup("java:comp/env/service/GoogleSearch"); - - Class fooHomeClazz = Class.forName("com.sun.s1asdev.ejb.webservice.ksink.googleserver.FooHome"); - Object obj = ic.lookup("java:comp/env/ejb/googleserverejb"); - Object fooHome = javax.rmi.PortableRemoteObject.narrow - (obj, fooHomeClazz); - Method createMethod = fooHomeClazz.getMethod("create", - new Class[0]); - Object foo = createMethod.invoke(fooHome, new Object[0]); - Method helloOneWay = foo.getClass().getMethod("helloOneWay", - new Class[] { java.lang.String.class }); - helloOneWay.invoke(foo, new Object[] { "1000" } ); - - try { - googleSearchService.getHandlerRegistry(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println - ("Successfully caught unsupported operation exception " + - "for Service.getHandlerRegistry()"); - } - - try { - googleSearchService.getTypeMappingRegistry(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println - ("Successfully caught unsupported operation exception " + - "for Service.getTypeMappingRegistry()"); - } - - doDynamicProxyTest(googleSearchService, googleKey); - - GoogleSearchPort googleSearchPort = - googleSearchService.getGoogleSearchPort(); - doSpellingSuggestion(googleSearchPort, googleKey, - targetEndpointAddress); - - System.out.println("Using dynamic proxy to invoke endpoint"); - Service genericServiceWithWsdl = (Service) - ic.lookup("java:comp/env/service/GoogleSearchProxy"); - - doDynamicProxyTest(genericServiceWithWsdl, googleKey); - - googleSearchPort = (GoogleSearchPort) - genericServiceWithWsdl.getPort(GoogleSearchPort.class); - doSpellingSuggestion(googleSearchPort, googleKey, - targetEndpointAddress); - - doDIINoWSDLTest(ic, googleKey, targetEndpointAddress); - - System.out.println("Doing wsdl override tests"); - - Service partialWsdlServiceGeneric = (Service) - ic.lookup("java:comp/env/service/partialGeneric"); - GoogleSearchPort googleSearch = (GoogleSearchPort) - partialWsdlServiceGeneric.getPort(GoogleSearchPort.class); - googleSearch.doSpellingSuggestion(googleKey, word); - -/** GoogleSearchService partialWsdlServiceGenerated = - (GoogleSearchService) - ic.lookup("java:comp/env/service/partialGenerated"); - googleSearch = partialWsdlServiceGenerated.getGoogleSearchPort(); - googleSearch.doSpellingSuggestion(googleKey, word); -**/ - stat.addStatus("appclient " + testName, stat.PASS); - - - } catch (Exception ex) { - System.out.println("google client test failed"); - ex.printStackTrace(); - stat.addStatus("appclient " + testName, stat.FAIL); - } - - } - - private void doSpellingSuggestion(GoogleSearchPort googleSearchPort, - String googleKey, - String endpointAddress) - throws Exception { - - if( endpointAddress != null ) { - ((Stub)googleSearchPort)._setProperty - (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress); - System.out.println("Setting target endpoint address to " + - endpointAddress); - } else { - // if not set, use default - endpointAddress = (String) - ((Stub)googleSearchPort)._getProperty - (Stub.ENDPOINT_ADDRESS_PROPERTY); - } - - System.out.println("Contacting google for spelling " + - "suggestion at " + endpointAddress); - - String spellingSuggestion = - googleSearchPort.doSpellingSuggestion(googleKey, word); - System.out.println("Gave google the word '" + word + "' ... " + - " and the suggested spelling is '" + - spellingSuggestion + "'"); - } - - private void doDynamicProxyTest(Service service, String googleKey) throws Exception { - - Call c1 = service.createCall(); - Call c2 = service.createCall(PORT_QNAME); - Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME); - Call c4 = service.createCall(PORT_QNAME, - OPERATION_QNAME.getLocalPart()); - Call[] calls = service.getCalls(PORT_QNAME); - - if( targetEndpointAddress != null ) { - c3.setTargetEndpointAddress(targetEndpointAddress); - } - Object params[] = new Object[] {googleKey, "hello" }; - String response = (String) c3.invoke(params); - System.out.println("Response = " + response); - - // container-managed port selection - GoogleSearchPort sei = (GoogleSearchPort) - service.getPort(GoogleSearchPort.class); - sei = (GoogleSearchPort) - service.getPort(PORT_QNAME, GoogleSearchPort.class); - - QName serviceName = service.getServiceName(); - URL wsdlLocation = service.getWSDLDocumentLocation(); - if( wsdlLocation != null ) { - System.out.println("wsdlLocation = " + wsdlLocation); - } - Iterator ports = service.getPorts(); - - System.out.println("Calling oneway operation"); - Call oneway = service.createCall(PORT_QNAME, "helloOneWay"); - if( targetEndpointAddress != null ) { - oneway.setTargetEndpointAddress(targetEndpointAddress); - } - - long oneWayMethodWaitTimeInMillis = 4000; - - Date before = new Date(); - oneway.invokeOneWay(new Object[] - { oneWayMethodWaitTimeInMillis + "" }); - Date after = new Date(); - long elapsedTime = after.getTime() - before.getTime(); - System.out.println("one way operation began at " + before + - " and returned at " + after + - " and took " + elapsedTime + " milli-seconds"); - if( elapsedTime > oneWayMethodWaitTimeInMillis ) { - throw new Exception("one way operation blocked for too long "); - } - - // now wait for the remainder of the time. this is to - // avoid race conditions where we finish the test and begin - // to undeploy, but the endpoint is still executing its - // oneway operation. - long sleepTime = (oneWayMethodWaitTimeInMillis - elapsedTime); - - System.out.println("now sleeping for " + sleepTime + " milli secs"); - Thread.sleep(sleepTime); - System.out.println("returning from doDynamicProxyTest"); - } - - private void doDIINoWSDLTest(Context ic, String googleKey, - String endpointAddress) throws Exception { - - System.out.println("Doing DII without WSDL tests"); - - Service service =(Service) ic.lookup("java:comp/env/service/DIINoWSDL"); - - try { - Call call = service.createCall(PORT_QNAME); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.createCall(QName port)"); - } - - try { - Call call = service.createCall(PORT_QNAME, OPERATION_QNAME); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getCall(QName, QName)"); - } - - - try { - Call call = service.createCall(PORT_QNAME, "doSpellingSuggestion"); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getCall(QName, String)"); - } - - try { - Call[] calls = service.getCalls(PORT_QNAME); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getCalls()"); - } - - try { - service.getHandlerRegistry(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println - ("Successfully caught unsupported operation exception " + - "for Service.getHandlerRegistry()"); - } - - try { - Remote remote = service.getPort(GoogleSearchPort.class); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getPort(SEI)"); - } - - try { - Remote remote = service.getPort(PORT_QNAME, GoogleSearchPort.class); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getPort(QName, SEI)"); - } - - try { - Iterator ports = service.getPorts(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getPorts()"); - } - - try { - QName serviceName = service.getServiceName(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getName()"); - } - - try { - service.getTypeMappingRegistry(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println - ("Successfully caught unsupported operation exception " + - "for Service.getTypeMappingRegistry()"); - } - - Call untypedCall = service.createCall(); - - } -} - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java deleted file mode 100644 index 9b21cd4835e..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.ksink.googleclient; - -import java.util.Map; - -import javax.xml.rpc.handler.Handler; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.namespace.QName; - -import javax.naming.InitialContext; - -public class ClientHandler extends GenericHandler { - - public void destroy() { - System.out.println("In ClientHandler::destroy()"); - } - - public QName[] getHeaders() { - return new QName[0]; - } - - public boolean handleFault(MessageContext context) { - System.out.println("In ClientHandler::handleFault()"); - return true; - } - - public boolean handleRequest(MessageContext context) { - System.out.println("In ClientHandler::handleRequest()"); - return true; - } - - public boolean handleResponse(MessageContext context) { - System.out.println("In ClientHandler::handleResponse()"); - return true; - } - - public void init(HandlerInfo config) { - System.out.println("In ClientHandler::init()"); - try { - InitialContext ic = new InitialContext(); - String googleKey = (String) ic.lookup("java:comp/env/googlekey"); - System.out.println("google key = " + googleKey); - } catch(Exception e) { - e.printStackTrace(); - } - - System.out.println("Handler init params = " + - config.getHandlerConfig()); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/MANIFEST.MF deleted file mode 100644 index 5e8bd3e910d..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: com.sun.s1asdev.ejb.webservice.ksink.googleclient.Client diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml deleted file mode 100644 index 03192a39989..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - This is my google app client - ksinkClient - - googlekey - java.lang.String - vCkqMIpV1WMKIRpNa7gBiYQZxDUYOYOj - - - ejb/googleserverejb - Session - com.sun.s1asdev.ejb.webservice.ksink.googleserver.FooHome - com.sun.s1asdev.ejb.webservice.ksink.googleserver.FooRemote - GoogleEjb - - - google service ref - MY GOOGLE SERVICE REF DISPLAY name - service/GoogleSearch - com.sun.s1asdev.ejb.webservice.ksink.googleclient.GoogleSearchService - META-INF/wsdl/GoogleSearch.wsdl - GoogleMapping_appclient.xml - - com.sun.s1asdev.ejb.webservice.ksink.googleclient.GoogleSearchPort - - GoogleSearchEjbPort - - - handler 1 - handler1 - com.sun.s1asdev.ejb.webservice.ksink.googleclient.ClientHandler - - param1 description - a - b - - googlens:DirectoryCategory - - Role1 - Role2 - GoogleSearchPort - - - - dynamic proxy google service ref - service/GoogleSearchProxy - javax.xml.rpc.Service - META-INF/wsdl/GoogleSearch.wsdl - googleclient.model - - com.sun.s1asdev.ejb.webservice.ksink.googleclient.GoogleSearchPort - - - - handler 1 - handler1 - com.sun.s1asdev.ejb.webservice.ksink.googleclient.ClientHandler - - param description - c - d - - - - - dii google service ref - service/DIINoWSDL - javax.xml.rpc.Service - - - partial wsdl test google service ref - service/partialGeneric - javax.xml.rpc.Service - META-INF/wsdl/GoogleSearch_partial.wsdl - GoogleMapping_appclient.xml - - com.sun.s1asdev.ejb.webservice.ksink.googleclient.GoogleSearchPort - - ksink-web.war#GoogleSearchPort - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application.xml deleted file mode 100644 index 55ef2279087..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Application description - GoogleServerApp - - - ksink-web.war - - - - - ksink-client.jar - - - ksink-ejb.jar - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/ejb-jar.xml deleted file mode 100644 index 00f3f3f7e3c..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/ejb-jar.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Ejb1 - - - GoogleEjb - com.sun.s1asdev.ejb.webservice.ksink.googleserver.FooHome - com.sun.s1asdev.ejb.webservice.ksink.googleserver.FooRemote - com.sun.s1asdev.ejb.webservice.ksink.googleserver.GoogleSearchPort - com.sun.s1asdev.ejb.webservice.ksink.googleserver.GoogleEJB - Stateless - Container - - entry1 - java.lang.String - Blah - - - service ref for web endpoint - service/WebDIIReference - javax.xml.rpc.Service - META-INF/wsdl/GoogleSearch.wsdl - GoogleMapping_ejb.xml - - com.sun.s1asdev.ejb.webservice.ksink.googleserver.GoogleSearchPort - - ksink-web.war#GoogleSearchPort - - - - - - - - - - - GoogleEjb - ServiceEndpoint - * - - Required - - - - GoogleEjb - ServiceEndpoint - helloOneWay - - java.lang.String - - - NotSupported - - - - GoogleEjb - Remote - * - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-application-client.xml deleted file mode 100644 index 7a3aa87c3c2..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-application-client.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - service/GoogleSearch - - googleclient.GoogleSearchPort - - - urn:GoogleSearch - GoogleSearchPort - - - javax.xml.rpc.security.auth.username - j2ee - - - javax.xml.rpc.security.auth.password - j2ee - - - javax.xml.rpc.security.auth.username - j2ee - - - javax.xml.rpc.security.auth.password - j2ee - - - - - service/GoogleSearchProxy - - googleclient.GoogleSearchPort - - - urn:GoogleSearch - GoogleSearchPort - - - javax.xml.rpc.service.endpoint.address - http://localhost:8000/google/GoogleSearch - - - javax.xml.rpc.security.auth.username - j2ee - - - javax.xml.rpc.security.auth.password - j2ee - - - javax.xml.rpc.security.auth.username - j2ee - - - javax.xml.rpc.security.auth.password - j2ee - - - - - service/partialGeneric - file:GoogleSearch_final.wsdl - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-application.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-application.xml deleted file mode 100644 index 16ce7799ff7..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-application.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - ksink-web.war - ejb_webservice_ksink_GoogleServlet - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 3ab2d75632a..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - GoogleEjb - com_sun_s1asdev_ejb_webservice_ksink_GoogleEjb - - GoogleSearchEjbPort - ejb_webservice_ksink_GoogleEJB/GoogleSearch - - - - GoogleServiceEjb - - file:publish - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/sun-web.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/sun-web.xml deleted file mode 100644 index 26fc5e2359e..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/sun-web.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - service/EjbDIIReference - - com.sun.s1asdev.ejb.webservice.ksink.googleserverweb.GoogleSearchPort - - - urn:GoogleSearch - GoogleSearchPort - - - javax.xml.rpc.security.auth.username - j2ee - - - javax.xml.rpc.security.auth.password - j2ee - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/web.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/web.xml deleted file mode 100644 index c44ecded387..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/web.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - GoogleWebApp - - GoogleServlet - com.sun.s1asdev.ejb.webservice.ksink.googleserverweb.GoogleServletImpl - 0 - - - GoogleServlet - /GoogleSearch - - - 54 - - - entry1 - java.lang.String - Blah - - - service ref for ejb endpoint - service/EjbDIIReference - javax.xml.rpc.Service - WEB-INF/wsdl/GoogleSearch.wsdl - googleweb.model - googlens:GoogleSearchService - - com.sun.s1asdev.ejb.webservice.ksink.googleserverweb.GoogleSearchPort - - ksink-ejb.jar#GoogleSearchEjbPort - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/webservices.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/webservices.xml deleted file mode 100644 index a5f6d6f56b5..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/webservices.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - desc - - GoogleServiceServlet - WEB-INF/wsdl/GoogleSearch.wsdl - googleweb.model - - port component description - GoogleSearchPort - googlens:GoogleSearchPort - com.sun.s1asdev.ejb.webservice.ksink.googleserverweb.GoogleSearchPort - - - GoogleServlet - - - handler 1 - handler1 - com.sun.s1asdev.ejb.webservice.ksink.googleserverweb.FooHandler - - param1 description - a - b - - googlens:DirectoryCategory - Role1 - Role2 - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/webservices.xml deleted file mode 100644 index 76f5cc4f14a..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/webservices.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - desc - - GoogleServiceEjb - META-INF/wsdl/GoogleSearch.wsdl - GoogleMapping_ejb.xml - - port component description - GoogleSearchEjbPort - googlens:GoogleSearchPort - com.sun.s1asdev.ejb.webservice.ksink.googleserver.GoogleSearchPort - - - GoogleEjb - - - handler 1 - handler1 - com.sun.s1asdev.ejb.webservice.ksink.googleserver.FooHandler - - param1 description - a - b - - googlens:DirectoryCategory - Role1 - Role2 - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java deleted file mode 100644 index 00390b9afea..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.ksink.googleserver; - -import java.util.Map; - -import javax.xml.rpc.handler.Handler; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.namespace.QName; - -import javax.naming.InitialContext; - -public class FooHandler extends GenericHandler { - - public void destroy() { - System.out.println("In FooHandler::destroy()"); - } - - public QName[] getHeaders() { - return new QName[0]; - } - - public boolean handleFault(MessageContext context) { - System.out.println("In FooHandler::handleFault()"); - return true; - } - - public boolean handleRequest(MessageContext context) { - System.out.println("In FooHandler::handleRequest()"); - return true; - } - - public boolean handleResponse(MessageContext context) { - System.out.println("In FooHandler::handleResponse()"); - return true; - } - - public void init(HandlerInfo config) { - System.out.println("In FooHandler::init()"); - try { - InitialContext ic = new InitialContext(); - String envEntry = (String) ic.lookup("java:comp/env/entry1"); - System.out.println("env-entry = " + envEntry); - } catch(Exception e) { - e.printStackTrace(); - } - - System.out.println("Handler init params = " + - config.getHandlerConfig()); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java deleted file mode 100644 index 678759af43d..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.ksink.googleserver; - -import jakarta.ejb.EJBHome; -import java.rmi.RemoteException; - -public interface FooHome extends EJBHome { - - FooRemote create() throws RemoteException; - -} diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java deleted file mode 100644 index d3483f4781b..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.ksink.googleserver; - -import jakarta.ejb.EJBObject; -import java.rmi.RemoteException; - -public interface FooRemote extends EJBObject, GoogleSearchPort { - - -} diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java deleted file mode 100644 index 7f46ae9b44a..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.ksink.googleserver; - -import java.util.Iterator; -import java.util.Date; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.Service; -import javax.xml.rpc.Call; -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; - -public class GoogleEJB implements SessionBean { - private SessionContext sc; - - private static final QName PORT_QNAME = - new QName("urn:GoogleSearch", "GoogleSearchPort"); - private static final QName OPERATION_QNAME = - new QName("urn:GoogleSearch", "doSpellingSuggestion"); - - public GoogleEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In GoogleEJB::ejbCreate !!"); - } - - public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) - { - return null; - } - - public String doSpellingSuggestion(java.lang.String key, - java.lang.String phrase) - { - - try { - InitialContext ic = new InitialContext(); - String entry1 = (String) ic.lookup("java:comp/env/entry1"); - System.out.println("java:comp/env/entry1 = " + entry1); - } catch(Exception e) { - e.printStackTrace(); - throw new EJBException(e.getMessage(), e); - } - - MessageContext msgContext = sc.getMessageContext(); - - System.out.println("GoogleEJB.doSpellingSuggestion() called with " + - phrase); - - try { - java.security.Principal principal = sc.getCallerPrincipal(); - System.out.println("GoogleEJB.doSpellingSuggestion():getCallerPrincipal() = " + principal); - if(principal == null) { - throw new EJBException("GoogleEJB.doSpellingSuggestion():getCallerPrincipal() cannot return NULL"); - } - } catch (Exception ex) { - ex.printStackTrace(); - throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught - ", ex); - } - - /* - try { - - boolean result = sc.isCallerInRole("foo"); - System.out.println( - "GoogleEJB.doSpellingSuggestion():isCallerInRole(foo) returned - " + result); - if(!result) { - throw new EJBException("GoogleEJB.doSpellingSuggestion():isCallerInRole(foo) should not have returned false"); - } - } catch (Exception ex) { - ex.printStackTrace(); - throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught in isCallerInRole(foo) call ", ex); - } - */ - - String returnValue = "spelling suggestion from ejb"; - if( phrase.equals("forwardweb") ) { - System.out.println("Forwarding spelling suggestion to webendpoint"); - Service genericServiceWithWSDL = null; - try { - InitialContext ic = new InitialContext(); - Service service = (Service) - ic.lookup("java:comp/env/service/WebDIIReference"); - doDynamicProxyTest(service); - GoogleSearchPort webPort = (GoogleSearchPort) - service.getPort(GoogleSearchPort.class); - returnValue = webPort.doSpellingSuggestion(key, phrase); - } catch(Exception e) { - e.printStackTrace(); - throw new EJBException(e.getMessage(), e); - } - } - - System.out.println("GoogleEJB returning " + returnValue); - return returnValue; - } - - public void helloOneWay(String s1) { - - jakarta.transaction.TransactionManager tm = - com.sun.enterprise.Switch.getSwitch().getTransactionManager(); - int txStatus = -1; - try { - txStatus = tm.getStatus(); - } catch(Exception e) { - throw new EJBException(e); - } - - // The following tests make sure tx attributes are processed - // correctly when the same method is defined on both the remote - // and webservice interface. Descriptor is set up to have - // no tx for the webservice case and a TX_REQUIRED for the - // Remote case. - try { - - sc.getMessageContext(); - - // we were invoked through a webserivce invocation. there - // shouldn't be a transaction. - if( txStatus == jakarta.transaction.Status.STATUS_NO_TRANSACTION) { - System.out.println("Correctly found no tx for helloOneWay " + - " invoked through a webservice"); - } else { - throw new EJBException("Got wrong tx status = " + txStatus + - " for helloOneWay invoked through a " + - "web service"); - } - } catch(Exception e) { - // since there's no WEB service message context, we were - // invoked through a remote invocation. - - if( txStatus == jakarta.transaction.Status.STATUS_ACTIVE) { - System.out.println("Correctly found an active tx for " + - "helloOneWay invoked through a Remote interface"); - } else { - throw new EJBException("Got wrong tx status = " + txStatus + - " for helloOneWay invoked through a " + - "remote interface"); - } - } - - System.out.println("In GoogleEJB::helloOneWay. param = " + - s1); - System.out.println("Sleeping for " + s1 + " milliseconds starting " - + " at " + new Date()); - - try { - Thread.sleep((new Integer(s1)).intValue()); - } catch(Exception e) { - e.printStackTrace(); - } - System.out.println("Exiting GoogleEJB:helloOneWay at " + - new Date()); - } - - public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) { - return null; - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} - - private void doDynamicProxyTest(Service service) throws Exception { - - Call c1 = service.createCall(); - Call c2 = service.createCall(PORT_QNAME); - Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME); - Call c4 = service.createCall(PORT_QNAME, - OPERATION_QNAME.getLocalPart()); - Call[] calls = service.getCalls(PORT_QNAME); - - // container-managed port selection - GoogleSearchPort sei = (GoogleSearchPort) - service.getPort(GoogleSearchPort.class); - sei = (GoogleSearchPort) - service.getPort(PORT_QNAME, GoogleSearchPort.class); - - QName serviceName = service.getServiceName(); - URL wsdlLocation = service.getWSDLDocumentLocation(); - if( wsdlLocation != null ) { - System.out.println("wsdlLocation = " + wsdlLocation); - } - Iterator ports = service.getPorts(); - - } - - - -} diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java deleted file mode 100644 index 2b36e523974..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.ksink.standalone; - -import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.rpc.Stub; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class StandAloneClient { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - private String word; - private String targetEndpointAddress; - private String googleKey; - - public static void main (String[] args) { - stat.addDescription("googleserver standalone"); - StandAloneClient client = new StandAloneClient(args); - client.doTest(); - stat.printSummary("googleserver-standaloneID"); - } - - public StandAloneClient(String[] args) { - word = (args.length > 0) ? "spellng" : args[0]; - targetEndpointAddress = (args.length > 1) ? - args[1] : "http://api.google.com/search/beta2"; - googleKey = (args.length > 2) ? - args[2] : "vCkqMIpV1WMKIRpNa7gBiYQZxDUYOYOj"; - } - - public void doTest() { - try { - GoogleSearchService googleSearchService = - new GoogleSearchService_Impl(); - - GoogleSearchPort googleSearchPort = - googleSearchService.getGoogleSearchPort(); - - ((Stub)googleSearchPort)._setProperty - (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - ((Stub)googleSearchPort)._setProperty - (Stub.USERNAME_PROPERTY, "j2ee"); - ((Stub)googleSearchPort)._setProperty - (Stub.PASSWORD_PROPERTY, "j2ee"); - - System.out.println("Contacting google for spelling suggestion at " - + targetEndpointAddress); - String spellingSuggestion = - googleSearchPort.doSpellingSuggestion(googleKey, word); - System.out.println("Gave google the word '" + word + "' ... " + - " and the suggested spelling is '" + - spellingSuggestion + "'"); - - stat.addStatus("appclient main", stat.PASS); - - } catch (Exception ex) { - System.out.println("google client test failed"); - ex.printStackTrace(); - stat.addStatus("appclient main" , stat.FAIL); - - } - - } - -} - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java deleted file mode 100644 index f5c3a6d3ba2..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.ksink.googleserverweb; - -import java.util.Map; - -import javax.xml.rpc.handler.Handler; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.namespace.QName; - -import javax.naming.InitialContext; - -public class FooHandler extends GenericHandler { - - public void destroy() { - System.out.println("In FooHandler::destroy()"); - } - - public QName[] getHeaders() { - return new QName[0]; - } - - public boolean handleFault(MessageContext context) { - System.out.println("In FooHandler::handleFault()"); - return true; - } - - public boolean handleRequest(MessageContext context) { - System.out.println("In FooHandler::handleRequest()"); - return true; - } - - public boolean handleResponse(MessageContext context) { - System.out.println("In FooHandler::handleResponse()"); - return true; - } - - public void init(HandlerInfo config) { - System.out.println("In FooHandler::init()"); - try { - InitialContext ic = new InitialContext(); - String envEntry = (String) ic.lookup("java:comp/env/entry1"); - System.out.println("env-entry = " + envEntry); - } catch(Exception e) { - e.printStackTrace(); - } - - System.out.println("Handler init params = " + - config.getHandlerConfig()); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java deleted file mode 100644 index 6d04ad3f34d..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.ejb.webservice.ksink.googleserverweb; - -import java.util.Date; -import java.util.Iterator; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.rpc.Call; -import java.io.Serializable; -import java.rmi.RemoteException; -import javax.naming.*; -import javax.xml.rpc.Service; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.namespace.QName; - -public class GoogleServletImpl implements jakarta.servlet.SingleThreadModel, ServiceLifecycle { - - private static final QName PORT_QNAME = - new QName("urn:GoogleSearch", "GoogleSearchPort"); - private static final QName OPERATION_QNAME = - new QName("urn:GoogleSearch", "doSpellingSuggestion"); - - private boolean gotInit = false; - - public GoogleServletImpl() { - System.out.println("GoogleServletImpl() instantiated"); - } - - public void init(Object context) { - System.out.println("Got ServiceLifecycle::init call " + context); - gotInit = true; - } - - public void destroy() { - System.out.println("Got ServiceLifecycle::destroy call"); - } - - public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) - { - return null; - } - - public void helloOneWay(String s1) { - - System.out.println("In GoogleServletImpl::helloOneWay. param = " + - s1); - System.out.println("Sleeping for " + s1 + " milliseconds starting " - + " at " + new Date()); - - try { - Thread.sleep((new Integer(s1)).intValue()); - } catch(Exception e) { - e.printStackTrace(); - } - System.out.println("Exiting GoogleServletImpl:helloOneWay at " + - new Date()); - } - - public String doSpellingSuggestion(java.lang.String key, - java.lang.String phrase) - - throws RemoteException { - System.out.println("GoogleServletImpl.doSpellingSuggestion() " + - " called with " + phrase); - - if( !gotInit ) { - throw new RuntimeException("Got business method before init()"); - } - - String returnValue = "spelling suggestion from web"; - if( phrase.equals("forwardejb") ) { - System.out.println("Forwarding spelling suggestion to ejbendpoint"); - Service genericServiceWithWSDL = null; - try { - InitialContext ic = new InitialContext(); - Service service = (Service) - ic.lookup("java:comp/env/service/EjbDIIReference"); - doDynamicProxyTest(service); - GoogleSearchPort ejbPort = (GoogleSearchPort) - service.getPort(GoogleSearchPort.class); - returnValue = ejbPort.doSpellingSuggestion(key, phrase); - } catch(Exception e) { - e.printStackTrace(); - throw new RemoteException(e.getMessage(), e); - } - } - - System.out.println("GoogleServletImpl returning " + returnValue); - return returnValue; - } - - public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) { - return null; - } - - private void doDynamicProxyTest(Service service) throws Exception { - - Call c1 = service.createCall(); - Call c2 = service.createCall(PORT_QNAME); - Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME); - Call c4 = service.createCall(PORT_QNAME, - OPERATION_QNAME.getLocalPart()); - Call[] calls = service.getCalls(PORT_QNAME); - - // container-managed port selection - GoogleSearchPort sei = (GoogleSearchPort) - service.getPort(GoogleSearchPort.class); - sei = (GoogleSearchPort) - service.getPort(PORT_QNAME, GoogleSearchPort.class); - - QName serviceName = service.getServiceName(); - URL wsdlLocation = service.getWSDLDocumentLocation(); - if( wsdlLocation != null ) { - System.out.println("wsdlLocation = " + wsdlLocation); - } - Iterator ports = service.getPorts(); - - } - -} diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml deleted file mode 100644 index 36f858e7240..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml deleted file mode 100644 index 76c99510b9c..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml deleted file mode 100644 index 08a03a8f427..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml deleted file mode 100644 index cc93bfd6414..00000000000 --- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - From fa4c67cd4718f0686a9ec6d28cc85c192634f835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 21:31:54 +0100 Subject: [PATCH 13/33] #23507 Naming tests reenabled and fixed --- .../appserv-tests/devtests/naming/build.xml | 8 +- .../naming/listjndi/ListJndiEntriesTest.java | 15 +- .../devtests/naming/listjndi/build.xml | 4 - .../naming/loadbalancing/enroller/build.xml | 298 +++++++++--------- .../enroller/client/EnrollerClient.java | 90 ++---- .../devtests/naming/naming2/build.xml | 1 + .../devtests/naming/naming2/context/pom.xml | 39 +-- .../src/test/java/test/ContextTest.java | 138 +++++--- .../devtests/naming/naming2/pom.xml | 7 +- 9 files changed, 300 insertions(+), 300 deletions(-) diff --git a/appserver/tests/appserv-tests/devtests/naming/build.xml b/appserver/tests/appserv-tests/devtests/naming/build.xml index 67132ad4ddb..9a7f31c5283 100644 --- a/appserver/tests/appserv-tests/devtests/naming/build.xml +++ b/appserver/tests/appserv-tests/devtests/naming/build.xml @@ -40,7 +40,7 @@ - + @@ -48,8 +48,10 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java b/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java index 92fc39a0420..ef933c7bc92 100644 --- a/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java +++ b/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -25,7 +26,7 @@ public class ListJndiEntriesTest extends AdminBaseDevTest { public static final String[] EXPECTED_TOKENS = - {"UserTransaction:", "java:global:", "ejb:", "com.sun.enterprise.naming.impl.TransientContext"}; + {"UserTransaction:", "jdbc:", "jms:", "com.sun.enterprise.naming.impl.TransientContext"}; public static final String INSTANCE_RESOURCE_NAME = "INSTANCE_RESOURCE_NAME"; public static final String CLUSTER_RESOURCE_NAME = "CLUSTER_RESOURCE_NAME"; @@ -92,8 +93,8 @@ public void testListJndiEntries() { AsadminReturn result = asadminWithOutput("list-jndi-entries"); reportResultStatus(testName, result); reportExpectedResult(testName, result); - reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME, - CLUSTER_NAME, INSTANCE1_NAME); + reportExpectedResult(testName, result, "java:global:"); + reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME, CLUSTER_NAME, INSTANCE1_NAME); } public void testListJndiEntriesTargetServer() { @@ -101,8 +102,8 @@ public void testListJndiEntriesTargetServer() { AsadminReturn result = asadminWithOutput("list-jndi-entries", "server"); reportResultStatus(testName, result); reportExpectedResult(testName, result); - reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME, - CLUSTER_NAME, INSTANCE1_NAME); + reportExpectedResult(testName, result, "java:global:"); + reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME, CLUSTER_NAME, INSTANCE1_NAME); } public void testListJndiEntriesTargetDomain() { @@ -110,6 +111,7 @@ public void testListJndiEntriesTargetDomain() { AsadminReturn result = asadminWithOutput("list-jndi-entries", "domain"); reportResultStatus(testName, result); reportExpectedResult(testName, result); + reportExpectedResult(testName, result, "java:global:"); } public void testListJndiEntriesTargetCluster() { @@ -150,7 +152,8 @@ public void testListJndiEntriesTargetStandaloneInstance() { private void reportResultStatus(String testName, AsadminReturn result) { report(testName + "-returnValue", result.returnValue); - report(testName + "-isEmpty", result.err.isEmpty()); + // FIXME: on Jenkins prints Picked up JAVA_TOOLS_OPTIONS ... +// report(testName + "-isEmpty", result.err.isEmpty()); } private void reportExpectedResult(String testName, AsadminReturn result, String... expected) { diff --git a/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml b/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml index 197f801eee6..b5c77145c2d 100644 --- a/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml +++ b/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml @@ -68,14 +68,10 @@ - - diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml index 431257c3bc7..35d36b33e63 100755 --- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml +++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml @@ -33,163 +33,157 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java index 97567495eb3..2f5307b9a24 100755 --- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java +++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java @@ -28,18 +28,16 @@ public class EnrollerClient { - private SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); + private SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests"); public static void main(String[] args) { EnrollerClient client = new EnrollerClient(); - - // run the tests client.runTestClient(args); } + public void runTestClient(String[] args) { - try{ + try { stat.addDescription("Testing loadbalancing app."); test01(args); testInAppClientContainer(); @@ -72,43 +70,26 @@ private void test01(String[] args) { System.out.println("looking up ejb/MyStudent using org.glassfish.jndi.cosnaming.CNCtxFactory..."); Object obj = ctx.lookup("ejb/MyStudent"); System.out.println("Looked up ejb/MyStudent with CnCtxFactory..."); - StudentHome sH = - (StudentHome) PortableRemoteObject.narrow(obj, - StudentHome.class); - Student denise1 = sH.create("111", "Tiffany Moore"); + StudentHome sH = (StudentHome) PortableRemoteObject.narrow(obj, StudentHome.class); + Student tiffany = sH.create("111", "Tiffany Moore"); System.out.println("Created student id 111 for Tiffany Moore"); + Student denise = sH.create("823", "Denise Smith"); Context initial = new InitialContext(); - System.out.println("Looking up MEJB..."); - Object objref = initial.lookup("ejb/mgmt/MEJB"); - System.out.println("Looked up ejb/mgmt/MEJB"); System.out.println("Looking up EJB REFs whose jndi name is specified as a corbaname: url ==>"); System.out.println("Creating new Context 1.."); System.out.println("Using Context 1, Looking up EJB using corbaname: url with global jndi name ==>"); - objref = initial.lookup("corbaname:iiop:localhost:3700#ejb/MyStudent"); - System.out.println("Looked up corbaname:iiop:localhost:3700#ejb/MyStudent"); - - StudentHome sHome = - (StudentHome) PortableRemoteObject.narrow(objref, - StudentHome.class); - Student denise = sHome.create("823", "Denise Smith"); - - System.out.println("Using Context 1, looking up global jndi name ==>"); Object objRef = initial.lookup("ejb/MyCourse"); System.out.println("Looked up ejb/MyCourse"); - CourseHome cHome = (CourseHome) - PortableRemoteObject.narrow(objRef, - CourseHome.class); + CourseHome cHome = (CourseHome) PortableRemoteObject.narrow(objRef, CourseHome.class); Course power = cHome.create("220", "Power J2EE Programming"); - objref = initial.lookup(enrollerString); + Object objref = initial.lookup(enrollerString); System.out.println("Looked up " + enrollerString); - EnrollerHome eHome = - (EnrollerHome) PortableRemoteObject.narrow(objref, - EnrollerHome.class); + EnrollerHome eHome = (EnrollerHome) PortableRemoteObject.narrow(objref, EnrollerHome.class); Enroller enroller = eHome.create(); enroller.enroll("823", "220"); enroller.enroll("823", "333"); @@ -120,7 +101,7 @@ private void test01(String[] args) { ArrayList courses = denise.getCourseIds(); Iterator i = courses.iterator(); while (i.hasNext()) { - String courseId = (String)i.next(); + String courseId = (String) i.next(); Course course = cHome.findByPrimaryKey(courseId); System.out.println(courseId + " " + course.getName()); } @@ -131,8 +112,8 @@ private void test01(String[] args) { courses = intro.getStudentIds(); i = courses.iterator(); while (i.hasNext()) { - String studentId = (String)i.next(); - Student student = sHome.findByPrimaryKey(studentId); + String studentId = (String) i.next(); + Student student = sH.findByPrimaryKey(studentId); System.out.println(studentId + " " + student.getName()); } @@ -144,9 +125,8 @@ private void test01(String[] args) { System.out.println("Creating new Context 3..."); Context initial2 = new InitialContext(); - jakarta.jms.QueueConnectionFactory queueConnectionFactory = - (QueueConnectionFactory) - initial2.lookup("jms/QCFactory"); + jakarta.jms.QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) initial2 + .lookup("jms/QCFactory"); System.out.println("Looked up jms/QCFactory"); stat.addStatus("load balancing", stat.PASS); @@ -157,26 +137,26 @@ private void test01(String[] args) { } } - private void testInAppClientContainer() { - System.out.println("Creating new Context ..."); - try { - InitialContext ctx = new InitialContext(); - Object obj = ctx.lookup("java:comp/InAppClientContainer"); - if (obj == null) { - stat.addStatus("testInAppClientContainer", stat.FAIL); - return; - } - Boolean result = (Boolean) obj; - if (!result) { - stat.addStatus("testInAppClientContainer", stat.FAIL); - } - System.out.println("Looked up java:comp/InAppClientContainer :" - + result); - stat.addStatus("testInAppClientContainer", stat.PASS); - } catch (Exception ex) { - stat.addStatus("testInAppClientContainer", stat.FAIL); - System.err.println("Caught an unexpected exception!"); - ex.printStackTrace(); - } + + private void testInAppClientContainer() { + System.out.println("Creating new Context ..."); + try { + InitialContext ctx = new InitialContext(); + Object obj = ctx.lookup("java:comp/InAppClientContainer"); + if (obj == null) { + stat.addStatus("testInAppClientContainer", stat.FAIL); + return; + } + Boolean result = (Boolean) obj; + if (!result) { + stat.addStatus("testInAppClientContainer", stat.FAIL); + } + System.out.println("Looked up java:comp/InAppClientContainer :" + result); + stat.addStatus("testInAppClientContainer", stat.PASS); + } catch (Exception ex) { + stat.addStatus("testInAppClientContainer", stat.FAIL); + System.err.println("Caught an unexpected exception!"); + ex.printStackTrace(); } + } } diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml b/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml index 63640745701..caf36b6d429 100644 --- a/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml +++ b/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml @@ -41,6 +41,7 @@ + diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml b/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml index aa605931727..45b774d88e8 100644 --- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml +++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml @@ -22,24 +22,21 @@ naming2 org.glassfish.devtests - 1.0-SNAPSHOT + 6.2.6-SNAPSHOT org.glassfish.devtests naming-context-tests jar - 1.0-SNAPSHOT GlassFish Naming Context Tests - maven-surefire-plugin - 2.9 - test + org.glassfish.main.extras + glassfish-embedded-all + ${project.version} org.glassfish - jakarta.ejb - 3.1.1 - compile + jakarta.el junit @@ -56,23 +53,6 @@ - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - maven-surefire-plugin - 2.9 - - false - - - ${project.artifactId} @@ -84,9 +64,9 @@ - org.glassfish.extras + org.glassfish.main.extras glassfish-embedded-all - 4.0-SNAPSHOT + ${project.version} @@ -97,12 +77,9 @@ - org.glassfish.extras + org.glassfish.main.extras glassfish-embedded-static-shell ${project.version} - system - ${env.S1AS_HOME}/lib/embedded/glassfish-embedded-static-shell.jar - diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java index 5993f4dade9..f5ff0aae049 100644 --- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java +++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -40,146 +41,187 @@ import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; public class ContextTest { + private static final String NL = System.getProperty("line.separator"); private static EJBContainer ejbContainer; private TestBean testBean; - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); + private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests"); @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Naming::naming2::ContextTest"); + public TestWatcher reportWatcher = new ReportWatcher(stat, "Naming::naming2::ContextTest"); - @Rule public TestName testName = new TestName(); + @Rule + public TestName testName = new TestName(); - @BeforeClass public static void setUpClass() { + @BeforeClass + public static void setUpClass() { ejbContainer = EJBContainer.createEJBContainer(); } - @AfterClass public static void tearDownClass() { - if(ejbContainer != null) + + @AfterClass + public static void tearDownClass() { + if (ejbContainer != null) ejbContainer.close(); } + @AfterClass - public static void printSummary(){ + public static void printSummary() { stat.printSummary(); } - @Before public void setUp() throws NamingException { + + @Before + public void setUp() throws NamingException { testBean = (TestBean) ejbContainer.getContext().lookup("java:global/classes/TestBean"); System.out.printf("%n----------------- Starting test %s -------------------%n", testName.getMethodName()); } - @After public void tearDown() { + + @After + public void tearDown() { System.out.printf("%n================= Finishing test ================================================%n%n"); } - @Test public void lookupWithWLInitialContextFactory() throws NamingException { + + @Test + public void lookupWithWLInitialContextFactory() throws NamingException { TestBean b = testBean.lookupWithWLInitialContextFactory("java:global/classes/TestBean"); DataSource ds = testBean.lookupWithWLInitialContextFactory("jdbc/__default"); System.out.println("TestBean from lookup: " + b); System.out.println("DataSource from lookup: " + ds); } - @Test public void listEmptyString2() throws NamingException { + + @Test + public void listEmptyString2() throws NamingException { System.out.println(testBean.listEmptyString().toString()); } - @Test public void listEmptyString() throws NamingException { + + @Test + public void listEmptyString() throws NamingException { Context context = ejbContainer.getContext(); NamingEnumeration list = context.list(""); assertNotNull(list); System.out.println("Got NameClassPair: " + toString(list)); } - @Test public void listBindingsEmptyString2() throws NamingException { + + @Test + public void listBindingsEmptyString2() throws NamingException { System.out.println(testBean.listBindingsEmptyString().toString()); } - @Test public void listBindingsEmptyString() throws NamingException { + + @Test + public void listBindingsEmptyString() throws NamingException { Context context = ejbContainer.getContext(); NamingEnumeration list = context.listBindings(""); assertNotNull(list); System.out.println("Got Binding: " + toString(list)); } - @Ignore - @Test public void listGlobal2() throws NamingException { + + // @Ignore + @Test + public void listGlobal2() throws NamingException { System.out.println(testBean.listGlobal().toString()); } - @Ignore //got null componentId - @Test public void listGlobal() throws NamingException { + + // @Ignore //got null componentId + @Test + public void listGlobal() throws NamingException { Context context = ejbContainer.getContext(); NamingEnumeration list = context.list("java:global"); assertNotNull(list); System.out.println("Got NameClassPair: " + toString(list)); } - @Ignore - @Test public void listBindingsGlobal2() throws NamingException { + + // @Ignore + @Test + public void listBindingsGlobal2() throws NamingException { System.out.println(testBean.listBindingsGlobal().toString()); } - @Ignore - @Test public void listBindingsGlobal() throws NamingException { + + // @Ignore + @Test + public void listBindingsGlobal() throws NamingException { Context context = ejbContainer.getContext(); NamingEnumeration list = context.listBindings("java:global"); assertNotNull(list); System.out.println("Got Binding: " + toString(list)); } - @Test public void listJavaComp() throws NamingException { + + @Test + public void listJavaComp() throws NamingException { System.out.println(testBean.listJavaComp().toString()); } - @Test public void listBindingsJavaComp() throws NamingException { + + @Test + public void listBindingsJavaComp() throws NamingException { System.out.println(testBean.listBindingsJavaComp().toString()); } - @Test public void listJavaModule() throws NamingException { + + @Test + public void listJavaModule() throws NamingException { System.out.println(testBean.listJavaModule().toString()); } - @Test public void listBindingsJavaModule() throws NamingException { + + @Test + public void listBindingsJavaModule() throws NamingException { System.out.println(testBean.listBindingsJavaModule().toString()); } - @Test public void listJavaApp() throws NamingException { + + @Test + public void listJavaApp() throws NamingException { System.out.println(testBean.listJavaApp().toString()); } - @Test public void listBindingsJavaApp() throws NamingException { + + @Test + public void listBindingsJavaApp() throws NamingException { System.out.println(testBean.listBindingsJavaApp().toString()); } - @Test public void closeNamingEnumerations() throws NamingException { + + @Test + public void closeNamingEnumerations() throws NamingException { testBean.closeNamingEnumerations(); } - @Test - public void getIsInAppClientContainerFromEJB() throws NamingException { - Boolean isACC = testBean.getIsInAppClientContainer(); - assertFalse(isACC); - System.out.println("get java:comp/InAppClientContainer from EJB:" - + isACC); - } - @Test - public void getIsInAppClientContainerFromSEClient() throws NamingException { - String jndiname = "java:comp/InAppClientContainer"; - Context context = new InitialContext(); - Boolean isACC = (Boolean) context.lookup(jndiname); - assertFalse(isACC); - System.out - .println("get "+jndiname+" from java SE client:" - + isACC); - } + @Test + public void getIsInAppClientContainerFromEJB() throws NamingException { + Boolean isACC = testBean.getIsInAppClientContainer(); + assertFalse(isACC); + System.out.println("get java:comp/InAppClientContainer from EJB:" + isACC); + } + + + @Test + public void getIsInAppClientContainerFromSEClient() throws NamingException { + String jndiname = "java:comp/InAppClientContainer"; + Context context = new InitialContext(); + Boolean isACC = (Boolean) context.lookup(jndiname); + assertFalse(isACC); + System.out.println("get " + jndiname + " from java SE client:" + isACC); + } + private String toString(NamingEnumeration n) throws NamingException { StringBuilder sb = new StringBuilder(); sb.append(n.toString()).append(NL); - while(n.hasMore()) { // test will fail with NPE if null + while (n.hasMore()) { // test will fail with NPE if null NameClassPair x = n.next(); sb.append(x).append(NL); } diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/pom.xml b/appserver/tests/appserv-tests/devtests/naming/naming2/pom.xml index e023fe2f912..512b8374748 100644 --- a/appserver/tests/appserv-tests/devtests/naming/naming2/pom.xml +++ b/appserver/tests/appserv-tests/devtests/naming/naming2/pom.xml @@ -19,9 +19,14 @@ 4.0.0 + + org.glassfish.main.tests + ant-tests + 6.2.6-SNAPSHOT + ../.. + org.glassfish.devtests naming2 - 1.0-SNAPSHOT pom naming2 From f8c62026c286afe559ae262be5ecd1ac3fcc5f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:08:27 +0100 Subject: [PATCH 14/33] #23507 Security tests fixed + removed old soteria tests and other dead tests --- .../appserv-tests/devtests/security/build.xml | 10 - .../devtests/security/ciphertest/build.xml | 35 - .../devtests/security/common.xml | 7 +- .../security/container-auth/build.xml | 11 +- .../container-auth/jauth/AuthConfigTest.java | 2 +- .../{sun-acc.xml => glassfish-acc.xml} | 20 - .../client/ConverterClient.java | 2 +- .../devtests/security/jaccApi/build.xml | 22 +- .../security/jaccApi/prog-auth/build.xml | 1 + .../jaccApi/common/ArquillianBase.java | 11 +- .../security/jaccApi/prog-auth/pom.xml | 24 +- .../security/jaccmr8/client/Client.java | 6 +- .../devtests/security/jdbcrealm/build.xml | 1744 +++++++++-------- .../jdbcrealm/client/HttpBasicAuthTest.java | 5 +- .../security/jdbcrealm/util/PopulateDB.java | 20 +- .../devtests/security/jmac/build.xml | 4 +- .../jmac/httpServlet/build.properties | 2 +- .../{sun-web.xml => glassfish-web.xml} | 6 +- .../jmac/httpServlet/docroot/index.jsp | 3 +- .../jmac/httpServlet/goldenfiles/output.html | 6 +- .../src/HttpServletTestAuthModule.java | 18 +- .../HttpServletChallengeTestAuthModule.java | 12 +- .../src/HttpServletFormTestAuthModule.java | 2 - .../security/jmac/https/build.properties | 2 +- .../devtests/security/jmac/https/build.xml | 2 +- .../{sun-web.xml => glassfish-web.xml} | 7 +- .../security/jmac/https/docroot/index.jsp | 3 +- .../jmac/https/src/HttpsTestAuthModule.java | 14 +- .../security/jmac/https/src/WebSSLClient.java | 25 +- .../devtests/security/jmac/soap/build.xml | 3 +- .../security/jmac/soapDefault/build.xml | 3 +- .../security/jmac/soapEmbedded/build.xml | 383 ++-- .../devtests/security/run_test.sh | 80 +- .../devtests/security/soteria/README.md | 25 - .../README.md | 5 - .../pom.xml | 47 - .../test/BasicAuthenticationServlet.java | 41 - .../test/TestAuthenticationMechanism.java | 72 - .../soteria/test/TestIdentityStore.java | 41 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 52 - .../src/main/webapp/index.jsp | 33 - .../src/main/webapp/loginerror.jsp | 38 - .../src/main/webapp/loginform.jsp | 39 - ...MPrecendenceOverLoginConfigInWebXmlIT.java | 61 - .../soteria/app-caller-principal/README.md | 12 - .../soteria/app-caller-principal/pom.xml | 47 - .../glassfish/soteria/test/AppPrincipal.java | 35 - .../soteria/test/CallerSubjectServlet.java | 93 - .../test/TestAuthenticationMechanism.java | 72 - .../soteria/test/TestIdentityStore.java | 41 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 44 - .../soteria/test/AppCallerPrincipalIT.java | 60 - .../app-custom-identity-store-handler/pom.xml | 51 - .../test/BlackListedIdentityStore.java | 61 - .../glassfish/soteria/test/ConfigBean.java | 68 - .../test/CustomIdentityStoreHandler.java | 121 -- .../test/GroupProviderIdentityStore.java | 80 - .../org/glassfish/soteria/test/LdapSetup.java | 67 - .../org/glassfish/soteria/test/Servlet.java | 56 - .../test/TestAuthenticationMechanism.java | 72 - .../src/main/resources/test.ldif | 79 - .../src/main/webapp/WEB-INF/beans.xml | 29 - .../src/main/webapp/WEB-INF/glassfish-web.xml | 60 - .../test/AppCustomIdentityStoreHandlerIT.java | 91 - .../soteria/app-custom-rememberme/pom.xml | 47 - .../soteria/test/RememberMeConfigBean.java | 48 - .../org/glassfish/soteria/test/Servlet.java | 66 - .../test/TestAuthenticationMechanism.java | 100 - .../soteria/test/TestIdentityStore.java | 54 - .../test/TestRememberMeIdentityStore.java | 63 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/glassfish-web.xml | 40 - .../soteria/test/AppCustomRememberMeIT.java | 195 -- .../soteria/app-custom-session/pom.xml | 47 - .../org/glassfish/soteria/test/Servlet.java | 66 - .../test/TestAuthenticationMechanism.java | 77 - .../soteria/test/TestIdentityStore.java | 52 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/glassfish-web.xml | 40 - .../soteria/test/AppCustomSessionIT.java | 132 -- .../security/soteria/app-custom/pom.xml | 47 - .../soteria/test/ProtectedServlet.java | 78 - .../org/glassfish/soteria/test/Servlet.java | 79 - .../test/TestAuthenticationMechanism.java | 72 - .../soteria/test/TestIdentityStore.java | 41 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 44 - .../glassfish/soteria/test/AppCustomIT.java | 78 - .../devtests/security/soteria/app-db/pom.xml | 48 - .../soteria/test/ApplicationConfig.java | 44 - .../glassfish/soteria/test/DatabaseSetup.java | 79 - .../soteria/test/PlaintextPasswordHash.java | 44 - .../org/glassfish/soteria/test/Servlet.java | 57 - .../test/TestAuthenticationMechanism.java | 73 - .../app-db/src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/glassfish-web.xml | 40 - .../org/glassfish/soteria/test/AppDBIT.java | 82 - .../security/soteria/app-double-ham/pom.xml | 48 - .../soteria/test/ProtectedServlet.java | 84 - .../org/glassfish/soteria/test/Servlet.java | 82 - .../test/TestAuthenticationMechanism.java | 71 - .../soteria/test/TestIdentityStore.java | 41 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 44 - .../soteria/test/AppDoubleHAMIT.java | 72 - .../security/soteria/app-ham-ordering/pom.xml | 47 - .../org/glassfish/soteria/test/Servlet.java | 104 - .../test/TestAuthenticationMechanism.java | 111 -- .../soteria/test/TestIdentityStore.java | 41 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 44 - .../soteria/test/AppHAMOrderingIT.java | 70 - .../security/soteria/app-mem-basic/pom.xml | 49 - .../src/main/java/test/Servlet.java | 71 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../glassfish/soteria/test/AppMemBasicIT.java | 123 -- .../security/soteria/app-mem-form/pom.xml | 48 - .../soteria/test/ApplicationConfig.java | 35 - .../soteria/test/LoginErrorServlet.java | 47 - .../glassfish/soteria/test/LoginServlet.java | 52 - .../org/glassfish/soteria/test/Servlet.java | 84 - .../soteria/test/TestIdentityStore.java | 41 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../glassfish/soteria/test/AppMemFormIT.java | 258 --- .../soteria/app-multiple-store-backup/pom.xml | 48 - .../org/glassfish/soteria/test/Servlet.java | 55 - .../test/TestAuthenticationMechanism.java | 73 - .../soteria/test/TestBackupIdentityStore.java | 63 - .../soteria/test/TestIdentityStore.java | 57 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/glassfish-web.xml | 40 - .../test/AppMultipleStoreBackupIT.java | 93 - .../soteria/app-multiple-store/pom.xml | 47 - .../test/AuthenticationIdentityStore.java | 77 - .../test/AuthorizationIdentityStore.java | 60 - .../org/glassfish/soteria/test/Servlet.java | 55 - .../test/TestAuthenticationMechanism.java | 74 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/glassfish-web.xml | 40 - .../soteria/test/AppMultipleStoreIT.java | 74 - .../README.md | 10 - .../pom.xml | 47 - .../glassfish/soteria/test/AppPrincipal.java | 32 - .../test/TestAuthenticationMechanism.java | 67 - .../soteria/test/TestIdentityStore.java | 41 - .../ValidateAvailablePrincipalServlet.java | 87 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 43 - .../test/ValidateAvailablePrincipalIT.java | 60 - .../soteria/app-no-role-mapping/pom.xml | 50 - .../src/main/java/test/Servlet.java | 72 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../glassfish/soteria/test/AppMemBasicIT.java | 139 -- .../app-securitycontext-auth-ejb/pom.xml | 49 - .../soteria/test/ProtectedServlet.java | 104 - .../org/glassfish/soteria/test/Servlet.java | 151 -- .../test/TestAuthenticationMechanism.java | 64 - .../org/glassfish/soteria/test/TestEJB.java | 72 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../test/AppSecurityContextAuthIT.java | 132 -- .../soteria/app-securitycontext-auth/pom.xml | 49 - .../soteria/test/ProtectedServlet.java | 104 - .../org/glassfish/soteria/test/Servlet.java | 101 - .../test/TestAuthenticationMechanism.java | 64 - .../src/main/webapp/WEB-INF/beans.xml | 0 .../test/AppSecurityContextAuthIT.java | 131 -- .../security/soteria/build.properties | 22 - .../devtests/security/soteria/build.xml | 51 - .../devtests/security/soteria/common/pom.xml | 50 - .../soteria/test/ArquillianBase.java | 147 -- .../org/glassfish/soteria/test/Assert.java | 184 -- .../glassfish/soteria/test/ReportWatcher.java | 50 - .../glassfish/soteria/test/ShrinkWrap.java | 36 - .../common/src/main/resources/server.xml | 31 - .../devtests/security/soteria/pom.xml | 136 -- .../uncovered-http-methods/client/Client.java | 3 +- .../client/TestRoleAssignments.java | 14 +- .../devtests/security/wss/build.xml | 10 - .../wss/encThenSign-default-conf/README | 35 - .../wss/encThenSign-default-conf/build.xml | 188 -- .../encThenSign-default-conf/servletws/README | 2 - .../servletws/build.properties | 42 - .../servletws/build.xml | 204 -- .../servletws/client/MANIFEST.MF | 2 - .../servletws/client/TaxCalClient.java | 118 -- .../servletws/config/config-client.xml | 25 - .../servletws/config/config-sei.xml | 33 - .../servletws/config/config-web.xml | 25 - .../descriptor/application-client.xml | 30 - .../servletws/descriptor/application.xml | 32 - .../servletws/descriptor/web.xml | 43 - .../servletws/descriptor/webservices.xml | 53 - .../servletws/web/FedTaxIF.java | 27 - .../servletws/web/FedTaxServlet.java | 50 - .../servletws/web/StateTaxIF.java | 27 - .../servletws/web/StateTaxServlet.java | 50 - .../servletws/wsdl/TaxCalServletService.wsdl | 60 - .../devtests/security/wss/gartner/build.xml | 3 +- .../descriptor/sun-application-client.xml | 5 +- .../devtests/security/wss/permethod/build.xml | 128 -- .../wss/permethod/servletws/build.properties | 42 - .../wss/permethod/servletws/build.xml | 216 -- .../permethod/servletws/client/Client.java | 80 - .../permethod/servletws/client/MANIFEST.MF | 2 - .../servletws/config/config-client.xml | 25 - .../permethod/servletws/config/config-sei.xml | 31 - .../permethod/servletws/config/config-web.xml | 25 - .../descriptor/application-client.xml | 30 - .../servletws/descriptor/application.xml | 32 - .../descriptor/sun-application-client.xml | 59 - .../servletws/descriptor/sun-web.xml | 50 - .../permethod/servletws/descriptor/web.xml | 34 - .../servletws/descriptor/webservices.xml | 42 - .../wss/permethod/servletws/web/HelloIF.java | 26 - .../permethod/servletws/web/HelloServlet.java | 51 - .../servletws/wsdl/HelloServletService.wsdl | 82 - .../security/wss/roles/build.properties | 37 - .../devtests/security/wss/roles/build.xml | 191 -- .../wss/roles/client/Client.java.template | 161 -- .../security/wss/roles/client/MANIFEST.MF | 2 - .../wss/roles/descriptor/sun-application.xml | 32 - .../wss/roles/descriptor/sun-ejb-jar.xml | 35 - .../wss/roles/descriptor/sun-ejb-jar2.xml | 34 - .../security/wss/roles/descriptor/web.xml | 53 - .../security/wss/roles/ejbws/HelloEjb.java | 81 - .../security/wss/roles/ejbws/SfulEJB.java | 35 - .../security/wss/roles/ejbws/SfulLocal.java | 23 - .../security/wss/roles/ejbws2/HelloEjb2.java | 35 - .../wss/roles/servletws/HelloServlet.java | 35 - .../security/wss/roles2/build.properties | 35 - .../devtests/security/wss/roles2/build.xml | 136 -- .../wss/roles2/client/Client.java.template | 106 - .../security/wss/roles2/client/MANIFEST.MF | 2 - .../descriptor/sun-application-client.xml | 39 - .../wss/roles2/descriptor/sun-ejb-jar.xml | 57 - .../security/wss/roles2/ejbws/HelloEjb.java | 86 - .../security/wss/roles2/ejbws/SfulEJB.java | 48 - .../security/wss/roles2/ejbws/SfulLocal.java | 27 - .../security/wss/roles2/ejbws/SlessEJB.java | 35 - .../security/wss/roles2/ejbws/SlessLocal.java | 23 - .../security/wss/ssl/build.properties | 36 - .../devtests/security/wss/ssl/build.xml | 150 -- .../wss/ssl/client/Client.java.template | 65 - .../security/wss/ssl/client/MANIFEST.MF | 2 - .../wss/ssl/descriptor/application.xml | 32 - .../wss/ssl/descriptor/sun-ejb-jar.xml | 32 - .../security/wss/ssl/descriptor/web.xml | 53 - .../security/wss/ssl/ejbws/HelloEjb.java | 28 - .../wss/ssl/servletws/HelloServlet.java | 26 - .../wss/sslclientcert/build.properties | 36 - .../security/wss/sslclientcert/build.xml | 158 -- .../sslclientcert/client/Client.java.template | 84 - .../wss/sslclientcert/client/MANIFEST.MF | 2 - .../sslclientcert/descriptor/application.xml | 32 - .../descriptor/sun-application.xml.template | 25 - .../sslclientcert/descriptor/sun-ejb-jar.xml | 35 - .../wss/sslclientcert/descriptor/web.xml | 61 - .../wss/sslclientcert/ejbws/HelloEjb.java | 38 - .../sslclientcert/servletws/HelloServlet.java | 30 - 261 files changed, 1220 insertions(+), 14109 deletions(-) rename appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/{sun-acc.xml => glassfish-acc.xml} (82%) rename appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/descriptor/{sun-web.xml => glassfish-web.xml} (76%) rename appserver/tests/appserv-tests/devtests/security/jmac/https/descriptor/{sun-web.xml => glassfish-web.xml} (78%) delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/README.md delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/README.md delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/BasicAuthenticationServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/index.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/loginerror.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/loginform.jsp delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/test/java/org/glassfish/soteria/test/AppBundledHAMPrecendenceOverLoginConfigInWebXmlIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/README.md delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/AppPrincipal.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/test/java/org/glassfish/soteria/test/AppCallerPrincipalIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/BlackListedIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/CustomIdentityStoreHandler.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/GroupProviderIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/resources/test.ldif delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/test/java/org/glassfish/soteria/test/AppCustomIdentityStoreHandlerIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestRememberMeIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/test/java/org/glassfish/soteria/test/AppCustomRememberMeIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/test/java/org/glassfish/soteria/test/AppCustomSessionIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/test/java/org/glassfish/soteria/test/AppCustomIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/PlaintextPasswordHash.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/test/java/org/glassfish/soteria/test/AppDBIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/test/java/org/glassfish/soteria/test/AppDoubleHAMIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/test/java/org/glassfish/soteria/test/AppHAMOrderingIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/java/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginErrorServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/test/java/org/glassfish/soteria/test/AppMemFormIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestBackupIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/test/java/org/glassfish/soteria/test/AppMultipleStoreBackupIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthorizationIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/glassfish-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/test/java/org/glassfish/soteria/test/AppMultipleStoreIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/README.md delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/AppPrincipal.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/test/java/org/glassfish/soteria/test/ValidateAvailablePrincipalIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/java/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/Servlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/webapp/WEB-INF/beans.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ArquillianBase.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/Assert.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ReportWatcher.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ShrinkWrap.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/resources/server.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/soteria/pom.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/README delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/README delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/TaxCalClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-sei.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxIF.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxIF.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/wsdl/TaxCalServletService.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-sei.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloIF.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/wsdl/HelloServletService.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/client/Client.java.template delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-ejb-jar2.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulLocal.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles/servletws/HelloServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles2/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles2/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles2/client/Client.java.template delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles2/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles2/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles2/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulLocal.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessLocal.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/ssl/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/ssl/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/ssl/client/Client.java.template delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/ssl/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/ssl/servletws/HelloServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/client/Client.java.template delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/sun-application.xml.template delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java delete mode 100644 appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/servletws/HelloServlet.java diff --git a/appserver/tests/appserv-tests/devtests/security/build.xml b/appserver/tests/appserv-tests/devtests/security/build.xml index 4bd858a269f..28d7193ae66 100644 --- a/appserver/tests/appserv-tests/devtests/security/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/build.xml @@ -47,7 +47,6 @@ - @@ -88,15 +87,6 @@ - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml b/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml index 3595ac1329f..b0c0a464a86 100644 --- a/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml @@ -162,42 +162,7 @@ - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/common.xml b/appserver/tests/appserv-tests/devtests/security/common.xml index cd59de0955d..ff63d505183 100644 --- a/appserver/tests/appserv-tests/devtests/security/common.xml +++ b/appserver/tests/appserv-tests/devtests/security/common.xml @@ -166,7 +166,10 @@ - + + + + @@ -387,12 +390,14 @@ + + diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/build.xml b/appserver/tests/appserv-tests/devtests/security/container-auth/build.xml index 16a60dbc12b..4176672a09e 100644 --- a/appserver/tests/appserv-tests/devtests/security/container-auth/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/container-auth/build.xml @@ -58,22 +58,17 @@ - - + - - - + - - + diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/AuthConfigTest.java b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/AuthConfigTest.java index 028e1695338..e07d34ba559 100644 --- a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/AuthConfigTest.java +++ b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/AuthConfigTest.java @@ -34,7 +34,7 @@ * * 2. sun-acc.xml test: * - * %java -Dsun-acc.xml.url=sun-acc.xml + * %java -Dglassfish-acc.xml.url=sun-acc.xml * -Djava.security.debug=configfile,configxmlparser * -classpath .:classes:config-api.jar:appserv-commons.jar:schema2beans.jar * AuthConfigTest xml-parse diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/sun-acc.xml b/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/glassfish-acc.xml similarity index 82% rename from appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/sun-acc.xml rename to appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/glassfish-acc.xml index 4cae425a1dd..184989f4850 100644 --- a/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/sun-acc.xml +++ b/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/glassfish-acc.xml @@ -48,24 +48,4 @@ - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/client/ConverterClient.java b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/client/ConverterClient.java index 527b250c153..7f94ffdcde2 100644 --- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/client/ConverterClient.java +++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/client/ConverterClient.java @@ -119,7 +119,7 @@ private void run(String[] args) { // Create Home object obj = context.lookup(jndiName); } - String mys = "CN=SSLTest, OU=Sun Java System Application Server, O=Sun Microsystems, L=Santa Clara, ST=California, C=US"; + String mys = "CN=SSLTest,OU=Sun Java System Application Server,O=Sun Microsystems,L=Santa Clara,ST=California,C=US"; System.out.println("Certname in appclication-client ->"+mys); ConverterRemoteHome home = (ConverterRemoteHome) PortableRemoteObject.narrow(obj, diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/build.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/build.xml index 2c95c03b6ea..a8ef8308776 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/build.xml @@ -61,7 +61,7 @@ - @@ -71,7 +71,7 @@ - @@ -79,7 +79,7 @@ - @@ -88,16 +88,16 @@ - - + - @@ -106,7 +106,7 @@ - @@ -116,21 +116,21 @@ - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/build.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/build.xml index ea284df94ec..75fd865c54f 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/build.xml @@ -39,6 +39,7 @@ + diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/ArquillianBase.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/ArquillianBase.java index 9da9e9c614a..de07c87f318 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/ArquillianBase.java +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/ArquillianBase.java @@ -31,25 +31,16 @@ import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.api.importer.ZipImporter; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.rules.TestWatcher; import org.junit.runner.Description; -import static org.jboss.shrinkwrap.api.ShrinkWrap.create; - -import java.io.File; - -import org.jboss.shrinkwrap.api.importer.ZipImporter; -import org.jboss.shrinkwrap.api.spec.WebArchive; import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.WebClient; -/** - * - * - */ public class ArquillianBase { private static final String WEBAPP_SRC = "src/main/webapp"; diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml index a63176398cb..20600ad5aa4 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml @@ -21,15 +21,16 @@ 4.0.0 org.glassfish.jaccApi.test prog-auth - 6.2.6-SNAPSHOT pom + + org.glassfish.main.tests + ant-tests + 6.2.6-SNAPSHOT + ../../../.. + + Programmatic authentication with Jakarta Authorization api - - 5.0 - 11 - 11 - common @@ -40,7 +41,7 @@ org.jboss.arquillian arquillian-bom - 1.3.0.Final + 1.6.0.Final import pom @@ -64,13 +65,13 @@ net.sourceforge.htmlunit htmlunit - 2.29 + 2.58.0 test - javax - javaee-api - 7.0 + jakarta.platform + jakarta.jakartaee-api + 9.1.0 provided @@ -92,7 +93,6 @@ maven-failsafe-plugin - 2.20 diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/client/Client.java b/appserver/tests/appserv-tests/devtests/security/jaccmr8/client/Client.java index 0e02126266c..2e997793069 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/client/Client.java @@ -18,6 +18,7 @@ import java.net.*; import java.io.*; +import java.util.Base64; import java.util.Enumeration; import java.util.Hashtable; @@ -442,15 +443,14 @@ private int invokeServlet(String url, Hashtable contentHash, String user, String if ((user != null) && (user.length() > 0)) { // Add BASIC header for authentication String auth = user + ":" + password; - String authEncoded = new sun.misc.BASE64Encoder().encode(auth.getBytes()); + String authEncoded = Base64.getEncoder().encodeToString(auth.getBytes()); c1.setRequestProperty("Authorization", "Basic " + authEncoded); } c1.setDoOutput(true); c1.setUseCaches(false); // get the output stream to POST to. - DataOutputStream out; - out = new DataOutputStream(c1.getOutputStream()); + DataOutputStream out = new DataOutputStream(c1.getOutputStream()); String content = ""; // Create a single String value to be POSTED from the parameters passed diff --git a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/build.xml b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/build.xml index ec942628f3f..98ec09c0d48 100644 --- a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/build.xml @@ -34,172 +34,171 @@ &commonSecurity; &testProperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Running ${ant.project.name} tests from ${basedir} ..." /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + - - - - + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/client/HttpBasicAuthTest.java b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/client/HttpBasicAuthTest.java index 13c43dcd35f..361886ab0c7 100644 --- a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/client/HttpBasicAuthTest.java +++ b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/client/HttpBasicAuthTest.java @@ -16,6 +16,8 @@ import java.io.*; import java.net.*; +import java.util.Base64; + import sun.misc.*; import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; @@ -162,8 +164,7 @@ protected void run0() throws Exception { URLConnection uconn = u.openConnection(); String up = username + ":" + password; - BASE64Encoder be = new BASE64Encoder(); - up = new String(be.encode(up.getBytes())); + up = Base64.getEncoder().encodeToString(up.getBytes()); uconn.setRequestProperty("authorization", "Basic " + up); diff --git a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/util/PopulateDB.java b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/util/PopulateDB.java index 78c16b54b54..8309d417a14 100644 --- a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/util/PopulateDB.java +++ b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/util/PopulateDB.java @@ -17,10 +17,10 @@ package com.sun.devtests.security.jdbcrealm; import java.sql.*; +import java.util.Base64; +import java.util.Base64.Encoder; import java.security.*; -import sun.misc.BASE64Encoder; - public class PopulateDB { // username/passwords @@ -190,10 +190,10 @@ public static void main(String[] args) throws Exception { ps.close(); ps = con.prepareStatement(INSERT_USER_STMT_BASE64); - BASE64Encoder base64 = new BASE64Encoder(); + Encoder base64 = Base64.getEncoder(); for(int i=0; i - - + diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/build.properties b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/build.properties index 8409f65bfa6..cdebc3771cf 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/build.properties +++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/build.properties @@ -22,5 +22,5 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/descriptor/glassfish-web.xml similarity index 76% rename from appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/descriptor/sun-web.xml rename to appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/descriptor/glassfish-web.xml index 7b24d54f222..a8951899a2d 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/descriptor/sun-web.xml +++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/descriptor/glassfish-web.xml @@ -1,5 +1,5 @@ - + - + myrole mygroup - + diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/docroot/index.jsp b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/docroot/index.jsp index ea8e9428877..d63057ecdde 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/docroot/index.jsp +++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/docroot/index.jsp @@ -20,8 +20,7 @@ Hello World from 196 HttpServlet AuthModule Test!
<% try { - out.println("Hello, " + request.getUserPrincipal() + - " from " + request.getAttribute("MY_NAME")); + out.println("Hello, " + request.getUserPrincipal() + " from " + request.getAttribute("MY_NAME")); out.println("PC = " + request.getAttribute("PC")); } catch(Throwable t) { out.println("Something wrong: " + t); diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/goldenfiles/output.html b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/goldenfiles/output.html index b5e3587e728..4a475715a2b 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/goldenfiles/output.html +++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/goldenfiles/output.html @@ -1,8 +1,10 @@ + + Hello World from 196 HttpServlet AuthModule Test!
Hello, shingwai123 from com.sun.s1asdev.security.jmac.httpservlet.HttpServletTestAuthModule PC = security-jmac-httpservlet-web/security-jmac-httpservlet-web -
-Adjusted count: 218 + +Adjusted count: 220 diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/HttpServletTestAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/HttpServletTestAuthModule.java index 002e18ee5a8..5e11ae3c6d0 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/HttpServletTestAuthModule.java +++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/HttpServletTestAuthModule.java @@ -17,6 +17,7 @@ package com.sun.s1asdev.security.jmac.httpservlet; import java.io.PrintWriter; +import java.util.Base64; import java.util.Map; import java.security.AccessController; import java.security.PrivilegedAction; @@ -35,8 +36,6 @@ import jakarta.servlet.http.HttpServletResponse; -import sun.misc.BASE64Decoder; - public class HttpServletTestAuthModule implements ServerAuthModule { private CallbackHandler handler = null; private String pc = null; @@ -75,8 +74,7 @@ public AuthStatus validateRequest(MessageInfo messageInfo, if (authorization != null && authorization.toLowerCase().startsWith("basic ")) { authorization = authorization.substring(6).trim(); - BASE64Decoder decoder = new BASE64Decoder(); - byte[] bs = decoder.decodeBuffer(authorization); + byte[] bs = Base64.getDecoder().decode(authorization); String decodedString = new String(bs); int ind = decodedString.indexOf(':'); if (ind > 0) { @@ -94,10 +92,8 @@ public AuthStatus validateRequest(MessageInfo messageInfo, char[] pwd = new char[password.length()]; password.getChars(0, password.length(), pwd, 0); - PasswordValidationCallback pwdCallback = - new PasswordValidationCallback(clientSubject, username, pwd); - CallerPrincipalCallback cpCallback = - new CallerPrincipalCallback(clientSubject, username); + PasswordValidationCallback pwdCallback = new PasswordValidationCallback(clientSubject, username, pwd); + CallerPrincipalCallback cpCallback = new CallerPrincipalCallback(clientSubject, username); System.out.println("Subject before invoking callbacks: " + clientSubject); handler.handle(new Callback[] { pwdCallback, cpCallback }); System.out.println("Subject after invoking callbacks: " + clientSubject); @@ -128,11 +124,9 @@ public AuthStatus secureResponse(MessageInfo messageInfo, try { System.out.println("SR is called"); - HttpServletRequest request = - (HttpServletRequest)messageInfo.getRequestMessage(); + HttpServletRequest request = (HttpServletRequest) messageInfo.getRequestMessage(); request.setAttribute("SR", "true"); - MyHttpServletResponseWrapper response = - (MyHttpServletResponseWrapper)messageInfo.getResponseMessage(); + MyHttpServletResponseWrapper response = (MyHttpServletResponseWrapper) messageInfo.getResponseMessage(); int count = response.getAdjustedCount(); PrintWriter writer = response.getWriter(); writer.println("\nAdjusted count: " + count); diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java index 43aaf4c440b..f347a91a635 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java +++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java @@ -16,6 +16,7 @@ package com.sun.s1asdev.security.jmac.httpservletchallenge; +import java.util.Base64; import java.util.Map; import java.security.AccessController; import java.security.PrivilegedAction; @@ -35,8 +36,6 @@ import jakarta.servlet.http.HttpServletResponse; -import sun.misc.BASE64Decoder; - public class HttpServletChallengeTestAuthModule implements ServerAuthModule { private CallbackHandler handler = null; @@ -67,11 +66,9 @@ public AuthStatus validateRequest(MessageInfo messageInfo, HttpServletRequest request = (HttpServletRequest)messageInfo.getRequestMessage(); String authorization = request.getHeader("authorization"); - if (authorization != null && - authorization.toLowerCase().startsWith("basic ")) { + if (authorization != null && authorization.toLowerCase().startsWith("basic ")) { authorization = authorization.substring(6).trim(); - BASE64Decoder decoder = new BASE64Decoder(); - byte[] bs = decoder.decodeBuffer(authorization); + byte[] bs = Base64.getDecoder().decode(authorization); String decodedString = new String(bs); int ind = decodedString.indexOf(':'); if (ind > 0) { @@ -80,8 +77,7 @@ public AuthStatus validateRequest(MessageInfo messageInfo, } } - HttpServletResponse response = - (HttpServletResponse)messageInfo.getResponseMessage(); + HttpServletResponse response = (HttpServletResponse) messageInfo.getResponseMessage(); if (username == null || password == null) { response.setHeader("WWW-Authenticate", "Basic realm=\"default\""); response.sendError(HttpServletResponse.SC_UNAUTHORIZED); diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/src/HttpServletFormTestAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/src/HttpServletFormTestAuthModule.java index 0e9764ecdaa..b09ea53b0bc 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/src/HttpServletFormTestAuthModule.java +++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/src/HttpServletFormTestAuthModule.java @@ -35,8 +35,6 @@ import jakarta.servlet.http.HttpServletResponse; -import sun.misc.BASE64Decoder; - public class HttpServletFormTestAuthModule implements ServerAuthModule { private static final String SAVED_REQUEST = "Saved_Request"; private static final String SAVED_SUBJECT = "Saved_Subject"; diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/https/build.properties b/appserver/tests/appserv-tests/devtests/security/jmac/https/build.properties index 8cb4c0ada81..1b71a547814 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/https/build.properties +++ b/appserver/tests/appserv-tests/devtests/security/jmac/https/build.properties @@ -22,5 +22,5 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/https/build.xml b/appserver/tests/appserv-tests/devtests/security/jmac/https/build.xml index 9a3b3d5bd99..5fa58844739 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/https/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/jmac/https/build.xml @@ -93,7 +93,7 @@ - + diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/https/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/security/jmac/https/descriptor/glassfish-web.xml similarity index 78% rename from appserver/tests/appserv-tests/devtests/security/jmac/https/descriptor/sun-web.xml rename to appserver/tests/appserv-tests/devtests/security/jmac/https/descriptor/glassfish-web.xml index d4e01e492a5..486eda5a730 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/https/descriptor/sun-web.xml +++ b/appserver/tests/appserv-tests/devtests/security/jmac/https/descriptor/glassfish-web.xml @@ -1,5 +1,5 @@ - + - + myrole CN=SSLTest, OU=Sun Java System Application Server, O=Sun Microsystems, L=Santa Clara, ST=California, C=US - - + diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/https/docroot/index.jsp b/appserver/tests/appserv-tests/devtests/security/jmac/https/docroot/index.jsp index be4b2d9dd1a..f916027108c 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/https/docroot/index.jsp +++ b/appserver/tests/appserv-tests/devtests/security/jmac/https/docroot/index.jsp @@ -20,8 +20,7 @@ Hello World from 196 HttpServlet AuthModule Test!
<% try { - out.println("Hello, " + request.getRemoteUser() +" from " - + request.getAttribute("MY_NAME")); + out.println("Hello, " + request.getRemoteUser() + " from " + request.getAttribute("MY_NAME")); } catch(Exception ex) { out.println("Something wrong: " + ex); ex.printStackTrace(); diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/https/src/HttpsTestAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/https/src/HttpsTestAuthModule.java index a583cb808f5..5e79e2d711b 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/https/src/HttpsTestAuthModule.java +++ b/appserver/tests/appserv-tests/devtests/security/jmac/https/src/HttpsTestAuthModule.java @@ -59,15 +59,11 @@ public AuthStatus validateRequest(MessageInfo messageInfo, X500Principal x500Principal = null; try { - HttpServletRequest request = - (HttpServletRequest) messageInfo.getRequestMessage(); - X509Certificate certs[] = - (X509Certificate[]) request.getAttribute( - "jakarta.servlet.request.X509Certificate"); - if (certs == null || certs.length < 1) { - System.out.println("javax...certs is null or empty"); - certs = (X509Certificate[]) request.getAttribute( - "org.apache.coyote.request.X509Certificate"); + HttpServletRequest request = (HttpServletRequest) messageInfo.getRequestMessage(); + X509Certificate certs[] = (X509Certificate[]) request + .getAttribute("jakarta.servlet.request.X509Certificate"); + if (certs == null || certs.length == 0) { + System.out.println("jakarta.servlet.request.X509Certificate attribute is null or empty"); } System.out.println("certs: " + certs); if (certs != null && certs.length > 0) { diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/https/src/WebSSLClient.java b/appserver/tests/appserv-tests/devtests/security/jmac/https/src/WebSSLClient.java index 6acacafe5dd..64b578a52b8 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/https/src/WebSSLClient.java +++ b/appserver/tests/appserv-tests/devtests/security/jmac/https/src/WebSSLClient.java @@ -25,7 +25,7 @@ public class WebSSLClient { private static final String TEST_NAME = "security-jmac-https"; - private static final String EXPECTED_RESPONSE_PATTERN = "Hello, CN=.* from com.sun.s1asdev.security.jmac.https.HttpsTestAuthModule"; + private static final Pattern EXPECTED_RESPONSE_PATTERN = Pattern.compile("Hello, CN=.* from com.sun.s1asdev.security.jmac.https.HttpsTestAuthModule"); private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests"); public static void main(String args[]) throws Exception { @@ -56,22 +56,16 @@ public static void main(String args[]) throws Exception { private static void parseResponse(HttpsURLConnection connection) throws Exception { - BufferedReader in = null; - - try { - in = new BufferedReader(new InputStreamReader( - connection.getInputStream())); - + try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) { String line = null; String matched = null; try { - Pattern p = Pattern.compile(EXPECTED_RESPONSE_PATTERN); while ((line = in.readLine()) != null) { - if (p.matcher(line).matches()) { + System.out.println("XXXPORN: " + line); + if (EXPECTED_RESPONSE_PATTERN.matcher(line).matches()) { stat.addStatus(TEST_NAME, stat.PASS); matched = line; } - System.out.println(line); } } catch (Exception ex) { ex.printStackTrace(); @@ -83,21 +77,13 @@ private static void parseResponse(HttpsURLConnection connection) + ", received: " + matched); stat.addStatus(TEST_NAME, stat.FAIL); } - } finally { - if (in != null) { - in.close(); - } } } - private static HttpsURLConnection connect(String urlAddress, - SSLSocketFactory ssf) - throws Exception { + private static HttpsURLConnection connect(String urlAddress, SSLSocketFactory ssf) throws Exception { URL url = new URL(urlAddress); - HttpsURLConnection.setDefaultSSLSocketFactory(ssf); HttpsURLConnection connection = (HttpsURLConnection) url.openConnection(); - connection.setHostnameVerifier( new HostnameVerifier() { @@ -107,7 +93,6 @@ public boolean verify(String rserver, SSLSession sses) { }); connection.setDoOutput(true); - return connection; } } diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soap/build.xml b/appserver/tests/appserv-tests/devtests/security/jmac/soap/build.xml index 9fd418d2338..1b9e072a3e2 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/build.xml @@ -137,7 +137,8 @@ + classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${build.classes.dir}/client" + debug="on" failonerror="true"/> diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/build.xml b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/build.xml index fbe0b6ad58c..87c737872ae 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/build.xml @@ -152,7 +152,8 @@ + classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-api-osgi.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${build.classes.dir}/client" + debug="on" failonerror="true"/> diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/build.xml b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/build.xml index bc912c7275f..188822fa933 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/build.xml @@ -31,187 +31,204 @@ &testproperties; &commonSecurity; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/security/run_test.sh b/appserver/tests/appserv-tests/devtests/security/run_test.sh index 886ed34860a..888f28ac8dd 100755 --- a/appserver/tests/appserv-tests/devtests/security/run_test.sh +++ b/appserver/tests/appserv-tests/devtests/security/run_test.sh @@ -17,41 +17,41 @@ test_run(){ - #cp -f ${APS_HOME}/devtests/security/ldap/opends/X500Signer.jar ${OPENDS_HOME}/lib + #cp -f ${APS_HOME}/devtests/security/ldap/opends/X500Signer.jar ${OPENDS_HOME}/lib - # Configure and start OpenDS using the default ports - ${OPENDS_HOME}/setup \ - -i \ - -v \ - -n \ - -p 1389 \ - --adminConnectorPort 4444 \ - -x 1689 \ - -w dmanager \ - -b "dc=sfbay,dc=sun,dc=com" \ - -Z 1636 \ - --useJavaKeystore ${S1AS_HOME}/domains/domain1/config/keystore.jks \ - -W changeit \ - -N s1as + # Configure and start OpenDS using the default ports + ${OPENDS_HOME}/setup \ + -i \ + -v \ + -n \ + -p 1389 \ + --adminConnectorPort 4444 \ + -x 1689 \ + -w dmanager \ + -b "dc=sfbay,dc=sun,dc=com" \ + -Z 1636 \ + --useJavaKeystore ${S1AS_HOME}/domains/domain1/config/keystore.jks \ + -W changeit \ + -N s1as - ${S1AS_HOME}/bin/asadmin start-database - ${S1AS_HOME}/bin/asadmin start-domain - cd ${APS_HOME}/devtests/security + ${S1AS_HOME}/bin/asadmin start-database + ${S1AS_HOME}/bin/asadmin start-domain + cd ${APS_HOME}/devtests/security - ant ${TARGET} | tee ${TEST_RUN_LOG} + ant ${TARGET} | tee ${TEST_RUN_LOG} - ${S1AS_HOME}/bin/asadmin stop-domain - ${S1AS_HOME}/bin/asadmin stop-database + ${S1AS_HOME}/bin/asadmin stop-domain + ${S1AS_HOME}/bin/asadmin stop-database ${OPENDS_HOME}/bin/stop-ds \ - -p 4444 \ - -D "cn=Directory Manager" \ - -w dmanager \ - -P ${OPENDS_HOME}/config/admin-truststore \ - -U ${OPENDS_HOME}/config/admin-keystore.pin + -p 4444 \ + -D "cn=Directory Manager" \ + -w dmanager \ + -P ${OPENDS_HOME}/config/admin-truststore \ + -U ${OPENDS_HOME}/config/admin-keystore.pin - #egrep 'FAILED= *0' ${TEST_RUN_LOG} - #egrep 'DID NOT RUN= *0' ${TEST_RUN_LOG} - cd - + #egrep 'FAILED= *0' ${TEST_RUN_LOG} + #egrep 'DID NOT RUN= *0' ${TEST_RUN_LOG} + cd - } get_test_target(){ @@ -69,17 +69,21 @@ merge_result_files(){ run_test_id(){ # setup opendj (fork of opends) - curl -L -k https://github.com/OpenIdentityPlatform/OpenDJ/releases/download/4.1.10/opendj-4.1.10.zip > opendj-4.1.10.zip - unzip -o opendj-4.1.10.zip + OPENDJ_VERSION='4.4.11' + OPENDJ_ZIP="${WORKSPACE}/bundles/opendj-${OPENDJ_VERSION}.zip" + if [ ! -f "${OPENDJ_ZIP}" ]; then + curl -L -k https://github.com/OpenIdentityPlatform/OpenDJ/releases/download/4.4.11/opendj-4.4.11.zip > "${OPENDJ_ZIP}" + fi + unzip -o ${OPENDJ_ZIP} export OPENDS_HOME=${PWD}/opendj - unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip - cd `dirname ${0}` - test_init - get_test_target ${1} - test_run - merge_result_files - check_successful_run + unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip + cd `dirname ${0}` + test_init + get_test_target ${1} + test_run + merge_result_files + check_successful_run generate_junit_report ${1} change_junit_report_class_names } diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/README.md b/appserver/tests/appserv-tests/devtests/security/soteria/README.md deleted file mode 100644 index 948191eac45..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/README.md +++ /dev/null @@ -1,25 +0,0 @@ -This is integration devtests for JSR 375 RI(soteria). -The sample apps are taken from [Soteria](https://github.com/eclipse-ee4j/soteria) repository. -Follow the below instructions to run the tests. -1. set APS_HOME to appserv-tests dir. -2. set M2_HOME to maven Home. -3. set S1AS_HOME to glassfish installation. The S1AS_HOME should contain glassfish directory. -4. $S1AS_HOME/bin/asadmin start-domain -5. Run mvn clean verify -6. $S1AS_HOME/bin/asadmin stop-domain - -Known Issue: -1.Aruillian gf container: ------------- -Jun 05, 2017 3:50:22 PM org.jboss.arquillian.container.glassfish.clientutils.GlassFishClientUtil getResponseMap -SEVERE: exit_code: FAILURE, message: An error occurred while processing the request. Please see the server logs for details. [status: SERVER_ERROR reason: Service Unavailable] -[ERROR] Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 6.173 s <<< FAILURE! - in org.glassfish.soteria.test.AppMemBasicIT -[ERROR] org.glassfish.soteria.test.AppMemBasicIT Time elapsed: 6.165 s <<< ERROR! -com.sun.jersey.api.container.ContainerException: exit_code: FAILURE, message: An error occurred while processing the request. Please see the server logs for details. [status: SERVER_ERROR reason: Service Unavailable] - -Jun 05, 2017 3:50:22 PM org.jboss.arquillian.container.glassfish.managed_3_1.GlassFishServerControl$1 run -WARNING: Forcing container shutdown -Stopping container using command: [java, -jar, /media/sameerpandit/WLS/javaEE/tt/glassfish6/glassfish/../glassfish/modules/admin-cli.jar, stop-domain, -t] ------------- - -Resolve this by running the test with a fresh $S1AS_HOME. diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/README.md b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/README.md deleted file mode 100644 index 4e9d394463d..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/README.md +++ /dev/null @@ -1,5 +0,0 @@ -### app-bundled-ham-basic-login-config-form - -**If an application bundles its own `HttpAuthenticationMechanism`, then for authentication, the container will rely on the bundled mechanism and will ignore the `login-config` element in deployment descriptor of the application. - -In this sample app, the `BASIC` authentication mechanism defined in `HttpAuthenticationMechanism` takes precedencce over `FORM` authentication present in `login-config`. diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml deleted file mode 100644 index 1d9efa7d82e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-bundled-ham-basic-login-config-form - war - - - app-bundled-ham-basic-login-config-form - - - - false - - - - org.glassfish.soteria.test - common - ${project.version} - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/BasicAuthenticationServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/BasicAuthenticationServlet.java deleted file mode 100644 index ce5646f2949..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/BasicAuthenticationServlet.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.inject.Inject; -import javax.security.enterprise.SecurityContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.HttpConstraint; -import jakarta.servlet.annotation.ServletSecurity; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -@WebServlet(urlPatterns = "/basicAuthenticationServlet") -@ServletSecurity(@HttpConstraint(rolesAllowed = "foo")) - -public class BasicAuthenticationServlet extends HttpServlet { - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - response.getWriter().write("Authentication Mechanism:" + response.getHeader("Authentication Mechanism") +"\n"); - - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index c612e2db25e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; - -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - String password = request.getParameter("password"); - - if (name != null && password != null) { - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - // Communicate the details of the authenticated user to the - // container. In many cases the underlying handler will just store the details - // and the container will actually handle the login after we return from - // this method. - response.addHeader("Authentication Mechanism", "TestAuthenticationMechanism"); - return httpMessageContext.notifyContainerAboutLogin( - result.getCallerPrincipal(), result.getCallerGroups()); - } else { - return httpMessageContext.responseUnauthorized(); - } - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java deleted file mode 100644 index 35b1b7d7abd..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; - -@RequestScoped -public class TestIdentityStore implements IdentityStore { - - public CredentialValidationResult validate(UsernamePasswordCredential usernamePasswordCredential) { - - if (usernamePasswordCredential.compareTo("reza", "secret1")) { - return new CredentialValidationResult("reza", new HashSet<>(asList("foo", "bar"))); - } - - return INVALID_RESULT; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 2889bfa8143..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - index - index - /index.jsp - - - - - FORM Based Authentication Servlet - / - - - foo - - - NONE - - - - - FORM - file - - /loginform.jsp - /loginerror.jsp - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/index.jsp b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/index.jsp deleted file mode 100644 index afdc05bbc81..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/index.jsp +++ /dev/null @@ -1,33 +0,0 @@ -<%-- - - Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@page contentType="text/html" pageEncoding="UTF-8"%> - - - - - - Form-based Security - Success - - -

Form-based Security - Success

- - If you reached this page that means form-based security credentials are correctly configured. - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/loginerror.jsp b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/loginerror.jsp deleted file mode 100644 index 63b43e4d52c..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/loginerror.jsp +++ /dev/null @@ -1,38 +0,0 @@ -<%-- - - Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@page contentType="text/html" pageEncoding="UTF-8"%> - - - - - - Form-Based Login Error Page - - -

Login Error Page

- -

Invalid user name or password.

- -

Please specify a valid user/password combination

- - Click here to Try Again

- - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/loginform.jsp b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/loginform.jsp deleted file mode 100644 index 71bc4fefd2c..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/loginform.jsp +++ /dev/null @@ -1,39 +0,0 @@ -<%-- - - Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - -<%@page contentType="text/html" pageEncoding="UTF-8"%> - - - - - - Form-Based Login Page - - -

Form-Based Login Page

- -
- Username:

- Password:

- - -

- - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/test/java/org/glassfish/soteria/test/AppBundledHAMPrecendenceOverLoginConfigInWebXmlIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/test/java/org/glassfish/soteria/test/AppBundledHAMPrecendenceOverLoginConfigInWebXmlIT.java deleted file mode 100644 index a9dd417e0ad..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/test/java/org/glassfish/soteria/test/AppBundledHAMPrecendenceOverLoginConfigInWebXmlIT.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.*; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; - -import org.glassfish.soteria.test.ArquillianBase; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -@RunWith(Arquillian.class) -public class AppBundledHAMPrecendenceOverLoginConfigInWebXmlIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppBundledHAMPrecendenceOverLoginConfigInWebXml"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testHAMPrecedenceOverLoginConfig() { - - assertBundledHAMPrecedenceOverLoginConfig( - responseFromServer("/basicAuthenticationServlet?name=reza&password=secret1")); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/README.md b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/README.md deleted file mode 100644 index 0bb7d106674..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/README.md +++ /dev/null @@ -1,12 +0,0 @@ - -### app-container-application-principal-getname - -**From JSR 375 Specification** - -> **1.2.2. Caller Principal Types** - -> When both a container caller principal and an application caller principal are present, the value obtained by calling getName() on both principals MUST be the same. - -In this test, application provides its own caller principal, -and hence, subject contains two such principals, one -representing the container and other one representing the application itself. diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml deleted file mode 100644 index f9f345085c1..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-caller-principal - war - - - app-caller-principal - - - - false - - - - org.glassfish.soteria.test - common - ${project.version} - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/AppPrincipal.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/AppPrincipal.java deleted file mode 100644 index f52f9259e21..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/AppPrincipal.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.security.Principal; - -/** - * Created by vinay on 7/8/17. - */ -public class AppPrincipal implements Principal { - String name; - - public AppPrincipal(String name){ - this.name = name; - } - - @Override - public String getName() { - return name; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java deleted file mode 100644 index fdc77398758..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.inject.Inject; -import javax.security.enterprise.SecurityContext; -import javax.security.enterprise.CallerPrincipal; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.HttpConstraint; -import jakarta.servlet.annotation.ServletSecurity; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import java.security.Principal; -import java.util.Optional; -import java.util.Set; - -/** - * The Servlet which validates if for the authenticated user, both - * container and caller principals are present in the subject - * representing the caller. - */ -@WebServlet("/callerSubjectServlet") -@ServletSecurity(@HttpConstraint(rolesAllowed = "foo")) -public class CallerSubjectServlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - private SecurityContext securityContext; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - String containerCallerPrincipalName = null; - String appPrincipalName = null; - String callerPrincipalFromSecurityContextName = null; - boolean isUserInRole = securityContext.isCallerInRole("foo"); - int callerPrincipalCount = 0; - - Principal containerCallerPrincipal = securityContext.getCallerPrincipal(); - containerCallerPrincipalName = containerCallerPrincipal.getName(); - - Set principals = securityContext.getPrincipalsByType(java.security.Principal.class); - - Optional appCallerPrincipalOptional = principals.stream().filter((p) -> p.getClass().getName() == AppPrincipal.class.getName()) - .findAny(); - Principal appPrincipal = null; - if (appCallerPrincipalOptional.isPresent()) { - callerPrincipalCount++; - appPrincipal = appCallerPrincipalOptional.get(); - appPrincipalName = appPrincipal.getName(); - } - - Optional containerCallerPrincipalOptional = principals.stream().filter((p) -> p.getClass().getName() == CallerPrincipal - .class.getName()) - .findAny(); - Principal callerPrincipalFromSecurityContext = null; - if (containerCallerPrincipalOptional.isPresent()) { - callerPrincipalCount++; - callerPrincipalFromSecurityContext = containerCallerPrincipalOptional.get(); - callerPrincipalFromSecurityContextName = callerPrincipalFromSecurityContext.getName(); - } - - if (!containerCallerPrincipalName.isEmpty() && !appPrincipalName.isEmpty() && containerCallerPrincipalName.equals - (appPrincipalName) && isUserInRole & callerPrincipalCount == 1) { - response.getWriter().write(String.format("Container caller principal and application caller principal both are " + - "represented by same principal for user %s and is in role %s", containerCallerPrincipal.getName(), "foo")); - } else { - response.getWriter().write(String.format("Both %s and %s principal types are available wherein only principal of " + - "type %s was expected for user %s and is in role %s",AppPrincipal.class.getName(), CallerPrincipal.class - .getName(), AppPrincipal.class.getName(), containerCallerPrincipal.getName(), - "foo")); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index e614c50ff84..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - - - - -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - String password = request.getParameter("password"); - - if (name != null && password != null) { - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - // In this case , application chooses to provide its own caller principal - return httpMessageContext.notifyContainerAboutLogin( - new AppPrincipal(name), result.getCallerGroups()); - - } else { - return httpMessageContext.responseUnauthorized(); - } - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java deleted file mode 100644 index c4556df1eb1..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; -import javax.security.enterprise.credential.UsernamePasswordCredential; - -@RequestScoped -public class TestIdentityStore implements IdentityStore { - - public CredentialValidationResult validate(UsernamePasswordCredential usernamePasswordCredential) { - - if (usernamePasswordCredential.compareTo("reza", "secret1")) { - return new CredentialValidationResult("reza", new HashSet<>(asList("foo", "bar"))); - } - - return INVALID_RESULT; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 48a35fa4223..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - User pages - /protectedServlet - - - foo - - - - - - foo - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/test/java/org/glassfish/soteria/test/AppCallerPrincipalIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/test/java/org/glassfish/soteria/test/AppCallerPrincipalIT.java deleted file mode 100644 index a272733a58e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/test/java/org/glassfish/soteria/test/AppCallerPrincipalIT.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.*; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; - -import org.glassfish.soteria.test.ArquillianBase; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -@RunWith(Arquillian.class) -public class AppCallerPrincipalIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppCallerPrincipal"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testCallerSubjectPrincipals() { - assertApplicationPrincipalAndContainerPrincipalName( - responseFromServer("/callerSubjectServlet?name=reza&password=secret1")); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml deleted file mode 100644 index 557f17919e2..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-custom-identity-store-handler - war - - - app-custom-identity-store-handler - - - - false - - - - - org.glassfish.soteria.test - common - ${project.version} - test - - - com.unboundid - unboundid-ldapsdk - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/BlackListedIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/BlackListedIdentityStore.java deleted file mode 100644 index 6eb467ffa70..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/BlackListedIdentityStore.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; -import static javax.security.enterprise.identitystore.CredentialValidationResult.NOT_VALIDATED_RESULT; -import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.VALIDATE; -import static org.glassfish.soteria.Utils.unmodifiableSet; - -import java.util.Set; - -import jakarta.enterprise.context.ApplicationScoped; -import javax.security.enterprise.credential.Credential; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; - -/** - * - */ -@ApplicationScoped -public class BlackListedIdentityStore implements IdentityStore { - - @Override - public CredentialValidationResult validate(Credential credential) { - CredentialValidationResult result = NOT_VALIDATED_RESULT; - if (credential instanceof UsernamePasswordCredential) { - UsernamePasswordCredential usernamePassword = (UsernamePasswordCredential) credential; - - if ("rudy".equals(usernamePassword.getCaller())) { - - result = INVALID_RESULT; - } - } - return result; - } - - @Override - public int priority() { - return 1000; - } - - @Override - public Set validationTypes() { - return unmodifiableSet(VALIDATE); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java deleted file mode 100644 index c8cda52e353..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import javax.security.enterprise.identitystore.IdentityStore.ValidationType; -import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.PROVIDE_GROUPS; -import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.VALIDATE; - -import javax.security.enterprise.identitystore.LdapIdentityStoreDefinition.LdapSearchScope; -import static javax.security.enterprise.identitystore.LdapIdentityStoreDefinition.LdapSearchScope.ONE_LEVEL; -import static javax.security.enterprise.identitystore.LdapIdentityStoreDefinition.LdapSearchScope.SUBTREE; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Named; - -@RequestScoped -@Named -public class ConfigBean { - private int priority300=300; - private int priority100=100; - private ValidationType[] useforBoth = {ValidationType.VALIDATE, ValidationType.PROVIDE_GROUPS}; - private ValidationType[] useforValidate = {ValidationType.VALIDATE}; - private ValidationType[] useforProvideGroup = {ValidationType.PROVIDE_GROUPS}; - private LdapSearchScope searchScopeOneLevel = ONE_LEVEL; - private LdapSearchScope searchScopeSubTree = SUBTREE; - - public int getPriority300(){ - return priority300; - } - - public int getPriority100(){ - return priority100; - } - - public ValidationType[] getUseforBoth(){ - return useforBoth; - } - - public ValidationType[] getUseforValidate(){ - return useforValidate; - } - - public ValidationType[] getUseforProvideGroup(){ - return useforProvideGroup; - } - - public LdapSearchScope getSearchScopeOneLevel(){ - return ONE_LEVEL; - } - - public LdapSearchScope getSearchScopeSubTree(){ - return SUBTREE; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/CustomIdentityStoreHandler.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/CustomIdentityStoreHandler.java deleted file mode 100644 index 58b5972ec8e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/CustomIdentityStoreHandler.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import jakarta.annotation.PostConstruct; -import jakarta.annotation.Priority; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Alternative; -import javax.security.enterprise.CallerPrincipal; -import javax.security.enterprise.credential.Credential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import static java.util.Comparator.comparing; -import static java.util.stream.Collectors.toList; -import static jakarta.interceptor.Interceptor.Priority.APPLICATION; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; -import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.PROVIDE_GROUPS; -import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.VALIDATE; -import static org.glassfish.soteria.cdi.CdiUtils.getBeanReferencesByType; - -/** - * - */ -@Alternative -@Priority(APPLICATION) -@ApplicationScoped -public class CustomIdentityStoreHandler implements IdentityStoreHandler { - - private List validatingIdentityStores; - private List groupProvidingIdentityStores; - - @PostConstruct - public void init() { - List identityStores = getBeanReferencesByType(IdentityStore.class, false); - - validatingIdentityStores = identityStores.stream() - .filter(i -> i.validationTypes().contains(VALIDATE)) - .sorted(comparing(IdentityStore::priority)) - .collect(toList()); - - groupProvidingIdentityStores = identityStores.stream() - .filter(i -> i.validationTypes().contains(PROVIDE_GROUPS)) - .sorted(comparing(IdentityStore::priority)) - .collect(toList()); - } - - @Override - public CredentialValidationResult validate(Credential credential) { - CredentialValidationResult validationResult = null; - IdentityStore identityStore = null; - - // Check all stores and stop when one marks it as invalid. - for (IdentityStore authenticationIdentityStore : validatingIdentityStores) { - CredentialValidationResult temp = authenticationIdentityStore.validate(credential); - switch (temp.getStatus()) { - - case NOT_VALIDATED: - // Don't do anything - break; - case INVALID: - validationResult = temp; - break; - case VALID: - validationResult = temp; - identityStore = authenticationIdentityStore; - break; - default: - throw new IllegalArgumentException("Value not supported " + temp.getStatus()); - } - if (validationResult != null && validationResult.getStatus() == CredentialValidationResult.Status.INVALID) { - break; - } - } - - if (validationResult == null) { - // No authentication store at all - return INVALID_RESULT; - } - - if (validationResult.getStatus() != VALID) { - // No store validated (authenticated), no need to continue - return validationResult; - } - - CallerPrincipal callerPrincipal = validationResult.getCallerPrincipal(); - - Set groups = new HashSet<>(); - if (identityStore.validationTypes().contains(PROVIDE_GROUPS)) { - groups.addAll(validationResult.getCallerGroups()); - } - - // Ask all stores that were configured for authorization to get the groups for the - // authenticated caller - for (IdentityStore authorizationIdentityStore : groupProvidingIdentityStores) { - groups.addAll(authorizationIdentityStore.getCallerGroups(validationResult)); - } - - return new CredentialValidationResult(callerPrincipal, groups); - - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/GroupProviderIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/GroupProviderIdentityStore.java deleted file mode 100644 index 3670fff3f07..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/GroupProviderIdentityStore.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static java.util.Collections.emptySet; -import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.PROVIDE_GROUPS; -import static org.glassfish.soteria.Utils.unmodifiableSet; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import jakarta.annotation.PostConstruct; -import jakarta.enterprise.context.ApplicationScoped; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; -import javax.security.enterprise.identitystore.LdapIdentityStoreDefinition; -import javax.security.enterprise.identitystore.LdapIdentityStoreDefinition.LdapSearchScope; -import javax.security.enterprise.identitystore.IdentityStore.ValidationType; -import static javax.security.enterprise.identitystore.LdapIdentityStoreDefinition.LdapSearchScope.SUBTREE; -import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.VALIDATE; - -/** - * - */ -@LdapIdentityStoreDefinition( - url = "ldap://localhost:33389/", - callerBaseDn = "ou=caller,dc=jsr375,dc=net", - callerSearchScope = LdapSearchScope.SUBTREE, - groupSearchBase = "ou=group,dc=jsr375,dc=net", - useForExpression = "#{'VALIDATE'}", - groupSearchScopeExpression = "${configBean.searchScopeOneLevel}" -) -@ApplicationScoped -public class GroupProviderIdentityStore implements IdentityStore { - - private Map> groupsPerCaller; - - @PostConstruct - public void init() { - groupsPerCaller = new HashMap<>(); - - groupsPerCaller.put("rudy", new HashSet<>(asList("foo", "bar"))); - groupsPerCaller.put("will", new HashSet<>(asList("foo", "bar", "baz"))); - groupsPerCaller.put("arjan", new HashSet<>(asList("foo", "baz"))); - groupsPerCaller.put("reza", new HashSet<>(asList("baz"))); - - } - - @Override - public Set getCallerGroups(CredentialValidationResult validationResult) { - Set result = groupsPerCaller.get(validationResult.getCallerPrincipal().getName()); - if (result == null) { - result = emptySet(); - } - - return result; - } - - @Override - public Set validationTypes() { - return unmodifiableSet(PROVIDE_GROUPS); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java deleted file mode 100644 index 2e5e64a2df0..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import com.unboundid.ldap.listener.InMemoryDirectoryServer; -import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig; -import com.unboundid.ldap.listener.InMemoryListenerConfig; -import com.unboundid.ldap.sdk.LDAPException; -import com.unboundid.ldif.LDIFReader; - -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; -import jakarta.ejb.Singleton; -import jakarta.ejb.Startup; - -/** - * Starts up the embedded Unboundid LDAP server on port 33389 and loads a test directory - * into it containing the same caller- and roles names as the Database and Embedded idenity - * stores are using. - * - * @author Arjan Tijms - * - */ -@Startup -@Singleton -public class LdapSetup { - - private InMemoryDirectoryServer directoryServer; - - @PostConstruct - public void init() { - try { - InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=net"); - config.setListenerConfigs( - new InMemoryListenerConfig("myListener", null, 33389, null, null, null)); - - directoryServer = new InMemoryDirectoryServer(config); - - directoryServer.importFromLDIF(true, - new LDIFReader(this.getClass().getResourceAsStream("/test.ldif"))); - - directoryServer.startListening(); - } catch (LDAPException e) { - throw new IllegalStateException(e); - } - } - - @PreDestroy - public void destroy() { - directoryServer.shutDown(true); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index a9c2d7c8c3e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - */ - -@DeclareRoles({"foo", "bar", "baz"}) -@WebServlet("/servlet") -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"baz\": " + request.isUserInRole("baz") + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index 89d572650b8..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.credential.Password; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; - -@ApplicationScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - if (request.getParameter("name") != null && request.getParameter("password") != null) { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - Password password = new Password(request.getParameter("password")); - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - // Communicate the details of the authenticated user to the - // container. In many cases the underlying handler will just store the details - // and the container will actually handle the login after we return from - // this method. - return httpMessageContext.notifyContainerAboutLogin( - result.getCallerPrincipal(), result.getCallerGroups()); - } - - return httpMessageContext.responseUnauthorized(); - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/resources/test.ldif b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/resources/test.ldif deleted file mode 100644 index a0a630c0e4a..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/resources/test.ldif +++ /dev/null @@ -1,79 +0,0 @@ -dn: dc=net -objectclass: top -objectclass: dcObject -objectclass: organization -dc: net -o: net - -dn: dc=jsr375,dc=net -objectclass: top -objectclass: dcObject -objectclass: organization -dc: jsr375 -o: jsr375 - -dn: ou=caller,dc=jsr375,dc=net -objectclass: top -objectclass: organizationalUnit -ou: caller - -dn: uid=rudy,ou=caller,dc=jsr375,dc=net -objectclass: top -objectclass: uidObject -objectclass: person -uid: rudy -cn: Rudy De Busscher -sn: Rudy -userPassword: pw - -dn: uid=reza,ou=caller,dc=jsr375,dc=net -objectclass: top -objectclass: uidObject -objectclass: person -uid: reza -cn: Reza Rahman -sn: Reza -userPassword: secret1 - -dn: uid=alex,ou=caller,dc=jsr375,dc=net -objectclass: top -objectclass: uidObject -objectclass: person -uid: alex -cn: Alex Kosowski -sn: Alex -userPassword: secret2 - -dn: uid=arjan,ou=caller,dc=jsr375,dc=net -objectclass: top -objectclass: uidObject -objectclass: person -uid: arjan -cn: Arjan Tijms -sn: Arjan -userPassword: secret3 - -dn: ou=group,dc=jsr375,dc=net -objectclass: top -objectclass: organizationalUnit -ou: group - -dn: cn=foo,ou=group,dc=jsr375,dc=net -objectclass: top -objectclass: groupOfNames -cn: foo -member: uid=reza,ou=caller,dc=jsr375,dc=net -member: uid=arjan,ou=caller,dc=jsr375,dc=net - -dn: cn=bar,ou=group,dc=jsr375,dc=net -objectclass: top -objectclass: groupOfNames -cn: bar -member: uid=reza,ou=caller,dc=jsr375,dc=net - -dn: cn=kaz,ou=group,dc=jsr375,dc=net -objectclass: top -objectclass: groupOfNames -cn: kaz -member: uid=alex,ou=caller,dc=jsr375,dc=net - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index c7b971316ed..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/beans.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - org.glassfish.soteria.test.CustomIdentityStoreHandler - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 6cefa706f2d..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - foo - foo - - - - bar - bar - - - - kaz - kaz - - - - baz - baz - - - - group1 - group1 - - - - group2 - group2 - - - - group3 - group3 - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/test/java/org/glassfish/soteria/test/AppCustomIdentityStoreHandlerIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/test/java/org/glassfish/soteria/test/AppCustomIdentityStoreHandlerIT.java deleted file mode 100644 index 49825441e91..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/test/java/org/glassfish/soteria/test/AppCustomIdentityStoreHandlerIT.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.assertAuthenticated; -import static org.glassfish.soteria.test.Assert.assertDefaultNotAuthenticated; -import static org.glassfish.soteria.test.Assert.assertNotAuthenticated; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - - -@RunWith(Arquillian.class) -public class AppCustomIdentityStoreHandlerIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppCustomIdentityStoreHandler"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticated() { - assertAuthenticated( - "web", "reza", - readFromServer("/servlet?name=reza&password=secret1"), - // Only groups from the - "baz"); - } - - @Test - public void testBlacklisted() { - assertNotAuthenticated( - "web", "rudy", - readFromServer("/servlet?name=rudy&password=pw"), - "foo", "bar"); - } - - @Test - public void testNotAuthenticated() { - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - } - - @Test - public void testNotAuthenticatedWrongName() { - assertNotAuthenticated( - "web", "reza", - readFromServer("/servlet?name=romo&password=secret1"), - "foo", "bar", "baz"); - } - - @Test - public void testNotAuthenticatedWrongPassword() { - assertNotAuthenticated( - "web", "reza", - readFromServer("/servlet?name=reza&password=wrongpassword"), - "foo", "bar", "baz"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml deleted file mode 100644 index ad5f7ba3472..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-custom-rememberme - war - - - app-custom-rememberme - - - - false - - - - org.glassfish.soteria.test - common - ${project.version} - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java deleted file mode 100644 index d7c027b1a5b..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Named; - -@RequestScoped -@Named -public class RememberMeConfigBean { - - private int maxAgeSeconds = 500; - private String cookieName = "GLASSFISHCOOKIE"; - private boolean secureOnly = false; - private boolean httpOnly = true; - - public int getMaxAgeSeconds() { - return maxAgeSeconds; - } - - public String getCookieName() { - return cookieName; - } - - public boolean isSecureOnly() { - return secureOnly; - } - - public boolean isHttpOnly() { - return httpOnly; - } -} - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index ddbdde0068a..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - * - * - */ -@DeclareRoles({ "foo", "bar", "kaz" }) -@WebServlet("/servlet") -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - if (request.getParameter("logout") != null) { - request.logout(); // slightly ill-defined, but only for current request - request.getSession().invalidate(); - } - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - - String mechanismCalled = (String) request.getAttribute("authentication-mechanism-called"); - - response.getWriter().write("\nauthentication mechanism called: " + (mechanismCalled != null? mechanismCalled : false) + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index 859eece6373..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.authentication.mechanism.http.RememberMe; -import javax.security.enterprise.credential.Password; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; - -@RememberMe( - cookieName = "#{self.rememberMeConfigBean.getCookieName()}", - cookieMaxAgeSecondsExpression = "#{self.rememberMeConfigBean.maxAgeSeconds}", - cookieSecureOnlyExpression = "#{self.rememberMeConfigBean.isSecureOnly()}", - cookieHttpOnlyExpression = "#{self.rememberMeConfigBean.httpOnly}", - isRememberMeExpression ="#{self.isRememberMe(httpMessageContext)}" -) -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - public RememberMeConfigBean getRememberMeConfigBean() { - return rememberMeConfigBean; - } - - @Inject - private RememberMeConfigBean rememberMeConfigBean; - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - request.setAttribute("authentication-mechanism-called", "true"); - - if (request.getParameter("name") != null && request.getParameter("password") != null) { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - Password password = new Password(request.getParameter("password")); - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - // Communicate the details of the authenticated user to the - // container. In many cases the underlying handler will just store the details - // and the container will actually handle the login after we return from - // this method. - return httpMessageContext.notifyContainerAboutLogin( - result.getCallerPrincipal(), result.getCallerGroups()); - } else { - return httpMessageContext.responseUnauthorized(); - } - } - - return httpMessageContext.doNothing(); - } - - public Boolean isRememberMe(HttpMessageContext httpMessageContext) { - return httpMessageContext.getRequest().getParameter("rememberme") != null; - } - - // Workaround for possible CDI bug; at least in Weld 2.3.2 default methods don't seem to be intercepted - @Override - public void cleanSubject(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) { - HttpAuthenticationMechanism.super.cleanSubject(request, response, httpMessageContext); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java deleted file mode 100644 index 1a3733a9acb..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; -import static javax.security.enterprise.identitystore.CredentialValidationResult.NOT_VALIDATED_RESULT; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.credential.Credential; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; - -@RequestScoped -public class TestIdentityStore implements IdentityStore { - - @Override - public CredentialValidationResult validate(Credential credential) { - if (credential instanceof UsernamePasswordCredential) { - return validate((UsernamePasswordCredential) credential); - } - - return NOT_VALIDATED_RESULT; - } - - public CredentialValidationResult validate(UsernamePasswordCredential usernamePasswordCredential) { - - if (usernamePasswordCredential.getCaller().equals("reza") && - usernamePasswordCredential.getPassword().compareTo("secret1")) { - - return new CredentialValidationResult("reza", new HashSet<>(asList("foo", "bar"))); - } - - return INVALID_RESULT; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestRememberMeIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestRememberMeIdentityStore.java deleted file mode 100644 index 7a6f650d995..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestRememberMeIdentityStore.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - - -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - -import jakarta.enterprise.context.ApplicationScoped; -import javax.security.enterprise.CallerPrincipal; -import javax.security.enterprise.credential.RememberMeCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.RememberMeIdentityStore; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; - -@ApplicationScoped -public class TestRememberMeIdentityStore implements RememberMeIdentityStore { - - private final Map identities = new ConcurrentHashMap<>(); - - @Override - public CredentialValidationResult validate(RememberMeCredential credential) { - if (identities.containsKey(credential.getToken())) { - return identities.get(credential.getToken()); - } - - return INVALID_RESULT; - } - - @Override - public String generateLoginToken(CallerPrincipal callerPrincipal, Set groups) { - String token = UUID.randomUUID().toString(); - - // NOTE: FOR EXAMPLE ONLY. AS TOKENKEY WOULD EFFECTIVELY BECOME THE REPLACEMENT PASSWORD - // IT SHOULD NORMALLY NOT BE STORED DIRECTLY BUT EG USING STRONG HASHING - identities.put(token, new CredentialValidationResult(callerPrincipal, groups)); - - return token; - } - - @Override - public void removeLoginToken(String token) { - identities.remove(token); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 11d0ee6b8f8..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - foo - foo - - - - bar - bar - - - - kaz - kaz - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/test/java/org/glassfish/soteria/test/AppCustomRememberMeIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/test/java/org/glassfish/soteria/test/AppCustomRememberMeIT.java deleted file mode 100644 index b7973e48e92..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/test/java/org/glassfish/soteria/test/AppCustomRememberMeIT.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; -import org.glassfish.soteria.test.ArquillianBase; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -import com.gargoylesoftware.htmlunit.util.Cookie; - -import static org.glassfish.soteria.test.Assert.assertDefaultAuthenticated; -import static org.glassfish.soteria.test.Assert.assertDefaultNotAuthenticated; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; - -@RunWith(Arquillian.class) -public class AppCustomRememberMeIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppCustomRememberMe"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - - @Test - public void testHttpOnlyIsTrue() { - readFromServer("/servlet?name=reza&password=secret1&rememberme=true"); - - assertTrue(getWebClient().getCookieManager().getCookie("GLASSFISHCOOKIE").isHttpOnly()); - } - - @Test - public void testSecureOnlyIsFalse() { - readFromServer("/servlet?name=reza&password=secret1&rememberme=true"); - - assertFalse(getWebClient().getCookieManager().getCookie("GLASSFISHCOOKIE").isSecure()); - } - - @Test - public void testAuthenticated() { - assertDefaultAuthenticated( - readFromServer("/servlet?name=reza&password=secret1")); - } - - @Test - public void testNotAuthenticated() { - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - } - - @Test - public void testNotAuthenticatedWrongName() { - assertDefaultNotAuthenticated( - readFromServer("/servlet?name=romo&password=secret1")); - } - - @Test - public void testNotAuthenticatedWrongPassword() { - assertDefaultNotAuthenticated( - readFromServer("/servlet?name=reza&password=wrongpassword")); - } - - @Test - public void testAuthenticatedRememberMe() { - - // 1. Initially request page when we're not authenticated - - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - - - // 2. Authenticate without remember me - - String response = readFromServer("/servlet?name=reza&password=secret1"); - - assertDefaultAuthenticated( - response); - - // For the initial authentication, the mechanism should be called - - assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: true")); - - - // 3. Request same page again within same http session, without remember me - // specified should NOT be authenticated - - response = readFromServer("/servlet"); - - assertDefaultNotAuthenticated( - response); - - - // 4. Authenticate with remember me - - response = readFromServer("/servlet?name=reza&password=secret1&rememberme=true"); - - assertDefaultAuthenticated( - response); - - // For the initial authentication, the mechanism should be called again - - assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: true")); - - - // 5. Request same page again within same http session, with remember me - // specified should be authenticated - - response = readFromServer("/servlet"); - - assertDefaultAuthenticated( - response); - - // For the subsequent authentication, the mechanism should not be called again - // (the remember me interceptor takes care of this) - - assertTrue( - "Authentication mechanism should not have been called, but was", - response.contains("authentication mechanism called: false")); - - - // 6. "Expire" the session by removing all cookies except the - // remember me cookie - - for (Cookie cookie : getWebClient().getCookieManager().getCookies()) { - if (!"GLASSFISHCOOKIE".equals(cookie.getName())) { - getWebClient().getCookieManager().removeCookie(cookie); - } - } - - // Request same page again - - response = readFromServer("/servlet"); - - // Should still be authenticated - - assertDefaultAuthenticated( - response); - - // For the subsequent authentication, the mechanism should not be called again - // (the remember me interceptor takes care of this) - - assertTrue( - "Authentication mechanism should not have been called, but was", - response.contains("authentication mechanism called: false")); - - - // 7. Logout. Should not be authenticated anymore - - assertDefaultNotAuthenticated( - readFromServer("/servlet?logout=true")); - - - // 8. Request same page again, should still not be authenticated - - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml deleted file mode 100644 index 4ce035c3231..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-custom-session - war - - - app-custom-session - - - - false - - - - org.glassfish.soteria.test - common - ${project.version} - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index ddbdde0068a..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - * - * - */ -@DeclareRoles({ "foo", "bar", "kaz" }) -@WebServlet("/servlet") -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - if (request.getParameter("logout") != null) { - request.logout(); // slightly ill-defined, but only for current request - request.getSession().invalidate(); - } - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - - String mechanismCalled = (String) request.getAttribute("authentication-mechanism-called"); - - response.getWriter().write("\nauthentication mechanism called: " + (mechanismCalled != null? mechanismCalled : false) + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index 227ae4afb2c..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.authentication.mechanism.http.AutoApplySession; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.credential.Password; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; - -@RequestScoped -@AutoApplySession -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - request.setAttribute("authentication-mechanism-called", "true"); - - if (request.getParameter("name") != null && request.getParameter("password") != null) { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - Password password = new Password(request.getParameter("password")); - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - // Communicate the details of the authenticated user to the - // container. In many cases the underlying handler will just store the details - // and the container will actually handle the login after we return from - // this method. - return httpMessageContext.notifyContainerAboutLogin( - result.getCallerPrincipal(), result.getCallerGroups()); - } else { - return httpMessageContext.responseUnauthorized(); - } - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java deleted file mode 100644 index 403af166e0e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; -import static javax.security.enterprise.identitystore.CredentialValidationResult.NOT_VALIDATED_RESULT; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.credential.Credential; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; - -@RequestScoped -public class TestIdentityStore implements IdentityStore { - - @Override - public CredentialValidationResult validate(Credential credential) { - if (credential instanceof UsernamePasswordCredential) { - return validate((UsernamePasswordCredential) credential); - } - - return NOT_VALIDATED_RESULT; - } - - public CredentialValidationResult validate(UsernamePasswordCredential usernamePasswordCredential) { - - if (usernamePasswordCredential.compareTo("reza", "secret1")) { - return new CredentialValidationResult("reza", new HashSet<>(asList("foo", "bar"))); - } - - return INVALID_RESULT; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 11d0ee6b8f8..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - foo - foo - - - - bar - bar - - - - kaz - kaz - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/test/java/org/glassfish/soteria/test/AppCustomSessionIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/test/java/org/glassfish/soteria/test/AppCustomSessionIT.java deleted file mode 100644 index 67c26bc8a5d..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/test/java/org/glassfish/soteria/test/AppCustomSessionIT.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.assertDefaultAuthenticated; -import static org.glassfish.soteria.test.Assert.assertDefaultNotAuthenticated; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; - -import org.glassfish.soteria.test.ArquillianBase; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -@RunWith(Arquillian.class) -public class AppCustomSessionIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppCustomSession"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticated() { - assertDefaultAuthenticated( - readFromServer("/servlet?name=reza&password=secret1")); - } - - @Test - public void testNotAuthenticated() { - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - } - - @Test - public void testNotAuthenticatedWrongName() { - assertDefaultNotAuthenticated( - readFromServer("/servlet?name=romo&password=secret1")); - } - - @Test - public void testNotAuthenticatedWrongPassword() { - assertDefaultNotAuthenticated( - readFromServer("/servlet?name=reza&password=wrongpassword")); - } - - @Test - public void testAuthenticatedSession() { - - // 1. Initially request page when we're not authenticated - - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - - - // 2. Authenticate - - String response = readFromServer("/servlet?name=reza&password=secret1"); - - assertDefaultAuthenticated( - response); - - // For the initial authentication, the mechanism should be called - - assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: true")); - - - // 3. Request same page again within same http session, should still - // be authenticated - - response = readFromServer("/servlet"); - - assertDefaultAuthenticated( - response); - - // For the subsequent authentication, the mechanism should NOT be called - // (the session interceptor takes care of authentication now) - - assertTrue( - "Authentication mechanism should have been called, but wasn't", - response.contains("authentication mechanism called: false")); - - - // 4. Logout. Should not be authenticated anymore - - assertDefaultNotAuthenticated( - readFromServer("/servlet?logout=true")); - - - // 5. Request same page again, should still not be authenticated - - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml deleted file mode 100644 index d85a476a2eb..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-custom - war - - - app-custom - - - - false - - - - org.glassfish.soteria.test - common - ${project.version} - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java deleted file mode 100644 index 106324bb785..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.inject.Inject; -import javax.security.enterprise.SecurityContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.HttpConstraint; -import jakarta.servlet.annotation.ServletSecurity; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - * - * - */ -@WebServlet("/protectedServlet") -@ServletSecurity(@HttpConstraint(rolesAllowed = "foo")) -public class ProtectedServlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - private SecurityContext securityContext; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - - String contextName = null; - if (securityContext.getCallerPrincipal() != null) { - contextName = securityContext.getCallerPrincipal().getName(); - } - - response.getWriter().write("context username: " + contextName + "\n"); - - response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n"); - response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n"); - response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n"); - - response.getWriter().write("has access " + securityContext.hasAccessToWebResource("/servlets")); - - - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index 51a17e93a1f..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.inject.Inject; -import javax.security.enterprise.SecurityContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import org.glassfish.soteria.SecurityContextImpl; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - * - * - */ -@DeclareRoles({ "foo", "bar", "kaz" }) -@WebServlet("/servlet") -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - private SecurityContext securityContext; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - - String contextName = null; - if (securityContext.getCallerPrincipal() != null) { - contextName = securityContext.getCallerPrincipal().getName(); - } - - response.getWriter().write("context username: " + contextName + "\n"); - - response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n"); - response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n"); - response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n"); - - response.getWriter().write("has access " + securityContext.hasAccessToWebResource("/protectedServlet") + "\n"); - - response.getWriter().write("All declared roles of user " + ((SecurityContextImpl)securityContext).getAllDeclaredCallerRoles() + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index 9efb76c82c2..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.AuthenticationException; -import jakarta.security.auth.message.AuthException; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - String password = request.getParameter("password"); - - if (name != null && password != null) { - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - // Communicate the details of the authenticated user to the - // container. In many cases the underlying handler will just store the details - // and the container will actually handle the login after we return from - // this method. - return httpMessageContext.notifyContainerAboutLogin( - result.getCallerPrincipal(), result.getCallerGroups()); - } else { - return httpMessageContext.responseUnauthorized(); - } - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java deleted file mode 100644 index c4556df1eb1..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; -import javax.security.enterprise.credential.UsernamePasswordCredential; - -@RequestScoped -public class TestIdentityStore implements IdentityStore { - - public CredentialValidationResult validate(UsernamePasswordCredential usernamePasswordCredential) { - - if (usernamePasswordCredential.compareTo("reza", "secret1")) { - return new CredentialValidationResult("reza", new HashSet<>(asList("foo", "bar"))); - } - - return INVALID_RESULT; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 48a35fa4223..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - User pages - /protectedServlet - - - foo - - - - - - foo - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/test/java/org/glassfish/soteria/test/AppCustomIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/test/java/org/glassfish/soteria/test/AppCustomIT.java deleted file mode 100644 index 2a89b809681..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/test/java/org/glassfish/soteria/test/AppCustomIT.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.*; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; - -import org.glassfish.soteria.test.ArquillianBase; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -@RunWith(Arquillian.class) -public class AppCustomIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppCustom"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticated() { - assertDefaultAuthenticated( - responseFromServer("/servlet?name=reza&password=secret1")); - } - - @Test - public void testNotAuthenticated() { - assertDefaultNotAuthenticatedUnprotected( - responseFromServer("/servlet")); - } - - @Test - public void testNotAuthenticatedWrongName() { - assertDefaultNotAuthenticated( - responseFromServer("/servlet?name=romo&password=secret1")); - } - - @Test - public void testNotAuthenticatedWrongPassword() { - assertDefaultNotAuthenticated( - responseFromServer("/servlet?name=reza&password=wrongpassword")); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml deleted file mode 100644 index f10e03b1db8..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-db - war - - - app-db - - - - false - - - - - org.glassfish.soteria.test - common - 6.2.6-SNAPSHOT - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java deleted file mode 100644 index 0083211d7db..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Named; -import javax.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; - -@DatabaseIdentityStoreDefinition( - dataSourceLookup="${'jdbc/__default'}", - callerQuery="#{'select password from caller where name = ?'}", - groupsQuery="select group_name from caller_groups where caller_name = ?", - hashAlgorithm = PlaintextPasswordHash.class, - hashAlgorithmParameters = { - "foo=bar", - "kax=zak", - "foox=${'iop'}", - "${applicationConfig.dyna}" - - } // just for test / example -) -@ApplicationScoped -@Named -public class ApplicationConfig { - - public String[] getDyna() { - return new String[] {"dyn=1","dyna=2","dynam=3"}; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java deleted file mode 100644 index 0d4d1c36291..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; -import jakarta.annotation.Resource; -import jakarta.annotation.sql.DataSourceDefinition; -import jakarta.ejb.Singleton; -import jakarta.ejb.Startup; -import javax.sql.DataSource; - -@Singleton -@Startup -public class DatabaseSetup { - - @Resource(lookup="java:comp/DefaultDataSource") - private DataSource dataSource; - - @PostConstruct - public void init() { - - executeUpdate(dataSource, "CREATE TABLE caller(name VARCHAR(64) PRIMARY KEY, password VARCHAR(64))"); - executeUpdate(dataSource, "CREATE TABLE caller_groups(caller_name VARCHAR(64), group_name VARCHAR(64))"); - - executeUpdate(dataSource, "INSERT INTO caller VALUES('reza', 'secret1')"); - executeUpdate(dataSource, "INSERT INTO caller VALUES('alex', 'secret2')"); - executeUpdate(dataSource, "INSERT INTO caller VALUES('arjan', 'secret2')"); - executeUpdate(dataSource, "INSERT INTO caller VALUES('werner', 'secret2')"); - - executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('reza', 'foo')"); - executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('reza', 'bar')"); - - executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('alex', 'foo')"); - executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('alex', 'bar')"); - - executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('arjan', 'foo')"); - executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('werner', 'foo')"); - } - - @PreDestroy - public void destroy() { - try { - executeUpdate(dataSource, "DROP TABLE caller"); - executeUpdate(dataSource, "DROP TABLE caller_groups"); - } catch (Exception e) { - // silently ignore, concerns in-memory database - } - } - - private void executeUpdate(DataSource dataSource, String query) { - try (Connection connection = dataSource.getConnection()) { - try (PreparedStatement statement = connection.prepareStatement(query)) { - statement.executeUpdate(); - } - } catch (SQLException e) { - throw new IllegalStateException(e); - } - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/PlaintextPasswordHash.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/PlaintextPasswordHash.java deleted file mode 100644 index aa26df2dd1a..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/PlaintextPasswordHash.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; -import java.util.Map; - -import jakarta.enterprise.context.Dependent; -import javax.security.enterprise.identitystore.PasswordHash; - -@Dependent -public class PlaintextPasswordHash implements PasswordHash { - - @Override - public void initialize(Map parameters) { - - } - - @Override - public String generate(char[] password) { - return new String(password); - } - - @Override - public boolean verify(char[] password, String hashedPassword) { - //don't bother with constant time comparison; more portable - //this way, and algorithm will be used only for testing. - return (password != null && password.length > 0 && - hashedPassword != null && hashedPassword.length() > 0 && - hashedPassword.equals(new String(password))); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index e23a1f8960b..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - * - * - */ -@DeclareRoles({ "foo", "bar", "kaz" }) -@WebServlet("/servlet") -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index 45b2208f2c6..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.credential.Password; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; - -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - if (request.getParameter("name") != null && request.getParameter("password") != null) { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - Password password = new Password(request.getParameter("password")); - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - // Communicate the details of the authenticated user to the - // container. In many cases the underlying handler will just store the details - // and the container will actually handle the login after we return from - // this method. - return httpMessageContext.notifyContainerAboutLogin( - result.getCallerPrincipal(), result.getCallerGroups()); - } else { - return httpMessageContext.responseUnauthorized(); - } - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 11d0ee6b8f8..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - foo - foo - - - - bar - bar - - - - kaz - kaz - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/test/java/org/glassfish/soteria/test/AppDBIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/test/java/org/glassfish/soteria/test/AppDBIT.java deleted file mode 100644 index 9bf6a227755..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/test/java/org/glassfish/soteria/test/AppDBIT.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.lang.System.getProperty; -import static org.glassfish.soteria.test.Assert.assertDefaultAuthenticated; -import static org.glassfish.soteria.test.Assert.assertDefaultNotAuthenticated; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; -import static org.junit.Assume.assumeFalse; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - - -@RunWith(Arquillian.class) -public class AppDBIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppDB"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticated() { - assertDefaultAuthenticated( - readFromServer("/servlet?name=reza&password=secret1")); - } - - @Test - public void testNotAuthenticated() { - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - } - - @Test - public void testNotAuthenticatedWrongName() { - assertDefaultNotAuthenticated( - readFromServer("/servlet?name=romo&password=secret1")); - } - - @Test - public void testNotAuthenticatedWrongPassword() { - assertDefaultNotAuthenticated( - readFromServer("/servlet?name=reza&password=wrongpassword")); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml deleted file mode 100644 index 6f49151f7d8..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-double-ham - war - - - app-double-ham - - - - false - - - - - org.glassfish.soteria.test - common - 6.2.6-SNAPSHOT - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java deleted file mode 100644 index a4bdcdd75e9..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.inject.Inject; -import javax.security.enterprise.SecurityContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.HttpConstraint; -import jakarta.servlet.annotation.ServletSecurity; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import javax.security.enterprise.authentication.mechanism.http.BasicAuthenticationMechanismDefinition; - - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - * - * - */ - -@BasicAuthenticationMechanismDefinition( - realmName="test realm" -) -@WebServlet("/protectedServlet") -@ServletSecurity(@HttpConstraint(rolesAllowed = "foo")) -public class ProtectedServlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - private SecurityContext securityContext; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - - String contextName = null; - if (securityContext.getCallerPrincipal() != null) { - contextName = securityContext.getCallerPrincipal().getName(); - } - - response.getWriter().write("context username: " + contextName + "\n"); - - response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n"); - response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n"); - response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n"); - - response.getWriter().write("has access " + securityContext.hasAccessToWebResource("/servlets")); - - - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index d36ea39f3f8..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.inject.Inject; -import javax.security.enterprise.SecurityContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import javax.security.enterprise.authentication.mechanism.http.BasicAuthenticationMechanismDefinition; -import org.glassfish.soteria.SecurityContextImpl; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - * - * - */ -@BasicAuthenticationMechanismDefinition( - realmName="test realm" -) -@DeclareRoles({ "foo", "bar", "kaz" }) -@WebServlet("/servlet") -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - private SecurityContext securityContext; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - - String contextName = null; - if (securityContext.getCallerPrincipal() != null) { - contextName = securityContext.getCallerPrincipal().getName(); - } - - response.getWriter().write("context username: " + contextName + "\n"); - - response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n"); - response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n"); - response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n"); - - response.getWriter().write("has access " + securityContext.hasAccessToWebResource("/protectedServlet") + "\n"); - - response.getWriter().write("All declared roles of user " + ((SecurityContextImpl)securityContext).getAllDeclaredCallerRoles() + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index f83eabcf87d..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - String password = request.getParameter("password"); - - if (name != null && password != null) { - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - // Communicate the details of the authenticated user to the - // container. In many cases the underlying handler will just store the details - // and the container will actually handle the login after we return from - // this method. - return httpMessageContext.notifyContainerAboutLogin( - result.getCallerPrincipal(), result.getCallerGroups()); - } else { - return httpMessageContext.responseUnauthorized(); - } - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java deleted file mode 100644 index c4556df1eb1..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; -import javax.security.enterprise.credential.UsernamePasswordCredential; - -@RequestScoped -public class TestIdentityStore implements IdentityStore { - - public CredentialValidationResult validate(UsernamePasswordCredential usernamePasswordCredential) { - - if (usernamePasswordCredential.compareTo("reza", "secret1")) { - return new CredentialValidationResult("reza", new HashSet<>(asList("foo", "bar"))); - } - - return INVALID_RESULT; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 48a35fa4223..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - User pages - /protectedServlet - - - foo - - - - - - foo - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/test/java/org/glassfish/soteria/test/AppDoubleHAMIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/test/java/org/glassfish/soteria/test/AppDoubleHAMIT.java deleted file mode 100644 index 1b5eb6ee31b..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/test/java/org/glassfish/soteria/test/AppDoubleHAMIT.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.*; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; - -import org.glassfish.soteria.test.ArquillianBase; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -@RunWith(Arquillian.class) -public class AppDoubleHAMIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppDoubleHam"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testBasicHAM() { - - DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider(); - credentialsProvider.addCredentials("reza", "secret1"); - - getWebClient().setCredentialsProvider(credentialsProvider); - - assertNotAuthenticatedError( - responseFromServer("/servlet")); - } - - @Test - public void testCustomHam() { - assertNotAuthenticatedError( - responseFromServer("/servlet?name=reza&password=secret1")); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml deleted file mode 100644 index a34428947eb..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-ham-ordering - war - - - app-ham-ordering - - - - false - - - - - org.glassfish.soteria.test - common - 6.2.6-SNAPSHOT - test - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index f9e5be71c95..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.inject.Inject; -import javax.security.enterprise.SecurityContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import org.glassfish.soteria.SecurityContextImpl; -import java.util.stream.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Arrays; -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - * - * - */ -@DeclareRoles({ "foo", "bar", "kaz" }) -@WebServlet("/servlet") -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - private SecurityContext securityContext; - - private void tagHttpRequest(HttpServletRequest request,String methodName){ - - if(request.getAttribute("methodInvList") == null){ - List invList= new ArrayList<>(); - invList.add(methodName); - request.setAttribute("methodInvList", invList.stream().collect(Collectors.joining(","))); - }else{ - String invListStr = (String)request.getAttribute("methodInvList"); - List invList = new ArrayList(Arrays.asList(invListStr.split(","))); - invList.add(methodName); - request.setAttribute("methodInvList", invList.stream().collect(Collectors.joining(","))); - } - } - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - - tagHttpRequest(request,"doGet"); - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - - String contextName = null; - if (securityContext.getCallerPrincipal() != null) { - contextName = securityContext.getCallerPrincipal().getName(); - } - - response.getWriter().write("context username: " + contextName + "\n"); - - - response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n"); - response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n"); - response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n"); - - response.getWriter().write("has access " + securityContext.hasAccessToWebResource("/protectedServlet") + "\n"); - - response.getWriter().write("All declared roles of user " + ((SecurityContextImpl)securityContext).getAllDeclaredCallerRoles() + "\n"); - String invListStr = (String)request.getAttribute("methodInvList"); - response.getWriter().write("OrderingList: " + invListStr); - boolean doLogout = Boolean.parseBoolean(request.getParameter("doLogout")); - if(doLogout) - request.logout(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index bd4c1384feb..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; -import java.io.IOException; -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import java.util.stream.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Arrays; -import static javax.security.enterprise.AuthenticationStatus.*; - -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - String password = request.getParameter("password"); - tagHttpRequest(request,"validateRequest"); - if (name != null && password != null) { - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - // Communicate the details of the authenticated user to the - // container. In many cases the underlying handler will just store the details - // and the container will actually handle the login after we return from - // this method. - return httpMessageContext.notifyContainerAboutLogin( - result.getCallerPrincipal(), result.getCallerGroups()); - } else { - return httpMessageContext.responseUnauthorized(); - } - } - - return httpMessageContext.doNothing(); - } - - @Override - public AuthenticationStatus secureResponse(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - try { - response.getWriter().write(",secureResponse"); - }catch (IOException e){ - e.printStackTrace(); - } - tagHttpRequest(request,"secureResponse"); - return SUCCESS; - } - - @Override - public void cleanSubject(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) { - try { - response.getWriter().write(",cleanSubject"); - }catch (IOException e){ - e.printStackTrace(); - } - tagHttpRequest(request,"cleanSubject"); - } - - private void tagHttpRequest(HttpServletRequest request,String methodName){ - - if(request.getAttribute("methodInvList") == null){ - List invList= new ArrayList<>(); - invList.add(methodName); - request.setAttribute("methodInvList", invList.stream().collect(Collectors.joining(","))); - }else{ - String invListStr = (String)request.getAttribute("methodInvList"); - List invList = new ArrayList(Arrays.asList(invListStr.split(","))); - invList.add(methodName); - request.setAttribute("methodInvList", invList.stream().collect(Collectors.joining(","))); - } - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java deleted file mode 100644 index c4556df1eb1..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; -import javax.security.enterprise.credential.UsernamePasswordCredential; - -@RequestScoped -public class TestIdentityStore implements IdentityStore { - - public CredentialValidationResult validate(UsernamePasswordCredential usernamePasswordCredential) { - - if (usernamePasswordCredential.compareTo("reza", "secret1")) { - return new CredentialValidationResult("reza", new HashSet<>(asList("foo", "bar"))); - } - - return INVALID_RESULT; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 48a35fa4223..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - User pages - /protectedServlet - - - foo - - - - - - foo - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/test/java/org/glassfish/soteria/test/AppHAMOrderingIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/test/java/org/glassfish/soteria/test/AppHAMOrderingIT.java deleted file mode 100644 index caac72d9edd..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/test/java/org/glassfish/soteria/test/AppHAMOrderingIT.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.*; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; -import org.glassfish.soteria.test.ArquillianBase; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -@RunWith(Arquillian.class) -public class AppHAMOrderingIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppHamOrdering"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticatedValidateRequestAndSecureResponse() { - WebResponse response = responseFromServer("/servlet?name=reza&password=secret1"); - assertDefaultAuthenticated(response); - assertTrue("Response did not contain correct ordering of validateRequest,secureResponse", - response.getContentAsString().contains("OrderingList: validateRequest,doGet,secureResponse")); - } - - @Test - public void testAuthenticatedcleanSubject() { - WebResponse response = responseFromServer("/servlet?name=reza&password=secret1&doLogout=True"); - assertDefaultAuthenticated(response); - assertTrue("Response did not correct ordering of validateRequest,secureResponse,cleanSubject", - response.getContentAsString().contains("OrderingList: validateRequest,doGet,cleanSubject,secureResponse")); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml deleted file mode 100644 index 0245a9faeeb..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-mem-basic - war - - - app-mem-basic - - - - false - - - - - org.glassfish.soteria.test - common - 6.2.6-SNAPSHOT - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/java/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/java/test/Servlet.java deleted file mode 100644 index 47623289df3..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/java/test/Servlet.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import javax.security.enterprise.authentication.mechanism.http.BasicAuthenticationMechanismDefinition; -import org.glassfish.soteria.identitystores.annotation.Credentials; -import org.glassfish.soteria.identitystores.annotation.EmbeddedIdentityStoreDefinition; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.HttpConstraint; -import jakarta.servlet.annotation.ServletSecurity; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - */ -@BasicAuthenticationMechanismDefinition( - realmName="test realm" -) - -@EmbeddedIdentityStoreDefinition({ - @Credentials(callerName = "reza", password = "secret1", groups = { "foo", "bar" }), - @Credentials(callerName = "alex", password = "secret2", groups = { "foo", "kaz" }), - @Credentials(callerName = "arjan", password = "secret3", groups = { "foo" }) } -) - -@WebServlet("/servlet") -@DeclareRoles({ "foo", "bar", "kaz" }) -@ServletSecurity(@HttpConstraint(rolesAllowed = "foo")) -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java deleted file mode 100644 index d68bb405013..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.assertDefaultAuthenticated; -import static org.glassfish.soteria.test.Assert.assertDefaultNotAuthenticated; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -@RunWith(Arquillian.class) -public class AppMemBasicIT extends ArquillianBase { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppMemBasic"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticated() { - - DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider(); - credentialsProvider.addCredentials("reza", "secret1"); - - getWebClient().setCredentialsProvider(credentialsProvider); - - assertDefaultAuthenticated( - readFromServer("/servlet")); - } - - @Test - public void testNotAuthenticated() { - - WebResponse response = responseFromServer("/servlet"); - - assertEquals(401, response.getStatusCode()); - - assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); - - assertDefaultNotAuthenticated( - response.getContentAsString()); - } - - @Test - public void testNotAuthenticatedWrongName() { - - DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider(); - credentialsProvider.addCredentials("romo", "secret1"); - - getWebClient().setCredentialsProvider(credentialsProvider); - - WebResponse response = responseFromServer("/servlet"); - - assertEquals(401, response.getStatusCode()); - - assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); - - assertDefaultNotAuthenticated( - response.getContentAsString()); - } - - @Test - public void testNotAuthenticatedWrongPassword() { - - DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider(); - credentialsProvider.addCredentials("reza", "wrongpassword"); - - getWebClient().setCredentialsProvider(credentialsProvider); - - WebResponse response = responseFromServer("/servlet"); - - assertEquals(401, response.getStatusCode()); - - assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); - - assertDefaultNotAuthenticated( - response.getContentAsString()); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml deleted file mode 100644 index 35321b78d15..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-mem-form - war - - - app-mem-form - - - - false - - - - - org.glassfish.soteria.test - common - 6.2.6-SNAPSHOT - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java deleted file mode 100644 index aa66ff80416..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Named; - - -@ApplicationScoped -@Named("appConfig") -public class ApplicationConfig { - public String getLoginPage(){ - return login_page; - } - private String login_page = "/login-servlet"; - private String error_page = "/login-error-servlet"; - - public String getErrorPage() { - return error_page; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginErrorServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginErrorServlet.java deleted file mode 100644 index f7da2df5d6a..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginErrorServlet.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Servlet that is invoked when the caller did not authenticate correctly - * - * - */ -@WebServlet({"/login-error-servlet"}) -public class LoginErrorServlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - response.getWriter().write( - // Just as example for the mechanism, not likely to be used - // in practice like this - " Login failed! \n" + - "Try again" + - ""); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginServlet.java deleted file mode 100644 index c703d921908..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginServlet.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Servlet that is invoked when it's determined that the caller needs to authenticate/login. - * - */ -@WebServlet({"/login-servlet"}) -public class LoginServlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - response.getWriter().write( - " Login to continue \n" + - "
" + - "

Username " + - "" + - - "

Password " + - "" + - "

" + - "" + - "

" + - ""); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index 88ea4f0ff90..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.HttpConstraint; -import jakarta.servlet.annotation.ServletSecurity; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import javax.security.enterprise.authentication.mechanism.http.*; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - */ - -@FormAuthenticationMechanismDefinition( - loginToContinue = @LoginToContinue( - loginPage="${appConfig.getLoginPage()}", - errorPage="#{appConfig.getErrorPage()}" - ) -) -@WebServlet("/servlet") -@DeclareRoles({ "foo", "bar", "kaz" }) -@ServletSecurity(@HttpConstraint(rolesAllowed = "foo")) -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write( - " This is a servlet

\n" + - - "web username: " + webName + "

\n" + - - "web user has role \"foo\": " + request.isUserInRole("foo") + "
\n" + - "web user has role \"bar\": " + request.isUserInRole("bar") + "
\n" + - "web user has role \"kaz\": " + request.isUserInRole("kaz") + "

\n" + - - - "
" + - "" + - "" + - "
" + - ""); - } - - @Override - public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - if ("true".equals(request.getParameter("logout"))) { - request.logout(); - request.getSession().invalidate(); - } - - doGet(request, response); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java deleted file mode 100644 index 1ac02f9071c..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; - -import java.util.HashSet; - -import jakarta.enterprise.context.ApplicationScoped; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; - -@ApplicationScoped -public class TestIdentityStore implements IdentityStore { - - public CredentialValidationResult validate(UsernamePasswordCredential usernamePasswordCredential) { - - if (usernamePasswordCredential.compareTo("reza", "secret1")) { - return new CredentialValidationResult("reza", new HashSet<>(asList("foo", "bar"))); - } - - return INVALID_RESULT; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/test/java/org/glassfish/soteria/test/AppMemFormIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/test/java/org/glassfish/soteria/test/AppMemFormIT.java deleted file mode 100644 index 1ac3a8053ba..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/test/java/org/glassfish/soteria/test/AppMemFormIT.java +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.assertDefaultAuthenticated; -import static org.glassfish.soteria.test.Assert.assertDefaultNotAuthenticated; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; - - -@RunWith(Arquillian.class) -public class AppMemFormIT extends ArquillianBase { - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticated() throws IOException { - - - // 1. Initially request protected page when we're not authenticated - - HtmlPage loginPage = pageFromServer("/servlet"); - - - // 2. Server should forward to login page - - assertTrue( - "The login page should have been displayed, but was not", - loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); - - - // 3. Submit the form on the login page with the correct credentials - - HtmlForm form = loginPage.getForms().get(0); - - form.getInputByName("j_username") - .setValueAttribute("reza"); - - form.getInputByName("j_password") - .setValueAttribute("secret1"); - - HtmlPage page = form.getInputByValue("Submit") - .click(); - - // Has to be authenticted now - assertDefaultAuthenticated( - page.getWebResponse() - .getContentAsString()); - - - // 4. Request page again. FORM is stateful (http session bound) so - // still has to be authenticated. - - page = pageFromServer("/servlet"); - - System.out.println("+++++++++++STEP 4 +++++++++++++ (before assertDefaultAuthenticated) \n\n\n\n" + page.getWebResponse() - .getContentAsString()); - - assertDefaultAuthenticated( - page.getWebResponse() - .getContentAsString()); - - - // 5. Logout - - System.out.println("*** STEP 5 ***** (before get logout) " + page.asXml()); - - page = page.getForms() - .get(0) - .getInputByValue("Logout") - .click(); - - // Has to be logged out now (page will still be rendered, but with - // web username null and no roles. - - assertDefaultNotAuthenticated( - page.getWebResponse() - .getContentAsString()); - - - - // 6. Request page again. Should still be logged out - // (and will display login to continue again now) - - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - - } - - @Test - public void testNotAuthenticatedWrongName() throws IOException { - - // 1. Initially request protected page when we're not authenticated - - HtmlPage loginPage = pageFromServer("/servlet"); - - - // 2. Server should forward to login page - - assertTrue( - "The login page should have been displayed, but was not", - loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); - - - // 3. Submit the form on the login page with the correct credentials - - HtmlForm form = loginPage.getForms().get(0); - - form.getInputByName("j_username") - .setValueAttribute("romo"); - - form.getInputByName("j_password") - .setValueAttribute("secret1"); - - HtmlPage page = form.getInputByValue("Submit") - .click(); - - assertTrue( - "The error page should have been displayed, but was not", - page.getWebResponse().getContentAsString().contains("Login failed!") - ); - - // Should not be authenticted now - assertDefaultNotAuthenticated( - page.getWebResponse() - .getContentAsString()); - - } - - @Test - public void testNotAuthenticatedWrongPassword() throws IOException { - - // 1. Initially request protected page when we're not authenticated - - HtmlPage loginPage = pageFromServer("/servlet"); - - - // 2. Server should forward to login page - - assertTrue( - "The login page should have been displayed, but was not", - loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); - - - // 3. Submit the form on the login page with the *wrong* credentials - - HtmlForm form = loginPage.getForms().get(0); - - form.getInputByName("j_username") - .setValueAttribute("reza"); - - form.getInputByName("j_password") - .setValueAttribute("wrongpassword"); - - HtmlPage page = form.getInputByValue("Submit") - .click(); - - assertTrue( - "The error page should have been displayed, but was not", - page.getWebResponse().getContentAsString().contains("Login failed!") - ); - - // Should not be authenticted now - assertDefaultNotAuthenticated( - page.getWebResponse() - .getContentAsString()); - - } - - @Test - public void testNotAuthenticatedInitiallyWrongNameThenCorrect() throws IOException { - - // 1. Initially request protected page when we're not authenticated - - HtmlPage loginPage = pageFromServer("/servlet"); - - - // 2. Server should forward to login page - - assertTrue( - "The login page should have been displayed, but was not", - loginPage.getWebResponse().getContentAsString().contains("Login to continue") - ); - - - // 3. Submit the form on the login page with the correct credentials - - HtmlForm form = loginPage.getForms().get(0); - - form.getInputByName("j_username") - .setValueAttribute("romo"); - - form.getInputByName("j_password") - .setValueAttribute("secret1"); - - HtmlPage errorPage = form.getInputByValue("Submit") - .click(); - - // Should not be authenticted now - assertDefaultNotAuthenticated( - errorPage.getWebResponse() - .getContentAsString()); - - - // 4. Request login page directly, and now submit with the correct credentials - // (note that the initial target URL of /servlet should still be remembered) - - loginPage = pageFromServer("/login-servlet"); - - form = loginPage.getForms().get(0); - - form.getInputByName("j_username") - .setValueAttribute("reza"); - - form.getInputByName("j_password") - .setValueAttribute("secret1"); - - HtmlPage page = form.getInputByValue("Submit") - .click(); - - // Has to be authenticted now - assertDefaultAuthenticated( - page.getWebResponse() - .getContentAsString()); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml deleted file mode 100644 index 4e77b7b7aef..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-multiple-store-backup - war - - - app-multiple-store-backup - - - - false - - - - - org.glassfish.soteria.test - common - 6.2.6-SNAPSHOT - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index 407a705f3ba..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - */ -@DeclareRoles({ "foo", "bar", "kaz" }) -@WebServlet("/servlet") -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index ce6f3247b52..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; -import static org.glassfish.soteria.Utils.notNull; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.credential.Password; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - if (notNull(request.getParameter("name"), request.getParameter("password"))) { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - Password password = new Password(request.getParameter("password")); - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - // Communicate the details of the authenticated user to the - // container. In many cases the underlying handler will just store the details - // and the container will actually handle the login after we return from - // this method. - return httpMessageContext.notifyContainerAboutLogin( - result.getCallerPrincipal(), result.getCallerGroups()); - } - - return httpMessageContext.responseUnauthorized(); - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestBackupIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestBackupIdentityStore.java deleted file mode 100644 index a468058d64b..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestBackupIdentityStore.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; -import static javax.security.enterprise.identitystore.CredentialValidationResult.NOT_VALIDATED_RESULT; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.credential.Credential; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; - -@RequestScoped -public class TestBackupIdentityStore implements IdentityStore { - - @Override - public CredentialValidationResult validate(Credential credential) { - if (credential instanceof UsernamePasswordCredential) { - return validate((UsernamePasswordCredential) credential); - } - - return NOT_VALIDATED_RESULT; - } - - public CredentialValidationResult validate(UsernamePasswordCredential usernamePasswordCredential) { - - if (usernamePasswordCredential.getCaller().equals("reza") && - usernamePasswordCredential.getPassword().compareTo("secret2")) { - - return new CredentialValidationResult("reza", new HashSet<>(asList("foo", "bar"))); - } - - if (usernamePasswordCredential.getCaller().equals("alex") && - usernamePasswordCredential.getPassword().compareTo("verysecret")) { - - return new CredentialValidationResult("alex", new HashSet<>(asList("foo", "bar"))); - } - - return INVALID_RESULT; - } - - public int priority() { - return 20; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java deleted file mode 100644 index 2cbf9b20bb6..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; -import static javax.security.enterprise.identitystore.CredentialValidationResult.NOT_VALIDATED_RESULT; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.credential.Credential; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; - -@RequestScoped -public class TestIdentityStore implements IdentityStore { - - @Override - public CredentialValidationResult validate(Credential credential) { - if (credential instanceof UsernamePasswordCredential) { - return validate((UsernamePasswordCredential) credential); - } - - return NOT_VALIDATED_RESULT; - } - - public CredentialValidationResult validate(UsernamePasswordCredential usernamePasswordCredential) { - - if (usernamePasswordCredential.getCaller().equals("reza") && - usernamePasswordCredential.getPassword().compareTo("secret1")) { - - return new CredentialValidationResult("reza", new HashSet<>(asList("foo", "bar"))); - } - - return INVALID_RESULT; - } - - public int priority() { - return 10; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 11d0ee6b8f8..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - foo - foo - - - - bar - bar - - - - kaz - kaz - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/test/java/org/glassfish/soteria/test/AppMultipleStoreBackupIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/test/java/org/glassfish/soteria/test/AppMultipleStoreBackupIT.java deleted file mode 100644 index 46b0ecfccc1..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/test/java/org/glassfish/soteria/test/AppMultipleStoreBackupIT.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.assertDefaultAuthenticated; -import static org.glassfish.soteria.test.Assert.assertDefaultNotAuthenticated; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -@RunWith(Arquillian.class) -public class AppMultipleStoreBackupIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppMultipleStoreBackup"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticated() { - assertDefaultAuthenticated( - readFromServer("/servlet?name=reza&password=secret1")); - } - - @Test - public void testAuthenticatedBackupPassword() { - // This will first try the initial store which will fail, then - // tries the second store, which should succeeded. The user - // is present in both stores but with different passwords. - assertDefaultAuthenticated( - readFromServer("/servlet?name=reza&password=secret2")); - } - - @Test - public void testAuthenticatedBackupUser() { - // This will first try the initial store which will fail, then - // tries the second store, which should succeeded. The user - // is only present in the second store. - Assert.assertAuthenticated( - "web", "alex", - readFromServer("/servlet?name=alex&password=verysecret")); - } - - @Test - public void testNotAuthenticated() { - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - } - - @Test - public void testNotAuthenticatedWrongName() { - assertDefaultNotAuthenticated( - readFromServer("/servlet?name=romo&password=secret1")); - } - - @Test - public void testNotAuthenticatedWrongPassword() { - assertDefaultNotAuthenticated( - readFromServer("/servlet?name=reza&password=wrongpassword")); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml deleted file mode 100644 index d99d57a6da8..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-multiple-store - war - - - app-multiple-store - - - - false - - - - - org.glassfish.soteria.test - common - 6.2.6-SNAPSHOT - test - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java deleted file mode 100644 index a434ae8d18b..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; -import static javax.security.enterprise.identitystore.CredentialValidationResult.NOT_VALIDATED_RESULT; -import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.VALIDATE; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import jakarta.annotation.PostConstruct; -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.credential.Credential; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; - -/** - * - */ -@RequestScoped -public class AuthenticationIdentityStore implements IdentityStore { - - private Map callerToPassword; - - @PostConstruct - public void init() { - callerToPassword = new HashMap<>(); - callerToPassword.put("reza", "secret1"); - callerToPassword.put("alex", "secret2"); - callerToPassword.put("arjan", "secret3"); - } - - @Override - public CredentialValidationResult validate(Credential credential) { - CredentialValidationResult result; - - if (credential instanceof UsernamePasswordCredential) { - UsernamePasswordCredential usernamePassword = (UsernamePasswordCredential) credential; - String expectedPW = callerToPassword.get(usernamePassword.getCaller()); - // We don't allow empty passwords :) - if (expectedPW != null && expectedPW.equals(usernamePassword.getPasswordAsString())) { - result = new CredentialValidationResult(usernamePassword.getCaller()); - } else { - result = INVALID_RESULT; - } - } else { - result = NOT_VALIDATED_RESULT; - } - - return result; - } - - @Override - public Set validationTypes() { - return new HashSet<>(asList(VALIDATE)); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthorizationIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthorizationIdentityStore.java deleted file mode 100644 index 3a518dfd8de..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthorizationIdentityStore.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.PROVIDE_GROUPS; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import jakarta.annotation.PostConstruct; -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; - -/** - * - */ -@RequestScoped -public class AuthorizationIdentityStore implements IdentityStore { - - private Map> authorization; - - @PostConstruct - public void init() { - authorization = new HashMap<>(); - - authorization.put("reza", new HashSet<>(asList("foo", "bar"))); - authorization.put("alex", new HashSet<>(asList("foo", "foo", "kaz"))); - authorization.put("arjan", new HashSet<>(asList("foo", "foo"))); - - } - - @Override - public Set getCallerGroups(CredentialValidationResult validationResult) { - return authorization.get(validationResult.getCallerPrincipal().getName()); - } - - @Override - public Set validationTypes() { - return new HashSet<>(asList(PROVIDE_GROUPS)); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index 407a705f3ba..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - */ -@DeclareRoles({ "foo", "bar", "kaz" }) -@WebServlet("/servlet") -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index 4cd07367087..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; -import static org.glassfish.soteria.Utils.notNull; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.credential.Password; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - if (notNull(request.getParameter("name"), request.getParameter("password"))) { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - Password password = new Password(request.getParameter("password")); - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - // Communicate the details of the authenticated user to the - // container. In many cases the underlying handler will just store the details - // and the container will actually handle the login after we return from - // this method. - return httpMessageContext.notifyContainerAboutLogin( - result.getCallerPrincipal(), result.getCallerGroups()); - } - - return httpMessageContext.responseUnauthorized(); - - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 11d0ee6b8f8..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - foo - foo - - - - bar - bar - - - - kaz - kaz - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/test/java/org/glassfish/soteria/test/AppMultipleStoreIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/test/java/org/glassfish/soteria/test/AppMultipleStoreIT.java deleted file mode 100644 index 7cbba69e027..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/test/java/org/glassfish/soteria/test/AppMultipleStoreIT.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -import static org.glassfish.soteria.test.Assert.assertDefaultAuthenticated; -import static org.glassfish.soteria.test.Assert.assertDefaultNotAuthenticated; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; - -@RunWith(Arquillian.class) -public class AppMultipleStoreIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppMultipleStore"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticated() { - assertDefaultAuthenticated( - readFromServer("/servlet?name=reza&password=secret1")); - } - - @Test - public void testNotAuthenticated() { - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - } - - @Test - public void testNotAuthenticatedWrongName() { - assertDefaultNotAuthenticated( - readFromServer("/servlet?name=romo&password=secret1")); - } - - @Test - public void testNotAuthenticatedWrongPassword() { - assertDefaultNotAuthenticated( - readFromServer("/servlet?name=reza&password=wrongpassword")); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/README.md b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/README.md deleted file mode 100644 index fea016aafee..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/README.md +++ /dev/null @@ -1,10 +0,0 @@ - -### app-no-application-caller-principal - -**From JSR 375 Specification** - -> **1.2.2. Caller Principal Types** - -> When no specific application caller principal is supplied during authentication, the caller’s identity should be represented by a single principal, the container’s caller principal. - -In this test, no application caller principal is provided when container gets notified about login inside `TestAuthenticationMechanism`. diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml deleted file mode 100644 index abda6da8337..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-no-application-caller-principal - war - - - app-no-application-caller-principal - - - - false - - - - org.glassfish.soteria.test - common - 6.2.6-SNAPSHOT - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/AppPrincipal.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/AppPrincipal.java deleted file mode 100644 index 87355093d89..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/AppPrincipal.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.security.Principal; - -public class AppPrincipal implements Principal { - String name; - - public AppPrincipal(String name){ - this.name = name; - } - - @Override - public String getName() { - return name; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index 7e2b6631f60..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStoreHandler; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Inject - private IdentityStoreHandler identityStoreHandler; - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - // Get the (caller) name and password from the request - // NOTE: This is for the smallest possible example only. In practice - // putting the password in a request query parameter is highly - // insecure - String name = request.getParameter("name"); - String password = request.getParameter("password"); - - if (name != null && password != null) { - - // Delegate the {credentials in -> identity data out} function to - // the Identity Store - CredentialValidationResult result = identityStoreHandler.validate( - new UsernamePasswordCredential(name, password)); - - if (result.getStatus() == VALID) { - return httpMessageContext.notifyContainerAboutLogin(result); - - } else { - return httpMessageContext.responseUnauthorized(); - } - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java deleted file mode 100644 index c4556df1eb1..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; -import javax.security.enterprise.credential.UsernamePasswordCredential; - -@RequestScoped -public class TestIdentityStore implements IdentityStore { - - public CredentialValidationResult validate(UsernamePasswordCredential usernamePasswordCredential) { - - if (usernamePasswordCredential.compareTo("reza", "secret1")) { - return new CredentialValidationResult("reza", new HashSet<>(asList("foo", "bar"))); - } - - return INVALID_RESULT; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java deleted file mode 100644 index d8f65e88aea..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import java.io.IOException; - -import jakarta.inject.Inject; -import javax.security.enterprise.SecurityContext; -import javax.security.enterprise.CallerPrincipal; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.HttpConstraint; -import jakarta.servlet.annotation.ServletSecurity; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import java.security.Principal; -import java.util.Optional; -import java.util.Set; - -/** - * The Servlet which validates if for the authenticated user, both - * container and caller principals are present in the subject - * representing the caller. - */ -@WebServlet("/valildateAvailablePrincipalServlet") -@ServletSecurity(@HttpConstraint(rolesAllowed = "foo")) -public class ValidateAvailablePrincipalServlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - private SecurityContext securityContext; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - boolean isUserInRole = securityContext.isCallerInRole("foo"); - boolean hasContainerCallerPrincipal = false; - boolean hasApplicationCallerPrincipal = false; - - Principal containerCallerPrincipal = securityContext.getCallerPrincipal(); - - if (containerCallerPrincipal instanceof javax.security.enterprise.CallerPrincipal) { - hasContainerCallerPrincipal = true; - } - - Set principals = securityContext.getPrincipalsByType(java.security.Principal.class); - - Optional principalOptional = principals.stream().filter((p) -> p.getClass().getName() == CallerPrincipal.class - .getName()) - .findAny(); - if (principalOptional.isPresent()) { - Principal applicationPrincipal = principalOptional.get(); - if(applicationPrincipal.equals(containerCallerPrincipal)) { - response.getWriter().write("containerPrincipal:" + containerCallerPrincipal + "\n"); - response.getWriter().write("appPrincipal:" + applicationPrincipal + "\n"); - hasApplicationCallerPrincipal = true; - response.getWriter().write("hasApplicationCallerPrincipal:" + hasApplicationCallerPrincipal + "\n"); - } - } - if (!hasApplicationCallerPrincipal && hasContainerCallerPrincipal && isUserInRole) { - response.getWriter().write(String.format("Container caller principal and application caller principal must have " + - "been one and the same but are not for user %s in role " + - "%s", - containerCallerPrincipal.getName(), "foo")); - } else { - response.getWriter().write(String.format("Both container caller principal and application caller principals are one" + - " and the same for user %s in role %s", - containerCallerPrincipal.getName(), "foo")); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index ca37ae048ad..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - User pages - /protectedServlet - - - foo - - - - - - foo - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/test/java/org/glassfish/soteria/test/ValidateAvailablePrincipalIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/test/java/org/glassfish/soteria/test/ValidateAvailablePrincipalIT.java deleted file mode 100644 index af9cd34854f..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/test/java/org/glassfish/soteria/test/ValidateAvailablePrincipalIT.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.*; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; - -import org.glassfish.soteria.test.ArquillianBase; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -@RunWith(Arquillian.class) -public class ValidateAvailablePrincipalIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::ValidateAvailablePrincipalIT"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testCallerSubjectPrincipals() { - assertBothContainerAndApplicationPrincipalsAreSame( - responseFromServer("/valildateAvailablePrincipalServlet?name=reza&password=secret1")); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml deleted file mode 100644 index ccf1c2b502f..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - 4.0.0 - - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-no-role-mapping - war - - - app-no-role-mapping - - - - false - - - - - org.glassfish.soteria.test - common - 6.2.6-SNAPSHOT - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/java/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/java/test/Servlet.java deleted file mode 100644 index 67d381b166d..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/java/test/Servlet.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test; - -import java.io.IOException; - -import jakarta.annotation.security.DeclareRoles; -import javax.security.enterprise.authentication.mechanism.http.BasicAuthenticationMechanismDefinition; -import org.glassfish.soteria.identitystores.annotation.Credentials; -import org.glassfish.soteria.identitystores.annotation.EmbeddedIdentityStoreDefinition; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.HttpConstraint; -import jakarta.servlet.annotation.ServletSecurity; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - */ -@BasicAuthenticationMechanismDefinition( - realmName="test realm" -) - -@EmbeddedIdentityStoreDefinition({ - @Credentials(callerName = "reza", password = "secret1", groups = { "foo", "bar" }), - @Credentials(callerName = "alex", password = "secret2", groups = { "foo", "kaz" }), - @Credentials(callerName = "arjan", password = "secret3", groups = { "foo" }) , - @Credentials(callerName = "sameer", password = "pandit", groups = { "bar" })} -) - -@WebServlet("/servlet") -@DeclareRoles({ "foo", "bar", "kaz" }) -@ServletSecurity(@HttpConstraint(rolesAllowed = "foo")) -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java deleted file mode 100644 index 3eb6946bf08..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.assertDefaultAuthenticated; -import static org.glassfish.soteria.test.Assert.assertDefaultNotAuthenticated; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - -import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -@RunWith(Arquillian.class) -public class AppMemBasicIT extends ArquillianBase { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppNoRoleMapping"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticated() { - - DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider(); - credentialsProvider.addCredentials("reza", "secret1"); - - getWebClient().setCredentialsProvider(credentialsProvider); - - assertDefaultAuthenticated( - readFromServer("/servlet")); - } - - @Test - public void testNotAuthenticated() { - - WebResponse response = responseFromServer("/servlet"); - - assertEquals(401, response.getStatusCode()); - - assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); - - assertDefaultNotAuthenticated( - response.getContentAsString()); - } - - @Test - public void testNotAuthenticatedWrongName() { - - DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider(); - credentialsProvider.addCredentials("romo", "secret1"); - - getWebClient().setCredentialsProvider(credentialsProvider); - - WebResponse response = responseFromServer("/servlet"); - - assertEquals(401, response.getStatusCode()); - - assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); - - assertDefaultNotAuthenticated( - response.getContentAsString()); - } - - @Test - public void testNotAuthenticatedWrongPassword() { - - DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider(); - credentialsProvider.addCredentials("reza", "wrongpassword"); - - getWebClient().setCredentialsProvider(credentialsProvider); - - WebResponse response = responseFromServer("/servlet"); - - assertEquals(401, response.getStatusCode()); - - assertTrue( - "Response did not contain the \"WWW-Authenticate\" header, but should have", - response.getResponseHeaderValue("WWW-Authenticate") != null); - - assertDefaultNotAuthenticated( - response.getContentAsString()); - } - - @Test - public void testNotAuthenticatedNotAllowedRole() { - - DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider(); - credentialsProvider.addCredentials("sameer", "pandit"); - - getWebClient().setCredentialsProvider(credentialsProvider); - - WebResponse response = responseFromServer("/servlet"); - - assertEquals(403, response.getStatusCode()); - - assertDefaultNotAuthenticated( - response.getContentAsString()); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml deleted file mode 100644 index a7518de28cb..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-securitycontext-auth-ejb - war - - - app-securitycontext-auth-ejb - - - - false - - - - - org.glassfish.soteria.test - common - 6.2.6-SNAPSHOT - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java deleted file mode 100644 index a0f1b02a38e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import org.glassfish.soteria.SecurityContextImpl; -import javax.security.enterprise.SecurityContext; -import jakarta.servlet.annotation.ServletSecurity; -import jakarta.servlet.annotation.HttpConstraint; -import jakarta.annotation.security.DeclareRoles; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.SecurityContext; -import javax.security.enterprise.credential.CallerOnlyCredential; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Set; - -import static javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters.withParams; -import static org.glassfish.soteria.Utils.notNull; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - */ -@DeclareRoles({"foo", "bar", "kaz"}) -@WebServlet("/protectedServlet") -@ServletSecurity(@HttpConstraint(rolesAllowed = "foo")) -public class ProtectedServlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - private SecurityContext securityContext; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String name = request.getParameter("name"); - - if (notNull(name)) { - - AuthenticationStatus status = securityContext.authenticate( - request, response, - withParams() - .credential( - new CallerOnlyCredential(name))); - - response.getWriter().write("Authenticated with status: " + status.name() + "\n"); - } - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - - String contextName = null; - if (securityContext.getCallerPrincipal() != null) { - contextName = securityContext.getCallerPrincipal().getName(); - } - - response.getWriter().write("context username: " + contextName + "\n"); - - response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n"); - response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n"); - response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n"); - - response.getWriter().write("has access to /protectedServlet: " + securityContext.hasAccessToWebResource("/protectedServlet") + "\n"); - - Set roles = ((SecurityContextImpl) securityContext).getAllDeclaredCallerRoles(); - - response.getWriter().write("All declared roles of user " + roles + "\n"); - - response.getWriter().write("all roles has role \"foo\": " + roles.contains("foo") + "\n"); - response.getWriter().write("all roles has role \"bar\": " + roles.contains("bar") + "\n"); - response.getWriter().write("all roles has role \"kaz\": " + roles.contains("kaz") + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index 4c43cf1a5eb..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import org.glassfish.soteria.SecurityContextImpl; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.ejb.EJB; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.SecurityContext; -import javax.security.enterprise.credential.CallerOnlyCredential; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Set; -import jakarta.inject.Inject; - -import static javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters.withParams; -import static org.glassfish.soteria.Utils.notNull; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - */ -@DeclareRoles({"foo", "bar", "kaz"}) -@WebServlet("/servlet") -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @EJB - private TestEJB bean; - @Inject - private SecurityContext securityContext; - - /** - * Processes requests for both HTTP GET and POST - * methods. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - response.setContentType("text/html;charset=UTF-8"); - response.getWriter().write("This is a servlet \n"); - String name = request.getParameter("name"); - - if (notNull(name)) { - - AuthenticationStatus status = securityContext.authenticate( - request, response, - withParams() - .credential( - new CallerOnlyCredential(name))); - - response.getWriter().write("Authenticated with status: " + status.name() + "\n"); - } - - String ejbName = null; - if (bean.getUserPrincipalFromEJBContext() != null) { - ejbName = bean.getUserPrincipalFromEJBContext().getName(); - } - - response.getWriter().write("ejb username: " + ejbName + "\n"); - - response.getWriter().write("ejb user has role \"foo\": " + bean.isCallerInRoleFromEJBContext("foo") + "\n"); - response.getWriter().write("ejb user has role \"bar\": " + bean.isCallerInRoleFromEJBContext("bar") + "\n"); - response.getWriter().write("ejb user has role \"kaz\": " + bean.isCallerInRoleFromEJBContext("kaz") + "\n"); - - String contextName = null; - if (bean.getUserPrincipalFromSecContext() != null) { - contextName = bean.getUserPrincipalFromSecContext().getName(); - } - - response.getWriter().write("context username: " + contextName + "\n"); - - response.getWriter().write("context user has role \"foo\": " + bean.isCallerInRoleFromSecContext("foo") + "\n"); - response.getWriter().write("context user has role \"bar\": " + bean.isCallerInRoleFromSecContext("bar") + "\n"); - response.getWriter().write("context user has role \"kaz\": " + bean.isCallerInRoleFromSecContext("kaz") + "\n"); - - response.getWriter().write("web user has access to /protectedServlet: " + securityContext.hasAccessToWebResource("/protectedServlet") + "\n"); - - Set roles = bean.getAllDeclaredCallerRoles(); - - response.getWriter().write("All declared roles of user " + roles + "\n"); - - response.getWriter().write("all roles has role \"foo\": " + roles.contains("foo") + "\n"); - response.getWriter().write("all roles has role \"bar\": " + roles.contains("bar") + "\n"); - response.getWriter().write("all roles has role \"kaz\": " + roles.contains("kaz") + "\n"); - } - - - /** - * Handles the HTTP GET method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Handles the HTTP POST method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Returns a short description of the servlet. - * - * @return a String containing servlet description - */ - @Override - public String getServletInfo() { - return "Short description"; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index da648d46559..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.AuthenticationStatus.SEND_FAILURE; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.credential.CallerOnlyCredential; -import javax.security.enterprise.credential.Credential; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - if (httpMessageContext.isAuthenticationRequest()) { - - Credential credential = httpMessageContext.getAuthParameters().getCredential(); - if (!(credential instanceof CallerOnlyCredential)) { - throw new IllegalStateException("This authentication mechanism requires a programmatically provided CallerOnlyCredential"); - } - - CallerOnlyCredential callerOnlyCredential = (CallerOnlyCredential) credential; - - if ("reza".equals(callerOnlyCredential.getCaller())) { - return httpMessageContext.notifyContainerAboutLogin("reza", new HashSet<>(asList("foo", "bar"))); - } - - if ("rezax".equals(callerOnlyCredential.getCaller())) { - throw new AuthenticationException(); - } - - return SEND_FAILURE; - - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java deleted file mode 100644 index 67d10f47d15..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import jakarta.ejb.Stateless; -import jakarta.inject.Inject; -import jakarta.annotation.security.DeclareRoles; -import jakarta.annotation.security.PermitAll; -import jakarta.annotation.Resource; -import jakarta.ejb.EJBContext; -import jakarta.annotation.security.RolesAllowed; -import org.glassfish.soteria.SecurityContextImpl; -import javax.security.enterprise.SecurityContext; -import java.security.Principal; -import java.util.Set; -@Stateless -@DeclareRoles({ "foo" , "bar", "kaz"}) -public class TestEJB { - - @Inject - private SecurityContext securityContext; - - @Resource - private EJBContext ejbContext; - - public Principal getUserPrincipalFromEJBContext() { - try { - return ejbContext.getCallerPrincipal(); - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - public boolean isCallerInRoleFromEJBContext(String role) { - try { - return ejbContext.isCallerInRole(role); - } catch (Exception e) { - e.printStackTrace(); - } - return false; - } - - - public Principal getUserPrincipalFromSecContext() { - return securityContext.getCallerPrincipal(); - } - - public boolean isCallerInRoleFromSecContext(String role) { - return securityContext.isCallerInRole(role); - } - - public Set getAllDeclaredCallerRoles() { - return ((SecurityContextImpl)securityContext).getAllDeclaredCallerRoles(); - } - - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java deleted file mode 100644 index 8c3dcd38493..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.assertDefaultAuthenticated; -import static org.glassfish.soteria.test.Assert.assertDefaultNotAuthenticated; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - - -@RunWith(Arquillian.class) -public class AppSecurityContextAuthIT extends ArquillianBase { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppSecurityContextEJB"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticatedStatus() { - assertTrue( - readFromServer("/servlet?name=reza") - .contains("Authenticated with status: SUCCESS")); - } - - /** - * The name "rezax" will cause the custom authentication provider - * to throw an auth exception, which should ultimately result in - * a SEND_FAILURE outcome from SecurityContext.authenticate. - */ - @Test - public void testAuthenticatedStatusException() { - assertTrue( - readFromServer("/servlet?name=rezax") - .contains("Authenticated with status: SEND_FAILURE")); - } - - /** - * The name "unknown" will cause the custom authentication provider - * to return SEND_FAILURE, which should ultimately result in - * a SEND_FAILURE outcome from SecurityContext.authenticate as well. - */ - @Test - public void testAuthenticatedStatusFail() { - assertTrue( - readFromServer("/servlet?name=unknown") - .contains("Authenticated with status: SEND_FAILURE")); - } - - @Test - public void testAuthenticated() { - Assert.assertAuthenticated( - "ejb", - "reza", - readFromServer("/servlet?name=reza")); - } - - @Test - public void testContextAuthenticated() { - Assert.assertAuthenticated( - "context", - "reza", - readFromServer("/servlet?name=reza")); - } - - @Test - public void testContextIsCallerInRole(){ - Assert.assertAuthenticated( - "context", - "reza", - readFromServer("/servlet?name=reza"), "foo", "bar"); - } - - @Test - public void testContextAllCallers(){ - Assert.assertAuthenticatedRoles( - "all roles", - readFromServer("/servlet?name=reza"), "foo", "bar"); - } - - @Test - public void testContextHasAccessToResource(){ - Assert.assertHasAccessToResource( - "web", - "reza", - "/protectedServlet", - readFromServer("/servlet?name=reza")); - } - - @Test - public void testNotAuthenticated() { - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - } - - - - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml deleted file mode 100644 index 120a9f0ef78..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - app-securitycontext-auth - war - - - app-securitycontext-auth - - - - false - - - - - org.glassfish.soteria.test - common - 6.2.6-SNAPSHOT - test - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java deleted file mode 100644 index a0f1b02a38e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import org.glassfish.soteria.SecurityContextImpl; -import javax.security.enterprise.SecurityContext; -import jakarta.servlet.annotation.ServletSecurity; -import jakarta.servlet.annotation.HttpConstraint; -import jakarta.annotation.security.DeclareRoles; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.SecurityContext; -import javax.security.enterprise.credential.CallerOnlyCredential; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Set; - -import static javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters.withParams; -import static org.glassfish.soteria.Utils.notNull; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - */ -@DeclareRoles({"foo", "bar", "kaz"}) -@WebServlet("/protectedServlet") -@ServletSecurity(@HttpConstraint(rolesAllowed = "foo")) -public class ProtectedServlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - private SecurityContext securityContext; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String name = request.getParameter("name"); - - if (notNull(name)) { - - AuthenticationStatus status = securityContext.authenticate( - request, response, - withParams() - .credential( - new CallerOnlyCredential(name))); - - response.getWriter().write("Authenticated with status: " + status.name() + "\n"); - } - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - - String contextName = null; - if (securityContext.getCallerPrincipal() != null) { - contextName = securityContext.getCallerPrincipal().getName(); - } - - response.getWriter().write("context username: " + contextName + "\n"); - - response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n"); - response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n"); - response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n"); - - response.getWriter().write("has access to /protectedServlet: " + securityContext.hasAccessToWebResource("/protectedServlet") + "\n"); - - Set roles = ((SecurityContextImpl) securityContext).getAllDeclaredCallerRoles(); - - response.getWriter().write("All declared roles of user " + roles + "\n"); - - response.getWriter().write("all roles has role \"foo\": " + roles.contains("foo") + "\n"); - response.getWriter().write("all roles has role \"bar\": " + roles.contains("bar") + "\n"); - response.getWriter().write("all roles has role \"kaz\": " + roles.contains("kaz") + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/Servlet.java deleted file mode 100644 index faaecdf2a87..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/Servlet.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import org.glassfish.soteria.SecurityContextImpl; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.inject.Inject; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.SecurityContext; -import javax.security.enterprise.credential.CallerOnlyCredential; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Set; - -import static javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters.withParams; -import static org.glassfish.soteria.Utils.notNull; - -/** - * Test Servlet that prints out the name of the authenticated caller and whether - * this caller is in any of the roles {foo, bar, kaz} - */ -@DeclareRoles({"foo", "bar", "kaz"}) -@WebServlet("/servlet") -public class Servlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - private SecurityContext securityContext; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.getWriter().write("This is a servlet \n"); - - String name = request.getParameter("name"); - - if (notNull(name)) { - - AuthenticationStatus status = securityContext.authenticate( - request, response, - withParams() - .credential( - new CallerOnlyCredential(name))); - - response.getWriter().write("Authenticated with status: " + status.name() + "\n"); - } - - String webName = null; - if (request.getUserPrincipal() != null) { - webName = request.getUserPrincipal().getName(); - } - - response.getWriter().write("web username: " + webName + "\n"); - - response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n"); - response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n"); - response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n"); - - String contextName = null; - if (securityContext.getCallerPrincipal() != null) { - contextName = securityContext.getCallerPrincipal().getName(); - } - - response.getWriter().write("context username: " + contextName + "\n"); - - response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n"); - response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n"); - response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n"); - - response.getWriter().write("web user has access to /protectedServlet: " + securityContext.hasAccessToWebResource("/protectedServlet") + "\n"); - - Set roles = ((SecurityContextImpl) securityContext).getAllDeclaredCallerRoles(); - - response.getWriter().write("All declared roles of user " + roles + "\n"); - - response.getWriter().write("all roles has role \"foo\": " + roles.contains("foo") + "\n"); - response.getWriter().write("all roles has role \"bar\": " + roles.contains("bar") + "\n"); - response.getWriter().write("all roles has role \"kaz\": " + roles.contains("kaz") + "\n"); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java deleted file mode 100644 index da648d46559..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.Arrays.asList; -import static javax.security.enterprise.AuthenticationStatus.SEND_FAILURE; - -import java.util.HashSet; - -import jakarta.enterprise.context.RequestScoped; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.AuthenticationException; -import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; -import javax.security.enterprise.authentication.mechanism.http.HttpMessageContext; -import javax.security.enterprise.credential.CallerOnlyCredential; -import javax.security.enterprise.credential.Credential; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -@RequestScoped -public class TestAuthenticationMechanism implements HttpAuthenticationMechanism { - - @Override - public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException { - - if (httpMessageContext.isAuthenticationRequest()) { - - Credential credential = httpMessageContext.getAuthParameters().getCredential(); - if (!(credential instanceof CallerOnlyCredential)) { - throw new IllegalStateException("This authentication mechanism requires a programmatically provided CallerOnlyCredential"); - } - - CallerOnlyCredential callerOnlyCredential = (CallerOnlyCredential) credential; - - if ("reza".equals(callerOnlyCredential.getCaller())) { - return httpMessageContext.notifyContainerAboutLogin("reza", new HashSet<>(asList("foo", "bar"))); - } - - if ("rezax".equals(callerOnlyCredential.getCaller())) { - throw new AuthenticationException(); - } - - return SEND_FAILURE; - - } - - return httpMessageContext.doNothing(); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/webapp/WEB-INF/beans.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java deleted file mode 100644 index cfddf880257..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.glassfish.soteria.test.Assert.assertDefaultAuthenticated; -import static org.glassfish.soteria.test.Assert.assertDefaultNotAuthenticated; -import static org.glassfish.soteria.test.ShrinkWrap.mavenWar; -import static org.junit.Assert.assertTrue; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import org.junit.Rule; -import org.junit.AfterClass; -import org.junit.rules.TestWatcher; - - -@RunWith(Arquillian.class) -public class AppSecurityContextAuthIT extends ArquillianBase { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - @Rule - public TestWatcher reportWatcher=new ReportWatcher(stat, "Security::soteria::AppSecurityContextServlet"); - - @AfterClass - public static void printSummary(){ - stat.printSummary(); - } - - @Deployment(testable = false) - public static Archive createDeployment() { - return mavenWar(); - } - - @Test - public void testAuthenticated() { - assertDefaultAuthenticated( - readFromServer("/servlet?name=reza")); - } - - @Test - public void testAuthenticatedStatus() { - assertTrue( - readFromServer("/servlet?name=reza") - .contains("Authenticated with status: SUCCESS")); - } - - /** - * The name "rezax" will cause the custom authentication provider - * to throw an auth exception, which should ultimately result in - * a SEND_FAILURE outcome from SecurityContext.authenticate. - */ - @Test - public void testAuthenticatedStatusException() { - assertTrue( - readFromServer("/servlet?name=rezax") - .contains("Authenticated with status: SEND_FAILURE")); - } - - /** - * The name "unknown" will cause the custom authentication provider - * to return SEND_FAILURE, which should ultimately result in - * a SEND_FAILURE outcome from SecurityContext.authenticate as well. - */ - @Test - public void testAuthenticatedStatusFail() { - assertTrue( - readFromServer("/servlet?name=unknown") - .contains("Authenticated with status: SEND_FAILURE")); - } - - @Test - public void testContextAuthenticated() { - Assert.assertAuthenticated( - "context", - "reza", - readFromServer("/servlet?name=reza")); - } - - @Test - public void testContextIsCallerInRole(){ - Assert.assertAuthenticated( - "context", - "reza", - readFromServer("/servlet?name=reza"), "foo", "bar"); - } - - @Test - public void testContextAllCallers(){ - Assert.assertAuthenticatedRoles( - "all roles", - readFromServer("/servlet?name=reza"), "foo", "bar"); - } - - @Test - public void testContextHasAccessToResource(){ - Assert.assertHasAccessToResource( - "web", - "reza", - "/protectedServlet", - readFromServer("/servlet?name=reza")); - } - - @Test - public void testNotAuthenticated() { - assertDefaultNotAuthenticated( - readFromServer("/servlet")); - } - - - - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/build.properties b/appserver/tests/appserv-tests/devtests/security/soteria/build.properties deleted file mode 100644 index fabf1d0d3d4..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/build.properties +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/build.xml b/appserver/tests/appserv-tests/devtests/security/soteria/build.xml deleted file mode 100644 index 6ad5c9cf728..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/build.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &commonRun; - &testProperties; - &commonSecurity; - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml deleted file mode 100644 index eafc6dfa0f6..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - 4.0.0 - - - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - - - common - - jar - - - - junit - junit - 4.13.2 - - - org.jboss.arquillian.junit - arquillian-junit-container - - - - net.sourceforge.htmlunit - htmlunit - 2.29 - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ArquillianBase.java b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ArquillianBase.java deleted file mode 100644 index 25724da667a..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ArquillianBase.java +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.util.logging.Level.SEVERE; -import static org.apache.http.HttpStatus.SC_MULTIPLE_CHOICES; -import static org.apache.http.HttpStatus.SC_OK; - -import java.io.IOException; -import java.net.URL; -import java.util.logging.Logger; - -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; - -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import com.gargoylesoftware.htmlunit.Page; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.WebResponse; - -public class ArquillianBase { - - private static final Logger logger = Logger.getLogger(ArquillianBase.class.getName()); - - private WebClient webClient; - private String response; - - @ArquillianResource - private URL base; - - @Rule - public TestWatcher ruleExample = new TestWatcher() { - @Override - protected void failed(Throwable e, Description description) { - super.failed(e, description); - - logger.log(SEVERE, - "\n\nTest failed: " + - description.getClassName() + "." + description.getMethodName() + - - "\nMessage: " + e.getMessage() + - - "\nLast response: " + - - "\n\n" + response + "\n\n"); - - } - }; - - @Before - public void setUp() { - response = null; - webClient = new WebClient() { - - private static final long serialVersionUID = 1L; - - @Override - public void printContentIfNecessary(WebResponse webResponse) { - int statusCode = webResponse.getStatusCode(); - if (getOptions().getPrintContentOnFailingStatusCode() && !(statusCode >= SC_OK && statusCode < SC_MULTIPLE_CHOICES)) { - logger.log(SEVERE, webResponse.getWebRequest().getUrl().toExternalForm()); - } - super.printContentIfNecessary(webResponse); - } - }; - webClient.getOptions().setThrowExceptionOnFailingStatusCode(false); - } - - @After - public void tearDown() { - webClient.getCookieManager().clearCookies(); - webClient.close(); - } - - protected String readFromServer(String path) { - response = ""; - WebResponse localResponse = responseFromServer(path); - if (localResponse != null) { - response = localResponse.getContentAsString(); - } - - return response; - } - - protected WebResponse responseFromServer(String path) { - - WebResponse webResponse = null; - - Page page = pageFromServer(path); - if (page != null) { - webResponse = page.getWebResponse(); - if (webResponse != null) { - response = webResponse.getContentAsString(); - } - } - - return webResponse; - } - - protected

P pageFromServer(String path) { - - if (base.toString().endsWith("/") && path.startsWith("/")) { - path = path.substring(1); - } - - try { - response = ""; - - P page = webClient.getPage(base + path); - - if (page != null) { - WebResponse localResponse = page.getWebResponse(); - if (localResponse != null) { - response = localResponse.getContentAsString(); - } - } - - return page; - - } catch (FailingHttpStatusCodeException | IOException e) { - throw new IllegalStateException(e); - } - } - - protected WebClient getWebClient() { - return webClient; - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/Assert.java b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/Assert.java deleted file mode 100644 index 0cdad6f99ab..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/Assert.java +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import java.util.ArrayList; -import java.util.List; -import com.gargoylesoftware.htmlunit.WebResponse; - -public final class Assert { - - public static void assertDefaultAuthenticated(String response) { - assertAuthenticated("web", "reza", response, "foo", "bar"); - } - - public static void assertDefaultAuthenticated(WebResponse response) { - assertNotNull(response); - assertEquals(200, response.getStatusCode()); - assertAuthenticated("web", "reza", response.getContentAsString(), "foo", "bar"); - } - - public static void assertDefaultNotAuthenticated(String response) { - assertNotAuthenticated("web", "reza", response, "foo", "bar"); - } - - public static void assertDefaultNotAuthenticated(WebResponse response) { - assertNotNull(response); - assertEquals(401, response.getStatusCode()); - assertNotAuthenticated("web", "reza", response.getContentAsString(), "foo", "bar"); - } - - public static void assertDefaultNotAuthenticatedUnprotected(WebResponse response) { - assertNotNull(response); - assertEquals(200, response.getStatusCode()); - assertNotAuthenticatedUnprotected("web", "null", response.getContentAsString(), new ArrayList()); - } - - public static void assertNotAuthenticatedError(WebResponse response) { - assertNotNull(response); - assertEquals(500, response.getStatusCode()); - } - - public static void assertApplicationPrincipalAndContainerPrincipalName(WebResponse response) { - assertNotNull(response); - assertEquals(200, response.getStatusCode()); - assertApplicationPrincipalAndContainerPrincipalSubject("reza", "foo", response - .getContentAsString()); - } - - public static void assertBundledHAMPrecedenceOverLoginConfig(WebResponse response) { - assertNotNull(response); - assertEquals(200, response.getStatusCode()); - assertBundledHAMPrecedenceOverLoginConfig("reza", "foo", response - .getContentAsString()); - } - - public static void assertBothContainerAndApplicationPrincipalsAreSame(WebResponse response) { - assertNotNull(response); - assertEquals(200, response.getStatusCode()); - assertBothContainerAndApplicationPrincipalsAreSame("reza", "foo", response - .getContentAsString()); - } - - public static void assertAuthenticated(String userType, String name, String response, String... roles) { - assertTrue( - "Should be authenticated as user " + name + " but was not \n Response: \n" + - response + "\n search: " + userType + " username: " + name, - response.contains(userType + " username: " + name)); - - for (String role : roles) { - assertTrue( - "Authenticated user should have role \"" + role + "\", but did not \n Response: \n" + - response, - response.contains(userType + " user has role \"" + role + "\": true")); - } - } - - public static void assertNotAuthenticated(String userType, String name, String response, String... roles) { - assertFalse( - "Should not be authenticated as user " + name + " but was \n Response: \n" + - response + "\n search: " + userType + " username: " + name, - response.contains(userType + " username: " + name)); - - for (String role : roles) { - assertFalse( - "Authenticated user should not have role \"" + role + "\", but did \n Response: \n" + - response, - response.contains(userType + " user has role \"" + role + "\": true")); - } - } - - public static void assertAuthenticatedRoles(String userType, String response, String... roles) { - for (String role : roles) { - assertTrue( - "Authenticated user should have role \"" + role + "\", but did not \n Response: \n" + - response, - response.contains(userType + " has role \"" + role + "\": true")); - } - } - - public static void assertNotAuthenticatedRoles(String userType, String name, String response, String... roles) { - - for (String role : roles) { - assertFalse( - "Authenticated user should not have role \"" + role + "\", but did \n Response: \n" + - response, - response.contains(userType + " has role \"" + role + "\": true")); - } - } - public static void assertNotAuthenticatedUnprotected(String userType, String name, String response, List roles) { - assertTrue( - "Should not be authenticated as user " + name + " but was \n Response: \n" + - response + "\n search: " + userType + " username: " + name, - response.contains(userType + " username: " + name)); - - for (String role : roles) { - assertFalse( - "Authenticated user should not have role \"" + role + "\", but did \n Response: \n" + - response, - response.contains(userType + " user has role \"" + role + "\": true")); - } - } - - public static void assertHasAccessToResource(String userType, String name, String resource, String response) { - assertTrue( - "user " + name + " should have access to resource "+ resource +" but was not \n Response: \n" + - response, - response.contains(userType + " user has access to " + resource + ": true")); - } - - public static void assertNotHasAccessToResource(String userType, String name, String resource, String response) { - assertFalse( - "user " + name + " should have access to resource "+ resource +" but was not \n Response: \n" + - response, - response.contains(userType + " user has access to " + resource + ": true")); - } - - public static void assertBundledHAMPrecedenceOverLoginConfig(String name, String role, String response) { - assertTrue( - "For " + name + " authentication should have been performed by TestAuthenticationMechanism, but wasn't. \n" + - "+ Response: \n" + - response, - response.contains(String.format("Authentication Mechanism:TestAuthenticationMechanism"))); - } - - public static void assertApplicationPrincipalAndContainerPrincipalSubject(String name, String role, String response) { - assertTrue( - "Both application principal's and container principal's name should have been same as " - + " but was not. \n Response: \n" + - response, - response.contains(String.format("Container caller principal and application caller principal both are " + - "represented by same principal for user %s and is in role %s", name, role))); - } - - public static void assertBothContainerAndApplicationPrincipalsAreSame(String name, String role, String response) { - assertTrue( - "For user " + name + " both container caller principal and application caller principal should have been same, " + - "but " + - "wasn't. \n" + - "+ Response: \n" + - response, - response.contains(String.format("Both container caller principal and application caller principals are one and " + - "the same for user %s in role %s", - name, role))); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ReportWatcher.java b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ReportWatcher.java deleted file mode 100644 index 63980647da7..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ReportWatcher.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -public class ReportWatcher extends TestWatcher{ - - private SimpleReporterAdapter stat; - private String testId; - - public ReportWatcher(SimpleReporterAdapter stat, String testId) { - this.stat=stat; - this.testId=testId; - } - - @Override - protected void starting(Description description){ - stat.addDescription(testId + " " + description.getMethodName()); - } - - @Override - protected void failed(Throwable e, Description description) { - stat.addStatus(testId + " " + description.getMethodName() , stat.FAIL); - } - - @Override - protected void succeeded(Description description) { - stat.addStatus(testId + " " + description.getMethodName() , stat.PASS); - } - - protected void printSummary(){ - stat.printSummary(); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ShrinkWrap.java b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ShrinkWrap.java deleted file mode 100644 index 01757f16fad..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ShrinkWrap.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.soteria.test; - -import static java.lang.System.getProperty; -import static org.jboss.shrinkwrap.api.ShrinkWrap.create; - -import java.io.File; - -import org.jboss.shrinkwrap.api.importer.ZipImporter; -import org.jboss.shrinkwrap.api.spec.WebArchive; - -public class ShrinkWrap { - - public static WebArchive mavenWar() { - return - create(ZipImporter.class, getProperty("finalName") + ".war") - .importFrom(new File("target/" + getProperty("finalName") + ".war")) - .as(WebArchive.class); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/resources/server.xml b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/resources/server.xml deleted file mode 100644 index dad2bcd3dcd..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/resources/server.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - javaee-7.0 - localConnector-1.0 - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml deleted file mode 100644 index 56512ed864b..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - 4.0.0 - org.glassfish.soteria.test - soteria - 6.2.6-SNAPSHOT - pom - - Soteria ${project.version} Integration tests and examples - - - 5.0 - 1.8 - 1.8 - - - - common - app-mem-basic - app-custom - app-custom-session - app-custom-rememberme - app-securitycontext-auth - app-securitycontext-auth-ejb - app-double-ham - app-ham-ordering - - app-custom-identity-store-handler - app-multiple-store - app-multiple-store-backup - app-no-role-mapping - app-bundled-ham-basic-login-config-form - app-caller-principal - app-no-application-caller-principal - - - - - - org.jboss.arquillian - arquillian-bom - 1.3.0.Final - import - pom - - - com.unboundid - unboundid-ldapsdk - 4.0.4 - - - - - - - junit - junit - 4.13.2 - test - - - javax - javaee-api - 7.0 - provided - - - javax.security.enterprise - javax.security.enterprise-api - 1.0 - provided - - - org.glassfish.soteria - javax.security.enterprise - 1.0 - provided - - - org.jboss.arquillian.container - arquillian-glassfish-remote-3.1 - 1.0.2 - test - - - com.sun.ejte.ccl.reporter - SimpleReporterAdapter - 1.0 - system - ${APS_HOME}/lib/reporter.jar - - - - - - - maven-failsafe-plugin - 2.20 - - - - integration-test - verify - - - - - - ${project.build.finalName} - - - ${env.S1AS_HOME}/.. - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/client/Client.java b/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/client/Client.java index 75dd7ae779d..fa338897412 100644 --- a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/client/Client.java @@ -18,6 +18,7 @@ import java.net.*; import java.io.*; +import java.util.Base64; import java.util.Enumeration; import java.util.Hashtable; @@ -404,7 +405,7 @@ private int invokeServlet(String url, String method, String user, StringBuffer o if ((user != null) && (user.length() > 0)) { // Add BASIC header for authentication String auth = user + ":" + password; - String authEncoded = new sun.misc.BASE64Encoder().encode(auth.getBytes()); + String authEncoded = Base64.getEncoder().encodeToString(auth.getBytes()); c1.setRequestProperty("Authorization", "Basic " + authEncoded); } c1.setUseCaches(false); diff --git a/appserver/tests/appserv-tests/devtests/security/weblogic-dd/client/TestRoleAssignments.java b/appserver/tests/appserv-tests/devtests/security/weblogic-dd/client/TestRoleAssignments.java index 48a0c30da87..92d5c5686af 100644 --- a/appserver/tests/appserv-tests/devtests/security/weblogic-dd/client/TestRoleAssignments.java +++ b/appserver/tests/appserv-tests/devtests/security/weblogic-dd/client/TestRoleAssignments.java @@ -19,7 +19,9 @@ import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import sun.misc.BASE64Encoder; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Base64.Encoder; class TestRoleAssignment { @@ -45,14 +47,12 @@ public void doTest() { URL u = new URL(url); URLConnection uconn = u.openConnection(); - String up = username + ":" + password; - BASE64Encoder be = new BASE64Encoder(); - up = be.encode(up.getBytes()); + up = Base64.getEncoder().encodeToString((username + ":" + password).getBytes(StandardCharsets.UTF_8)); uconn.setRequestProperty("authorization", "Basic " + up); - BufferedReader reader = new BufferedReader(new InputStreamReader( - uconn.getInputStream())); - while (reader.readLine() != null) { + try (BufferedReader reader = new BufferedReader(new InputStreamReader(uconn.getInputStream()))) { + while (reader.readLine() != null) { + } } } catch (Exception e) { e.printStackTrace(); diff --git a/appserver/tests/appserv-tests/devtests/security/wss/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/build.xml index 0c3719454d0..50458b12dbc 100644 --- a/appserver/tests/appserv-tests/devtests/security/wss/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/wss/build.xml @@ -33,17 +33,7 @@ - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/README b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/README deleted file mode 100644 index 068303adfb5..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/README +++ /dev/null @@ -1,35 +0,0 @@ -A Simple WSS test. It is a simple servlet based webservice. Runs on j2sdk1.4.2 -It performs the following: -1. Signs then Encrypts the message. (aka before-content) -2. It is setup manually for now. To set up do the following: - Domain.xml - - - - - - - - - - - - sun-acc.xml - - - - - - - - -3. setup bouncy-castle provider - Copy bouncy castle to jre/lib/ext directory - java.security - security.provider.1=sun.security.provider.Sun - security.provider.2=org.bouncycastle.jce.provider.BouncyCastleProvider - security.provider.3=com.sun.net.ssl.internal.ssl.Provider - security.provider.4=com.sun.rsajca.Provider - security.provider.5=com.sun.crypto.provider.SunJCE - security.provider.6=sun.security.jgss.SunProvider - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/build.xml deleted file mode 100644 index ae138e8a5de..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/build.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - - -]> - - - - &commonSetup; - &commonBuild; - &commonSecurity; - &commonRun; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Usage: - ======== Targets by execution granularity ========= - - ant clean (Cleans all ws tests) - ant build (builds all ws tests) - ant setup (setup all required resources) - ant deploy (deploy all test apps) - ant run (Executes all tests) - ant undeploy (undeploy all test apps) - ant unsetup (remove all set resources) - - ======== Targets by technology ========= - - ant servletws (Executes the servletws tests) - ant all (Executes all the ws tests) - - ===== Targets by technoloy and execution granularity ====== - Note: Run the command of the following type: - - % ant servletws -Dws-target=clean - - to run the 'clean' target for 'servletws' tests - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/README b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/README deleted file mode 100644 index 07dbc730f6c..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/README +++ /dev/null @@ -1,2 +0,0 @@ -Run ant all from the above directory. - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.properties deleted file mode 100644 index 082c99c3129..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.properties +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.xml deleted file mode 100644 index 7d699c64e58..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.xml +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - - -]> - - - - &commonSetup; - &commonBuild; - &testproperties; - &commonSecurity; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/MANIFEST.MF deleted file mode 100644 index 8edeacc173c..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.client.TaxCalClient diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/TaxCalClient.java b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/TaxCalClient.java deleted file mode 100644 index b9e17121b02..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/TaxCalClient.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.client; - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -import javax.naming.*; -import javax.xml.rpc.Stub; - - -public class TaxCalClient { - - private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests"); - private static String stateTaxEndpoint = null; - private static String fedTaxEndpoint = null; - private static String testSuite = "Sec::Servlet_Based_WSS_test Encrypt then Sign"; - private static String testCase = null; - private static TaxCalServletService taxCalService = null; - - public static void main (String[] args) { - - if(args[0] == null || args[1] == null){ - System.out.println("TaxCal client: Argument missing. Please provide target" + - "endpoint address as argument"); - System.exit(1); - } else { - stateTaxEndpoint = args[0]; - fedTaxEndpoint = args[1]; - } - - stat.addDescription(testSuite); - try { - TaxCalClient client = new TaxCalClient(); - Context ic = new InitialContext(); - taxCalService = (TaxCalServletService) - ic.lookup("java:comp/env/service/TaxCalServletService"); - - client.callStateTaxService(); - client.callFedTaxService(); - stat.addStatus(testSuite, stat.PASS); - }catch(Exception e){ - stat.addStatus(testSuite, stat.FAIL); - e.printStackTrace(); - } - - stat.printSummary(testSuite); - } - - public void callStateTaxService() { - double income = 85000.00; - double deductions = 5000.00; - - //String targetEndpointAddress = - // "http://localhost:1024/taxcalculator"; - - try { - - StateTaxIF taxCalIFPort = taxCalService.getStateTaxIFPort(); - - ((Stub)taxCalIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - stateTaxEndpoint); - - double stateTax = taxCalIFPort.getStateTax(income, deductions); - System.out.println("State tax from servlet based TaxCalService :" + stateTax); - - if(stateTax == 24000.00) - stat.addStatus(testSuite + " StateTaxPort", stat.PASS); - else - stat.addStatus(testSuite + " StateTaxPort", stat.FAIL); - - } catch (Exception ex) { - System.out.println("TaxCalEjbWebservice client failed"); - stat.addStatus(testSuite + " StateTaxPort", stat.FAIL); - ex.printStackTrace(); - } - } - - public void callFedTaxService() { - double income = 97000.00; - double deductions = 7000.00; - try { - //String targetEndpointAddress = - //"http://localhost:1024/FindInterestServlet/FindInterest"; - - FedTaxIF taxCalIFPort = taxCalService.getFedTaxIFPort(); - ((Stub)taxCalIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - fedTaxEndpoint); - - double fedTax = taxCalIFPort.getFedTax(income, deductions); - System.out.println("Fed tax from Servlet based TaxCalService :" + fedTax); - - if(fedTax == 18000.00) - stat.addStatus(testSuite + " FedTaxPort", stat.PASS); - else - stat.addStatus(testSuite + " FedTaxPort", stat.FAIL); - - } catch (Exception ex) { - System.out.println("TaxCalServletWebService client failed"); - stat.addStatus(testSuite + " FedTaxPort", stat.FAIL); - ex.printStackTrace(); - } - } -} - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-client.xml deleted file mode 100644 index e998508ef85..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-client.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-sei.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-sei.xml deleted file mode 100644 index 7f875d33197..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-sei.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-web.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-web.xml deleted file mode 100644 index 4b01e8b25f7..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/application-client.xml deleted file mode 100644 index 5a6949fe0c8..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/application-client.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - app client dd for taxcalculator - ws-taxcalClient - - taxcal service ref - service/TaxCalServletService - com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.client.TaxCalServletService - META-INF/wsdl/TaxCalServletService.wsdl - TaxCalClientMapping.xml - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/application.xml deleted file mode 100644 index c12a697413b..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/application.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - TaxCalculatorApp - - - ws-taxcal-web.war - TaxCalWSServlet - - - - ws-taxcal-client.jar - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/web.xml deleted file mode 100644 index fd885379894..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/web.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - TaxCal ServletWS - - StateTaxServlet - com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.StateTaxServlet - 0 - - - FedTaxServlet - com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.FedTaxServlet - 0 - - - StateTaxServlet - /statetaxservlet - - - FedTaxServlet - /fedtaxservlet - - - 54 - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/webservices.xml deleted file mode 100644 index 1ed4f089d3d..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/webservices.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - desc - - TaxCalculator Servlet - WEB-INF/wsdl/TaxCalServletService.wsdl - TaxCalServletMapping.xml - - port component description - StateTaxIFPort - taxns:StateTaxIFPort - - com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.StateTaxIF - - - StateTaxServlet - - - - port component description - FedTaxIFPort - taxns:FedTaxIFPort - - com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.FedTaxIF - - - FedTaxServlet - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxIF.java b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxIF.java deleted file mode 100644 index 282d888dbc4..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxIF.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.defprovider.servlet.taxcal; - -import java.rmi.RemoteException; -import java.rmi.Remote; - - -public interface FedTaxIF extends Remote{ - - public double getFedTax(double income, double deductions) throws RemoteException; - -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxServlet.java b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxServlet.java deleted file mode 100644 index 1a7d117c320..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxServlet.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.defprovider.servlet.taxcal; - -import java.util.Iterator; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.rpc.Call; -import java.io.Serializable; -import java.rmi.RemoteException; -import javax.naming.*; -import javax.xml.rpc.Service; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.namespace.QName; -import jakarta.servlet.SingleThreadModel; - -public class FedTaxServlet implements - SingleThreadModel, ServiceLifecycle { - - public FedTaxServlet() { - System.out.println("FedTaxServlet() instantiated"); - } - - public void init(Object context) { - System.out.println("Got ServiceLifecycle::init call " + context); - } - - public void destroy() { - System.out.println("Got ServiceLifecycle::destroy call"); - } - - public double getFedTax(double income, double deductions) { - System.out.println("getStateTax invoked from servlet endpoint"); - return ((income - deductions) * 0.2); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxIF.java b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxIF.java deleted file mode 100644 index 5207a817331..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxIF.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.defprovider.servlet.taxcal; - -import java.rmi.RemoteException; -import java.rmi.Remote; - - -public interface StateTaxIF extends Remote{ - - public double getStateTax(double income, double deductions) throws RemoteException; - -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxServlet.java b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxServlet.java deleted file mode 100644 index d216b8bb904..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxServlet.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.defprovider.servlet.taxcal; - -import java.util.Iterator; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.rpc.Call; -import java.io.Serializable; -import java.rmi.RemoteException; -import javax.naming.*; -import javax.xml.rpc.Service; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.namespace.QName; -import jakarta.servlet.SingleThreadModel; - -public class StateTaxServlet implements - SingleThreadModel, ServiceLifecycle { - - public StateTaxServlet() { - System.out.println("StateTaxServlet() instantiated"); - } - - public void init(Object context) { - System.out.println("Got ServiceLifecycle::init call " + context); - } - - public void destroy() { - System.out.println("Got ServiceLifecycle::destroy call"); - } - - public double getStateTax(double income, double deductions) { - System.out.println("getStateTax invoked from servlet endpoint"); - return ((income - deductions) * 0.3); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/wsdl/TaxCalServletService.wsdl b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/wsdl/TaxCalServletService.wsdl deleted file mode 100644 index 866c9d648fd..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/wsdl/TaxCalServletService.wsdl +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml index aecdd5feec7..3ae27ac2037 100644 --- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml +++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml @@ -89,7 +89,8 @@ + classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${build.classes.dir}/ejbws:${build.classes.dir}/servletws/WEB-INF/classes:${build.classes.dir}/client" + debug="on" failonerror="true"/> diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/gartner/descriptor/sun-application-client.xml index 7d16e8e9931..21251ccb797 100644 --- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/descriptor/sun-application-client.xml +++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/descriptor/sun-application-client.xml @@ -1,5 +1,6 @@ - -Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/ -sunone/appserver/dtds/sun-application-client_1_4-0.dtd'> diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/build.xml deleted file mode 100644 index 6a479b729b2..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/build.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - -]> - - - - &commonSetup; - &commonBuild; - &commonSecurity; - &commonRun; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Usage: - ======== Targets by execution granularity ========= - - ant clean (Cleans all ws tests) - ant build (builds all ws tests) - ant setup (setup all required resources) - ant deploy (deploy all test apps) - ant run (Executes all tests) - ant undeploy (undeploy all test apps) - ant unsetup (remove all set resources) - - ======== Targets by technology ========= - - ant servletws (Executes the servletws tests) - ant all (Executes all the ws tests) - - ===== Targets by technoloy and execution granularity ====== - Note: Run the command of the following type: - - % ant servletws -Dws-target=clean - - to run the 'clean' target for 'servletws' tests - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.properties deleted file mode 100644 index 79f306a9556..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.properties +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.xml deleted file mode 100644 index e182731655e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - -]> - - - - &commonSetup; - &commonBuild; - &testproperties; - &commonSecurity; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/Client.java b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/Client.java deleted file mode 100644 index 45922764a3a..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/Client.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.permethod.servlet.client; - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.xml.rpc.Stub; - -public class Client { - - private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests"); - private static String testSuite = "Sec:Servlet Per method WSS test "; - - public static void main (String[] args) { - String helloEndpoint = null; - if (args[0] == null){ - System.out.println("WSS Permethod client: Argument missing. Please provide target endpoint address as argument"); - System.exit(1); - } else { - helloEndpoint = args[0]; - } - - stat.addDescription(testSuite); - - HelloIF helloIFPort = null; - try { - Context ic = new InitialContext(); - HelloServletService helloService = (HelloServletService) - ic.lookup("java:comp/env/service/HelloServletService"); - helloIFPort = helloService.getHelloIFPort(); - ((Stub)helloIFPort)._setProperty( - Stub.ENDPOINT_ADDRESS_PROPERTY, helloEndpoint); - System.out.println("Calling sayHello"); - String reply = helloIFPort.sayHello("Hello World"); - System.out.println("Reply sayHello: " + reply); - stat.addStatus(testSuite + " sayHello", stat.PASS); - } catch(Exception e){ - stat.addStatus(testSuite + " sayHello", stat.FAIL); - e.printStackTrace(); - } - - try { - System.out.println("Calling sendSecret"); - int code = helloIFPort.sendSecret("It is a secret"); - System.out.println("Reply sendSecret: " + code); - stat.addStatus(testSuite + " sendSecret", stat.PASS); - } catch(Exception e){ - stat.addStatus(testSuite + "sendSecret", stat.FAIL); - e.printStackTrace(); - } - - try { - System.out.println("Calling getSecret"); - String secret = helloIFPort.getSecret(100.0); - System.out.println("Reply getSecret: " + secret); - stat.addStatus(testSuite + " getSecret", stat.PASS); - } catch(Exception e){ - stat.addStatus(testSuite + " getSecret", stat.FAIL); - e.printStackTrace(); - } - - stat.printSummary(testSuite); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/MANIFEST.MF deleted file mode 100644 index 32c6d741247..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: com.sun.s1asdev.security.wss.permethod.servlet.client.Client diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-client.xml deleted file mode 100644 index 7118cee8afd..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-client.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-sei.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-sei.xml deleted file mode 100644 index e4ccf479488..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-sei.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-web.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-web.xml deleted file mode 100644 index d8a751d5ea6..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/application-client.xml deleted file mode 100644 index ce75975862b..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/application-client.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - app client dd for hello - ws-permethod-hello - - hello service ref - service/HelloServletService - com.sun.s1asdev.security.wss.permethod.servlet.client.HelloServletService - META-INF/wsdl/HelloServletService.wsdl - HelloClientMapping.xml - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/application.xml deleted file mode 100644 index d266f7ca292..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/application.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - WSSServletHelloApp - - - security-wss-permethod-servlet-web.war - security-wss-permethod-servlet - - - - security-wss-permethod-servlet-client.jar - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-application-client.xml deleted file mode 100644 index b551342bdbb..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-application-client.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - service/HelloServletService - - - http://hello.org/wsdl - HelloIFPort - - - - - sayHello - - - - - - - sendSecret - - - - - - - getSecret - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-web.xml deleted file mode 100644 index e811ba3692e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-web.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - HelloServlet - - HelloIFPort - helloservlet - - - - sendSecret - - - - - - - getSecret - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/web.xml deleted file mode 100644 index 3bdd4e93137..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/web.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - Hello ServletWS - - HelloServlet - com.sun.s1asdev.security.wss.permethod.servlet.HelloServlet - 0 - - - HelloServlet - /helloservlet - - - 54 - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/webservices.xml deleted file mode 100644 index 0ca2051db20..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/webservices.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - desc - - Hello Servlet - WEB-INF/wsdl/HelloServletService.wsdl - HelloServletMapping.xml - - port component description - HelloIFPort - hellons:HelloIFPort - - com.sun.s1asdev.security.wss.permethod.servlet.HelloIF - - - HelloServlet - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloIF.java b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloIF.java deleted file mode 100644 index 6a3bd1df22f..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloIF.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.permethod.servlet; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -public interface HelloIF extends Remote { - public String sayHello(String message) throws RemoteException; - public int sendSecret(String message) throws RemoteException; - public String getSecret(double key) throws RemoteException; -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloServlet.java b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloServlet.java deleted file mode 100644 index d28184c8355..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloServlet.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.permethod.servlet; - -import jakarta.servlet.SingleThreadModel; -import javax.xml.rpc.server.ServiceLifecycle; - -public class HelloServlet implements - SingleThreadModel, ServiceLifecycle { - - public HelloServlet() { - System.out.println("HelloServlet() instantiated"); - } - - public void init(Object context) { - System.out.println("Got ServiceLifecycle::init call " + context); - } - - public void destroy() { - System.out.println("Got ServiceLifecycle::destroy call"); - } - - public String sayHello(String message) { - System.out.println("sayHello invoked from servlet endpoint"); - return "reply from " + message; - } - - public int sendSecret(String message) { - System.out.println("sendSecret invoked from servlet endpoint"); - return message.hashCode(); - } - - public String getSecret(double key) { - System.out.println("getSecret invoked from servlet endpoint"); - return "Secret-" + key; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/wsdl/HelloServletService.wsdl b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/wsdl/HelloServletService.wsdl deleted file mode 100644 index af7cfc0bc33..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/wsdl/HelloServletService.wsdl +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/roles/build.properties deleted file mode 100644 index 331310a3df7..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/build.properties +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/roles/build.xml deleted file mode 100644 index 1941a541d9a..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/build.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - -]> - - - - &commonSetup; - &commonBuild; - &testproperties; - &commonSecurity; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/client/Client.java.template b/appserver/tests/appserv-tests/devtests/security/wss/roles/client/Client.java.template deleted file mode 100644 index 1f0df6bb27d..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/client/Client.java.template +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles.client; - -import java.util.Map; - -import jakarta.xml.ws.BindingProvider; -import jakarta.xml.ws.WebServiceRef; - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -import com.sun.s1asdev.security.wss.roles.ejbws.HelloEjb; -import com.sun.s1asdev.security.wss.roles.ejbws.WssRolesEjbService; -import com.sun.s1asdev.security.wss.roles.ejbws2.HelloEjb2; -import com.sun.s1asdev.security.wss.roles.ejbws2.WssRolesEjb2Service; -import com.sun.s1asdev.security.wss.roles.servletws.HelloServlet; -import com.sun.s1asdev.security.wss.roles.servletws.WssRolesServletService; - -public class Client { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - private static String testSuite = "Sec:WSS Roles test "; - - @WebServiceRef(wsdlLocation="http://@HOST@:@PORT@/WssRolesEjbService/HelloEjb?WSDL") - private static WssRolesEjbService service; - - @WebServiceRef(wsdlLocation="http://@HOST@:@PORT@/WssRolesEjb2Service/HelloEjb2?WSDL") - private static WssRolesEjb2Service service2; - - @WebServiceRef(wsdlLocation="http://@HOST@:@PORT@/security-wss-roles-web/webservice/WssRolesServletService/HelloServlet?WSDL") - private static WssRolesServletService service3; - - public static void main(String[] args) { - boolean authprop = - (args != null && args.length > 0 && "authprop".equals(args[0])); - - if (authprop) { - System.out.println("Authenticate through BindingProvider property"); - stat.addDescription("security-wss-roles: authprop"); - } else { - stat.addDescription("security-wss-roles"); - } - - String description = null; - try { - // first ejb ws - HelloEjb port = service.getHelloEjbPort(); - - if (authprop) { - authenticate((BindingProvider)port); - } - - description = testSuite + " ejbws1: hello"; - port.hello("Sun"); - stat.addStatus(description, stat.PASS); - - description = testSuite + " ejbws1: rolesAllowed1"; - port.rolesAllowed1("Sun"); - stat.addStatus(description, stat.PASS); - - try { - description = testSuite + " ejbws1: rolesAllowed2"; - port.rolesAllowed2("Sun"); - stat.addStatus(description, stat.FAIL); - } catch(Exception e) { - System.out.println("Expected failure: " + e); - stat.addStatus(description, stat.PASS); - } - - description = testSuite + " ejbws1: permitAll"; - port.permitAll("Sun"); - stat.addStatus(description, stat.PASS); - - try { - description = testSuite + " ejbws1: denyAll"; - port.denyAll("Sun"); - stat.addStatus(description, stat.FAIL); - } catch(Exception e) { - System.out.println("Expected failure: " + e); - stat.addStatus(description, stat.PASS); - } - - try { - description = testSuite + " ejbws1: runAs1"; - port.runAs1(); - stat.addStatus(description, stat.FAIL); - } catch(Exception e) { - System.out.println("Expected failure: " + e); - stat.addStatus(description, stat.PASS); - } - - description = testSuite + " ejbws1: runAs2"; - port.runAs2(); - stat.addStatus(description, stat.PASS); - - // second ejb ws - HelloEjb2 port2 = service2.getHelloEjb2Port(); - - if (authprop) { - authenticate((BindingProvider)port2); - } - - description = testSuite + " ejbws2: rolesAllowed1"; - port2.rolesAllowed1("Sun"); - stat.addStatus(description, stat.PASS); - - try { - description = testSuite + " ejbws2: rolesAllowed2"; - port2.rolesAllowed2("Sun"); - stat.addStatus(description, stat.FAIL); - } catch(Exception e) { - System.out.println("Expected failure: " + e); - stat.addStatus(description, stat.PASS); - } - - // first servlet ws - HelloServlet port3 = service3.getHelloServletPort(); - if (authprop) { - authenticate((BindingProvider)port3); - } - description = testSuite + " serlvet: hello"; - String msg = port3.hello("Sun"); - if (msg != null && msg.startsWith("javaee")) { - stat.addStatus(description, stat.PASS); - } else { - stat.addStatus(description, stat.FAIL); - } - - } catch(Exception ex) { - ex.printStackTrace(); - stat.addStatus(description, stat.FAIL); - } - - if (authprop) { - stat.printSummary("security-wss-roles: authprop"); - } else { - stat.printSummary("security-wss-roles"); - } - } - - private static void authenticate(BindingProvider bd) { - System.out.println("authenticate through BindingProvider property"); - Map requestContext = bd.getRequestContext(); - requestContext.put(BindingProvider.USERNAME_PROPERTY, "javaee"); - requestContext.put(BindingProvider.PASSWORD_PROPERTY, "javaee"); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/security/wss/roles/client/MANIFEST.MF deleted file mode 100644 index 6e24fb09cd9..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: com.sun.s1asdev.security.wss.roles.client.Client diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-application.xml b/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-application.xml deleted file mode 100644 index 5b3df2c1d35..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-application.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - 0 - - javaee - javaee - - - ejbuser - ejbuser - - file2 - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 3a6754d0fc5..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - HelloEjb - - HelloEjb - - BASIC - file2 - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-ejb-jar2.xml b/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-ejb-jar2.xml deleted file mode 100644 index 7b2352a93f0..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-ejb-jar2.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - HelloEjb2 - - HelloEjb2 - - BASIC - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/web.xml deleted file mode 100644 index a008245d21a..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/web.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - HelloServlet - com.sun.s1asdev.security.wss.roles.servletws.HelloServlet - 0 - - - HelloServlet - /webservice/WssRolesServletService/HelloServlet - - - - - Secure Area - /webservice/WssRolesServletService/HelloServlet - POST - - - javaee - - - - BASIC - file2 - - - javaee - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java deleted file mode 100644 index 5564a6c198e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles.ejbws; - -import jakarta.annotation.Resource; -import jakarta.annotation.security.DeclareRoles; -import jakarta.annotation.security.DenyAll; -import jakarta.annotation.security.PermitAll; -import jakarta.annotation.security.RolesAllowed; -import jakarta.annotation.security.RunAs; -import jakarta.ejb.EJB; -import jakarta.ejb.Stateless; -import jakarta.ejb.SessionContext; -import jakarta.jws.WebService; -import jakarta.xml.ws.WebServiceContext; - -import com.sun.s1asdev.security.wss.roles.ejb.SfulLocal; - -@Stateless -@WebService(targetNamespace="http://ejbws.roles.wss.security.s1asdev.sun.com", serviceName="WssRolesEjbService") -@DeclareRoles({"javaee", "webuser", "ejbuser"}) -@RunAs("ejbuser") -public class HelloEjb { - @EJB private SfulLocal sful; - @Resource private SessionContext sc; - @Resource WebServiceContext wsContext; - - public String hello(String who) { - if (!sc.isCallerInRole("javaee") || sc.isCallerInRole("ejbuser")) { - throw new RuntimeException("sc not of role javaee or of role ejbuser"); - } - - if (!wsContext.isUserInRole("javaee") || wsContext.isUserInRole("ejbuser")) { - throw new RuntimeException("wsc not of role javaee or of role ejbuser"); - } - - return "Hello, " + who; - } - - @RolesAllowed(value={"javaee"}) - public String rolesAllowed1(String who) { - return "Hello, " + who; - } - - @RolesAllowed(value={"webuser"}) - public String rolesAllowed2(String who) { - return "Hello, " + who; - } - - @DenyAll - public String denyAll(String who) { - return "Hello, " + who; - } - - @PermitAll - public String permitAll(String who) { - return "Hello, " + who; - } - - public String runAs1() { - return sful.hello(); - } - - public String runAs2() { - return sful.goodBye(); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java deleted file mode 100644 index 1c98945680e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles.ejb; - -import jakarta.annotation.security.RolesAllowed; -import jakarta.ejb.Local; -import jakarta.ejb.Stateful; - -@Stateful -@Local({SfulLocal.class}) -public class SfulEJB implements SfulLocal { - @RolesAllowed(value={"javaee"}) - public String hello() { - return "hello from Sful"; - } - - @RolesAllowed(value={"ejbuser"}) - public String goodBye() { - return "goodBye from Sful"; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulLocal.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulLocal.java deleted file mode 100644 index e73d0dafd81..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulLocal.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles.ejb; - -public interface SfulLocal { - public String hello(); - - public String goodBye(); -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java deleted file mode 100644 index d722d7d2c73..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles.ejbws2; - -import jakarta.annotation.security.RolesAllowed; -import jakarta.ejb.Stateless; -import jakarta.jws.WebService; - -@Stateless -@WebService(targetNamespace="http://ejbws2.roles.wss.security.s1asdev.sun.com", serviceName="WssRolesEjb2Service") -public class HelloEjb2 { - @RolesAllowed(value={"javaee"}) - public String rolesAllowed1(String who) { - return "Hello, " + who; - } - - @RolesAllowed(value={"webuser"}) - public String rolesAllowed2(String who) { - return "Hello, " + who; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/servletws/HelloServlet.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/servletws/HelloServlet.java deleted file mode 100644 index ed684ccd96f..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles/servletws/HelloServlet.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles.servletws; - -import jakarta.annotation.Resource; -import jakarta.jws.WebService; -import jakarta.xml.ws.WebServiceContext; - -@WebService(targetNamespace="http://servletws.roles.wss.security.s1asdev.sun.com", serviceName="WssRolesServletService") -public class HelloServlet { - @Resource WebServiceContext wsContext; - - public String hello(String who) { - if (!wsContext.isUserInRole("javaee") || - wsContext.isUserInRole("ejbuser")) { - throw new RuntimeException("not of role javaee or of role ejbuser"); - } - - return wsContext.getUserPrincipal() + "Hello, " + who; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.properties deleted file mode 100644 index 7097c0cd37e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.properties +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.xml deleted file mode 100644 index 04a70cbf043..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - -]> - - - - &commonSetup; - &commonBuild; - &testproperties; - &commonSecurity; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/client/Client.java.template b/appserver/tests/appserv-tests/devtests/security/wss/roles2/client/Client.java.template deleted file mode 100644 index c3b1161ae34..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/client/Client.java.template +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles2.client; - -import java.util.Map; - -import jakarta.xml.ws.BindingProvider; -import jakarta.xml.ws.WebServiceRef; - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -import com.sun.s1asdev.security.wss.roles2.ejbws.HelloEjb; -import com.sun.s1asdev.security.wss.roles2.ejbws.WssRoles2EjbService; - -public class Client { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - private static String testSuite = "Sec:WSS Roles2 test "; - - @WebServiceRef(wsdlLocation="http://@HOST@:@PORT@/WssRoles2EjbService/HelloEjb?WSDL") - private static WssRoles2EjbService service; - - public static void main(String[] args) { - stat.addDescription("security-wss-roles2"); - String description = null; - try { - HelloEjb port = service.getHelloEjbPort(); - - description = testSuite + " ejbws: hello"; - port.hello("Sun"); - stat.addStatus(description, stat.PASS); - - description = testSuite + " ejbws: rolesAllowed1"; - port.rolesAllowed1("Sun"); - stat.addStatus(description, stat.PASS); - - try { - description = testSuite + " ejbws: rolesAllowed2"; - port.rolesAllowed2("Sun"); - stat.addStatus(description, stat.FAIL); - } catch(Exception e) { - System.out.println("Expected failure: " + e); - stat.addStatus(description, stat.PASS); - } - - description = testSuite + " ejbws: permitAll"; - port.permitAll("Sun"); - stat.addStatus(description, stat.PASS); - - try { - description = testSuite + " ejbws: denyAll"; - port.denyAll("Sun"); - stat.addStatus(description, stat.FAIL); - } catch(Exception e) { - System.out.println("Expected failure: " + e); - stat.addStatus(description, stat.PASS); - } - - try { - description = testSuite + " ejbws: runAs1"; - port.runAs1(); - stat.addStatus(description, stat.FAIL); - } catch(Exception e) { - System.out.println("Expected failure: " + e); - stat.addStatus(description, stat.PASS); - } - - description = testSuite + " ejbws: runAs2"; - port.runAs2(); - stat.addStatus(description, stat.PASS); - - description = testSuite + " ejbws: runAsRunAs1"; - port.runAsRunAs1(); - stat.addStatus(description, stat.PASS); - - try { - description = testSuite + " ejbws: runAsRunAs2"; - port.runAsRunAs2(); - stat.addStatus(description, stat.FAIL); - } catch(Exception e) { - System.out.println("Expected failure: " + e); - stat.addStatus(description, stat.PASS); - } - - } catch(Exception ex) { - ex.printStackTrace(); - stat.addStatus(description, stat.FAIL); - } - - stat.printSummary("security-wss-roles2"); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/security/wss/roles2/client/MANIFEST.MF deleted file mode 100644 index f9a55a7fb24..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: com.sun.s1asdev.security.wss.roles2.client.Client diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/roles2/descriptor/sun-application-client.xml deleted file mode 100644 index 7fef3f0b03b..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/descriptor/sun-application-client.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - com.sun.s1asdev.security.wss.roles2.client.Client/service - - - http://ejbws.roles2.wss.security.s1asdev.sun.com - HelloEjbPort - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/security/wss/roles2/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 81ea10e3065..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - javaee - javaee - - - javaeegp - javaee - - - ejbuser - ejbuser - - - j2ee - j2ee - - - - - HelloEjb - - HelloEjb - /WssRoles2EjbService/HelloEjb - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java deleted file mode 100644 index 467f0fa9cdf..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles2.ejbws; - -import jakarta.annotation.Resource; -import jakarta.annotation.security.DeclareRoles; -import jakarta.annotation.security.DenyAll; -import jakarta.annotation.security.PermitAll; -import jakarta.annotation.security.RolesAllowed; -import jakarta.annotation.security.RunAs; -import jakarta.ejb.EJB; -import jakarta.ejb.Stateless; -import jakarta.ejb.SessionContext; -import jakarta.jws.WebService; - -import com.sun.s1asdev.security.wss.roles2.ejb.SfulLocal; - -@Stateless -@WebService(targetNamespace="http://ejbws.roles2.wss.security.s1asdev.sun.com", serviceName="WssRoles2EjbService") -@DeclareRoles({"javaee", "webuser", "ejbuser"}) -@RunAs("ejbuser") -public class HelloEjb { - @EJB private SfulLocal sful; - @Resource private SessionContext sc; - - public String hello(String who) { - if (!sc.isCallerInRole("javaee")) { - throw new RuntimeException("not of role javaee"); - } - if (sc.isCallerInRole("ejbuser")) { - throw new RuntimeException("of role ejbuser"); - } - return "Hello, " + who; - } - - @RolesAllowed(value={"javaee"}) - public String rolesAllowed1(String who) { - return "Hello, " + who; - } - - @RolesAllowed(value={"webuser"}) - public String rolesAllowed2(String who) { - return "Hello, " + who; - } - - @DenyAll - public String denyAll(String who) { - return "Hello, " + who; - } - - @PermitAll - public String permitAll(String who) { - return "Hello, " + who; - } - - public String runAs1() { - return sful.hello(); - } - - public String runAs2() { - return sful.goodBye(); - } - - @RolesAllowed(value={"javaeegp"}) - public String runAsRunAs1() { - return sful.slessHello(); - } - - public String runAsRunAs2() { - return sful.slessGoodBye(); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java deleted file mode 100644 index 4f1faf84bda..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles2.ejb; - -import jakarta.annotation.security.RolesAllowed; -import jakarta.annotation.security.RunAs; -import jakarta.ejb.EJB; -import jakarta.ejb.Local; -import jakarta.ejb.Stateful; - -@Stateful -@Local({SfulLocal.class}) -@RunAs("j2ee") -public class SfulEJB implements SfulLocal { - @EJB private SlessLocal sless; - - @RolesAllowed(value={"javaee"}) - public String hello() { - return "hello from Sful"; - } - - @RolesAllowed(value={"ejbuser"}) - public String goodBye() { - return "goodBye from Sful"; - } - - public String slessHello() { - return sless.hello(); - } - - public String slessGoodBye() { - return sless.goodBye(); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulLocal.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulLocal.java deleted file mode 100644 index 02a8411c566..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulLocal.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles2.ejb; - -public interface SfulLocal { - public String hello(); - - public String goodBye(); - - public String slessHello(); - - public String slessGoodBye(); -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java deleted file mode 100644 index debfd65388e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles2.ejb; - -import jakarta.annotation.security.RolesAllowed; -import jakarta.ejb.Local; -import jakarta.ejb.Stateless; - -@Stateless -@Local({SlessLocal.class}) -public class SlessEJB implements SlessLocal { - @RolesAllowed(value={"j2ee"}) - public String hello() { - return "hello from Sless"; - } - - @RolesAllowed(value={"javaee"}) - public String goodBye() { - return "goodBye from Sless"; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessLocal.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessLocal.java deleted file mode 100644 index ae59099121e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessLocal.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.roles2.ejb; - -public interface SlessLocal { - public String hello(); - - public String goodBye(); -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.properties deleted file mode 100644 index e91a2485771..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.properties +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.xml deleted file mode 100644 index d7df978241e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - -]> - - - - &commonSetup; - &commonBuild; - &testproperties; - &commonSecurity; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/client/Client.java.template b/appserver/tests/appserv-tests/devtests/security/wss/ssl/client/Client.java.template deleted file mode 100644 index 3a16825c220..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/client/Client.java.template +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.ssl.client; - -import jakarta.xml.ws.WebServiceRef; - -import com.sun.s1asdev.security.wss.ssl.ejbws.HelloEjb; -import com.sun.s1asdev.security.wss.ssl.ejbws.WssSslEjbService; -import com.sun.s1asdev.security.wss.ssl.servletws.HelloServlet; -import com.sun.s1asdev.security.wss.ssl.servletws.WssSslServletService; - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class Client { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - private static String testSuite = "Sec:WSS SSL test "; - - @WebServiceRef(wsdlLocation="https://@HOST@:@PORT@/WssSslEjbService/HelloEjb?WSDL") - private static WssSslEjbService ejbService; - @WebServiceRef(wsdlLocation="https://@HOST@:@PORT@/security-wss-ssl/webservice/WssSslServletService/HelloServlet?WSDL") - private static WssSslServletService servletService; - - public static void main(String[] args) { - stat.addDescription("security-wss-ssl"); - String description = null; - try { - // ejb ws - HelloEjb ejbPort = ejbService.getHelloEjbPort(); - description = testSuite + " ssl: ejb hello"; - ejbPort.hello("Sun Ejb"); - stat.addStatus(description, stat.PASS); - } catch(Exception ex) { - ex.printStackTrace(); - stat.addStatus(description, stat.FAIL); - } - - try { - // servlet ws - HelloServlet servletPort = servletService.getHelloServletPort(); - description = testSuite + " ssl: servlet hello"; - servletPort.hello("Sun Servlet"); - stat.addStatus(description, stat.PASS); - } catch(Exception ex) { - ex.printStackTrace(); - stat.addStatus(description, stat.FAIL); - } - - stat.printSummary("security-wss-ssl"); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/security/wss/ssl/client/MANIFEST.MF deleted file mode 100644 index 4a957415dba..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: com.sun.s1asdev.security.wss.ssl.client.Client diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/application.xml deleted file mode 100644 index cd0b2e93837..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/application.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - security-wss-sslApp - - security-wss-ssl-ejb.jar - - - - security-wss-ssl-web.war - security-wss-ssl - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 5cf62281194..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - HelloEjb - - HelloEjb - CONFIDENTIAL - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/web.xml deleted file mode 100644 index 9ede38c606c..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/web.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - SSL WebTier for the Hello Service - HelloWAR - - Endpoint for Hello Web Service - HelloWebService - HelloServlet - com.sun.s1asdev.security.wss.ssl.servletws.HelloServlet - 0 - - - HelloServlet - /webservice/WssSslServletService/HelloServlet - - - 54 - - - - Protected Area - /webservice/WssSslServletService/HelloServlet - GET - POST - - - CONFIDENTIAL - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java deleted file mode 100644 index 8d14ac3248d..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.ssl.ejbws; - -import jakarta.ejb.Stateless; -import jakarta.jws.WebService; - -@Stateless -@WebService(targetNamespace="http://ejbws.ssl.wss.security.s1asdev.sun.com", serviceName="WssSslEjbService") -public class HelloEjb { - public String hello(String who) { - return "Hello, SSL " + who; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/servletws/HelloServlet.java b/appserver/tests/appserv-tests/devtests/security/wss/ssl/servletws/HelloServlet.java deleted file mode 100644 index 57db6b6d854..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/servletws/HelloServlet.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.ssl.servletws; - -import jakarta.jws.WebService; - -@WebService(targetNamespace="http://servletws.ssl.wss.security.s1asdev.sun.com", serviceName="WssSslServletService") -public class HelloServlet { - public String hello(String who) { - return "Hello, SSL " + who; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.properties deleted file mode 100644 index 050c8b51490..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.properties +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.xml deleted file mode 100644 index 2a8260ecd04..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - -]> - - - - &commonSetup; - &commonBuild; - &testproperties; - &commonSecurity; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/client/Client.java.template b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/client/Client.java.template deleted file mode 100644 index 873fe6a34b5..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/client/Client.java.template +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.sslclientcert.client; - -import jakarta.xml.ws.WebServiceRef; - -import com.sun.s1asdev.security.wss.sslclientcert.ejbws.HelloEjb; -import com.sun.s1asdev.security.wss.sslclientcert.ejbws.WssSslClientCertEjbService; -import com.sun.s1asdev.security.wss.sslclientcert.servletws.HelloServlet; -import com.sun.s1asdev.security.wss.sslclientcert.servletws.WssSslClientCertServletService; - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class Client { - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - private static String testSuite = "Sec:WSS SSL Client Cert test "; - - @WebServiceRef(wsdlLocation="https://@HOST@:@PORT@/WssSslClientCertEjbService/HelloEjb?WSDL") - private static WssSslClientCertEjbService ejbService; - @WebServiceRef(wsdlLocation="https://@HOST@:@PORT@/security-wss-sslclientcert/webservice/WssSslClientCertServletService/HelloServlet?WSDL") - private static WssSslClientCertServletService servletService; - - public static void main(String[] args) { - stat.addDescription("security-wss-sslclientcert"); - String description = null; - try { - // ejb ws - HelloEjb ejbPort = ejbService.getHelloEjbPort(); - description = testSuite + " sslclientcert: ejb hello"; - String ejbMsg = ejbPort.hello("Sun Ejb"); - System.out.println(ejbMsg); - if (ejbMsg != null && ejbMsg.startsWith("Hello Ejb, CN=@HOST@")) { - stat.addStatus(description, stat.PASS); - } else { - stat.addStatus(description, stat.FAIL); - } - - description = testSuite + " sslclientcert: ejb hello2"; - String ejbMsg2 = ejbPort.hello2("Sun Ejb - 2"); - System.out.println(ejbMsg2); - if (ejbMsg2 != null && ejbMsg2.startsWith("Hello Ejb 2, CN=@HOST@")) { - stat.addStatus(description, stat.PASS); - } else { - stat.addStatus(description, stat.FAIL); - } - } catch(Exception ex) { - ex.printStackTrace(); - stat.addStatus(description, stat.FAIL); - } - - try { - // servlet ws - HelloServlet servletPort = servletService.getHelloServletPort(); - description = testSuite + " sslclientcert: servlet hello"; - String servletMsg = servletPort.hello("Sun Servlet"); - System.out.println(servletMsg); - if (servletMsg != null && servletMsg.startsWith("Hello Servlet, CN=@HOST@")) { - stat.addStatus(description, stat.PASS); - } else { - stat.addStatus(description, stat.FAIL); - } - } catch(Exception ex) { - ex.printStackTrace(); - stat.addStatus(description, stat.FAIL); - } - - stat.printSummary("security-wss-sslclientcert"); - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/client/MANIFEST.MF deleted file mode 100644 index 2f0095f82e9..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: com.sun.s1asdev.security.wss.sslclientcert.client.Client diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/application.xml deleted file mode 100644 index 92757d8258a..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/application.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - security-wss-sslclientcertApp - - security-wss-sslclientcert-ejb.jar - - - - security-wss-sslclientcert-web.war - security-wss-sslclientcert - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/sun-application.xml.template b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/sun-application.xml.template deleted file mode 100644 index 64a3d8ce184..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/sun-application.xml.template +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - SECUSER - CN=@HOST@, OU=GlassFish, O=Sun Microsystems, L=Santa Clara, ST=California, C=US - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 4d7852d497e..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - HelloEjb - - HelloEjb - - CLIENT-CERT - - CONFIDENTIAL - - - - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/web.xml deleted file mode 100644 index fc44e333f15..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/web.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - SSL WebTier for the Hello Service - HelloWAR - - Endpoint for Hello Web Service - HelloWebService - HelloServlet - com.sun.s1asdev.security.wss.sslclientcert.servletws.HelloServlet - 0 - - - HelloServlet - /webservice/WssSslClientCertServletService/HelloServlet - - - 54 - - - - Protected Area - /webservice/WssSslClientCertServletService/HelloServlet - POST - - - SECUSER - - - CONFIDENTIAL - - - - CLIENT-CERT - - - SECUSER - - diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java deleted file mode 100644 index 838e372edb5..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.sslclientcert.ejbws; - -import jakarta.annotation.Resource; -import jakarta.ejb.SessionContext; -import jakarta.ejb.Stateless; -import jakarta.jws.WebService; -import jakarta.xml.ws.WebServiceContext; - -@Stateless -@WebService(targetNamespace="http://ejbws.sslclientcert.wss.security.s1asdev.sun.com", serviceName="WssSslClientCertEjbService") -public class HelloEjb { - @Resource private SessionContext sc; - @Resource WebServiceContext wsc; - - public String hello(String msg) { - return "Hello Ejb, " + sc.getCallerPrincipal() + ": " + msg ; - } - - public String hello2(String msg) { - return "Hello Ejb 2, " + wsc.getUserPrincipal() + ": " + msg ; - } -} diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/servletws/HelloServlet.java b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/servletws/HelloServlet.java deleted file mode 100644 index c5ab01add75..00000000000 --- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/servletws/HelloServlet.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1asdev.security.wss.sslclientcert.servletws; - -import jakarta.annotation.Resource; -import jakarta.jws.WebService; -import jakarta.xml.ws.WebServiceContext; - -@WebService(targetNamespace="http://servletws.sslclientcert.wss.security.s1asdev.sun.com", serviceName="WssSslClientCertServletService") -public class HelloServlet { - @Resource WebServiceContext wsc; - - public String hello(String msg) { - return "Hello Servlet, " + wsc.getUserPrincipal() + ": " + msg; - } -} From 70914bad080bc12beb2aed99ede694ca49dfda03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:16:46 +0100 Subject: [PATCH 15/33] #23507 Fixed webservice tests + removed dead tests - dead tests - mejb or JAX-RPC dependency --- .../annotations/annotations-common.xml | 5 +- .../webservice/annotations/async/build.xml | 5 +- .../annotations/async/custom-client.xml | 19 +- .../annotations/client-handler-1/build.xml | 3 - .../client-handler-1/custom-client.xml | 23 +- .../client-handler-1/custom-server.xml | 23 +- .../annotations/client-handler-2/build.xml | 3 - .../client-handler-2/custom-client.xml | 23 +- .../client-handler-2/custom-server.xml | 23 +- .../containerresolver/client/build.xml | 3 - .../annotations/dol-override-1/build.xml | 7 +- .../dol-override-1/custom-client.xml | 23 +- .../dol-override-1/custom-server.xml | 23 +- .../endpoint/SubtractNumbersImpl.java | 4 +- .../dol-override-1/webservices.xml | 6 +- .../jaxrpcinjection/build.properties | 37 -- .../annotations/jaxrpcinjection/build.xml | 109 ---- .../jaxrpcinjection/client/Client.java | 65 -- .../jaxrpcinjection/client/MANIFEST.MF | 2 - .../jaxrpcinjection/config-interface.xml | 29 - .../descriptor/application-client.xml | 34 - .../descriptor/sun-application-client.xml | 36 -- .../jaxrpcinjection/descriptor/sun-web.xml | 32 - .../jaxrpcinjection/descriptor/web.xml | 39 -- .../descriptor/webservices.xml | 43 -- .../servlet/ServletHandlerTestImpl.java | 44 -- .../servlet/SimpleHandler.java | 69 -- .../jaxrpcinjection/servlet/SimpleServer.java | 25 - .../webservice/annotations/jaxwstools.xml | 3 - .../annotations/libdependent/build.xml | 3 +- .../annotations/mappedname/client/Client.java | 3 - .../webservice/annotations/mtom/build.xml | 3 - .../annotations/mtom/custom-client.xml | 23 +- .../annotations/mtom/custom-server.xml | 23 +- .../annotations/multiport/build.xml | 5 +- .../annotations/prepkged-svc-1/build.xml | 5 +- .../annotations/restful-2/build.xml | 104 +-- .../webservice/annotations/restful/build.xml | 105 ++- .../webservice/annotations/soap12/build.xml | 186 +++--- .../annotations/soap12/custom-client.xml | 23 +- .../annotations/soap12/custom-server.xml | 23 +- .../webservice/annotations/soaptcp/build.xml | 6 +- .../annotations/svchandler-1/build.xml | 3 - .../svchandler-1/custom-client.xml | 23 +- .../svchandler-1/custom-server.xml | 23 +- .../annotations/svchandler-2/build.xml | 6 +- .../svchandler-2/custom-client.xml | 23 +- .../svchandler-2/custom-server.xml | 23 +- .../annotations/svchandler-3/build.xml | 5 +- .../svchandler-3/custom-client.xml | 23 +- .../svchandler-3/custom-server.xml | 23 +- .../annotations/svchandler-4/build.xml | 5 +- .../svchandler-4/custom-client.xml | 23 +- .../svchandler-4/custom-server.xml | 23 +- .../webserviceref-cobundle/build.xml | 3 - .../webserviceref-lookup/build.xml | 3 - .../annotations/webservicerefs/build.xml | 156 ++--- .../webservices13-addressing-2/build.xml | 3 - .../webservices13-addressing/build.xml | 3 - .../webservices13-clientdds/build.xml | 5 +- .../endpoint/SubtractNumbersImpl.java | 2 +- .../webservices13-respectbinding/build.xml | 3 - .../annotations/wsdltojava/build.xml | 134 ++-- .../annotations/wsdltojava/customclient.xml | 32 +- .../annotations/wsdltojava/customservice.xml | 32 +- .../devtests/webservice/build.xml | 48 +- .../devtests/webservice/common/targets.xml | 6 - .../ejb_annotations/annotations-common.xml | 28 +- .../ejb_annotations/async/build.xml | 102 +-- .../ejb_annotations/async/custom-client.xml | 20 +- .../ejb_annotations/asyncejbclient/build.xml | 129 ++-- .../asyncejbclient/custom-client.xml | 20 +- .../ejb_annotations/bigint/build.xml | 136 ++-- .../webservice/ejb_annotations/build.xml | 6 +- .../ejb_annotations/ejbclient/build.xml | 127 ++-- .../ejbservletwebservicesinwar/build.xml | 3 - .../ejbwebservicesinwar-2/build.xml | 3 - .../ejbwebservicesinwar-3/build.xml | 3 - .../ejbwebservicesinwar-interceptor/build.xml | 3 - .../build.xml | 3 - .../ejb_annotations/libdependent-2/build.xml | 118 ++-- .../ejb_annotations/libdependent/build.xml | 127 ++-- .../ejb_annotations/multiport/build.xml | 123 ++-- .../ejb_annotations/provider/build.xml | 73 ++- .../provider/client/Client.java | 2 +- .../ejb_annotations/restful-ejb/build.xml | 90 +-- .../ejb_annotations/singleton/build.xml | 127 ++-- .../wsRef-webservice-features/build.xml | 3 - .../ejb_annotations/wsnameejbname/build.xml | 92 +-- .../webservice/google/GoogleSearch.wsdl | 211 ------ .../devtests/webservice/google/README | 3 - .../webservice/google/build.properties | 33 - .../devtests/webservice/google/build.xml | 180 ------ .../webservice/google/client/Client.java | 73 --- .../webservice/google/client/MANIFEST.MF | 2 - .../google/descriptor/application-client.xml | 37 -- .../google/descriptor/application.xml | 29 - .../webservice/google/descriptor/ejb-jar.xml | 41 -- .../descriptor/sun-application-client.xml | 32 - .../google/descriptor/sun-ejb-jar.xml | 37 -- .../google/descriptor/webservices.xml | 41 -- .../webservice/google/ejb/GoogleEJB.java | 87 --- .../google/wscompile_config_appclient.xml | 25 - .../google/wscompile_config_ejb.xml | 25 - .../webservice/googleserver/GoogleSearch.wsdl | 104 --- .../googleserver/GoogleSearch_partial.wsdl | 223 ------- .../googleserver/GoogleSearch_types.wsdl | 161 ----- .../webservice/googleserver/build.properties | 37 -- .../webservice/googleserver/build.xml | 312 --------- .../googleserver/client/Client.java | 297 --------- .../googleserver/client/ClientHandler.java | 68 -- .../googleserver/client/MANIFEST.MF | 2 - .../descriptor/application-client.xml | 102 --- .../googleserver/descriptor/application.xml | 35 - .../googleserver/descriptor/ejb-jar.xml | 84 --- .../descriptor/sun-application-client.xml | 89 --- .../descriptor/sun-application.xml | 37 -- .../googleserver/descriptor/sun-ejb-jar.xml | 45 -- .../googleserver/descriptor/war/sun-web.xml | 42 -- .../googleserver/descriptor/war/web.xml | 52 -- .../descriptor/war/webservices.xml | 54 -- .../googleserver/descriptor/webservices.xml | 54 -- .../googleserver/ejb/FooHandler.java | 68 -- .../googleserver/ejb/GoogleEJB.java | 172 ----- .../standalone/StandAloneClient.java | 86 --- .../googleserver/web/FooHandler.java | 68 -- .../googleserver/web/GoogleServletImpl.java | 135 ---- .../wscompile_config_appclient.xml | 25 - .../googleserver/wscompile_config_ejb.xml | 25 - .../wscompile_config_standalone.xml | 25 - .../googleserver/wscompile_config_web.xml | 25 - .../webservice/handler/build.properties | 37 -- .../devtests/webservice/handler/build.xml | 104 --- .../webservice/handler/client/Client.java | 65 -- .../webservice/handler/client/MANIFEST.MF | 2 - .../webservice/handler/config-interface.xml | 29 - .../handler/descriptor/application-client.xml | 34 - .../webservice/handler/descriptor/ejb-jar.xml | 31 - .../descriptor/sun-application-client.xml | 36 -- .../handler/descriptor/sun-ejb-jar.xml | 33 - .../handler/descriptor/webservices.xml | 44 -- .../webservice/handler/ejb/SimpleHandler.java | 56 -- .../webservice/handler/ejb/SimpleServer.java | 25 - .../handler/ejb/SimpleServerImpl.java | 44 -- .../jaxrpc-hello-ejb/build.properties | 42 -- .../webservice/jaxrpc-hello-ejb/build.xml | 188 ------ .../jaxrpc-hello-ejb/client-sun-web.xml | 23 - .../jaxrpc-hello-ejb/client-web.xml | 51 -- .../jaxrpc-hello-ejb/client/TestClient.java | 98 --- .../jaxrpc-hello-ejb/config-interface.xml | 29 - .../jaxrpc-hello-ejb/config-wsdl.xml | 24 - .../webservice/jaxrpc-hello-ejb/ejb-jar.xml | 31 - .../jaxrpc-hello-ejb/samplebuild.properties | 33 - .../src/helloservice/HelloIF.java | 25 - .../src/helloservice/HelloImpl.java | 28 - .../jaxrpc-hello-ejb/sun-ejb-jar.xml | 38 -- .../jaxrpc-hello-ejb/webclient/Client.java | 75 --- .../jaxrpc-hello-ejb/webservices.xml | 36 -- .../jaxrpc-hello-web/build.properties | 44 -- .../webservice/jaxrpc-hello-web/build.xml | 227 ------- .../jaxrpc-hello-web/client-sun-web.xml | 23 - .../jaxrpc-hello-web/client-web.xml | 51 -- .../jaxrpc-hello-web/client/Client.java | 69 -- .../jaxrpc-hello-web/client/MANIFEST.MF | 2 - .../jaxrpc-hello-web/client/TestClient.java | 98 --- .../jaxrpc-hello-web/config-interface.xml | 29 - .../jaxrpc-hello-web/config-wsdl.xml | 24 - .../descriptor/application-client.xml | 34 - .../descriptor/sun-application-client.xml | 36 -- .../jaxrpc-hello-web/samplebuild.properties | 32 - .../jaxrpc-hello-web/src/HelloIF.java | 25 - .../jaxrpc-hello-web/src/HelloImpl.java | 28 - .../webservice/jaxrpc-hello-web/sun-web.xml | 30 - .../webservice/jaxrpc-hello-web/web.xml | 31 - .../jaxrpc-hello-web/webclient/Client.java | 75 --- .../jaxrpc-hello-web/webservices.xml | 36 -- .../se_consumer_se_provider/build.xml | 229 +++---- .../jbi-serviceengine/client/web/build.xml | 196 +++--- .../jbi-serviceengine/ejb-jmsbc/build.xml | 599 +++++++++--------- .../jbi-serviceengine/inout-sample/build.xml | 183 +++--- .../jbi-serviceengine/jax-rpc/build.xml | 30 - .../jax-rpc/consumer/FindInterest.wsdl | 46 -- .../consumer/FindInterestNonHttpBC.wsdl | 41 -- .../jax-rpc/consumer/FindInterest_Schema.xsd | 39 -- .../jax-rpc/consumer/build.properties | 24 - .../jax-rpc/consumer/build.xml | 357 ----------- .../consumer/client/FindInterestClient.java | 108 ---- .../client/FindInterestClientNonHttpBC.java | 106 ---- .../client/FindInterestServletClient.java | 71 --- .../consumer/client/SOAPEjbConsumer.java | 70 -- .../client/SOAPEjbConsumerNonHttpBC.java | 68 -- .../consumer/client/ServletInvoker.java | 100 --- .../jax-rpc/consumer/descriptor/MANIFEST.MF | 3 - .../consumer/descriptor/application.xml | 32 - .../consumer/descriptor/client/MANIFEST.MF | 3 - .../descriptor/client/application-client.xml | 30 - .../client/sun-application-client.xml | 25 - .../consumer/descriptor/ejb/MANIFEST.MF | 3 - .../consumer/descriptor/ejb/ejb-jar.xml | 45 -- .../consumer/descriptor/ejb/sun-ejb-jar.xml | 34 - .../consumer/descriptor/ejb/webservices.xml | 42 -- .../consumer/descriptor/web/sun-web.xml | 33 - .../jax-rpc/consumer/descriptor/web/web.xml | 41 -- .../jax-rpc/consumer/ejb/InterestEJB.java | 51 -- .../jax-rpc/consumer/mapping/FIMapping.xml | 28 - .../consumer/mapping/FIMappingClient.xml | 28 - .../assembly/META-INF/jbi.xml | 43 -- .../su/FindInterest.wsdl | 46 -- .../su/FindInterest_Schema.xsd | 39 -- .../su/META-INF/jbi.xml | 32 - .../soap-binding-su-alaska/su/endpoints.xml | 22 - .../soap-binding-su/assembly/META-INF/jbi.xml | 43 -- .../soap-binding-su/su/META-INF/jbi.xml | 31 - .../consumer/soap-binding-su/su/endpoints.xml | 42 -- .../consumer/web/FindInterestServletImpl.java | 50 -- .../jax-rpc/consumer/wscompile_config.xml | 25 - .../consumer/wscompile_config_client.xml | 25 - .../jax-rpc/provider-oneway/FindInterest.wsdl | 44 -- .../provider-oneway/FindInterest_Schema.xsd | 31 - .../jax-rpc/provider-oneway/build.properties | 24 - .../jax-rpc/provider-oneway/build.xml | 334 ---------- .../client/FindInterestClient.java | 103 --- .../client/FindInterestClientNonHttpBC.java | 101 --- .../client/SOAPEjbConsumer.java | 68 -- .../client/SOAPEjbConsumerNonHttpBC.java | 66 -- .../provider-oneway/descriptor/MANIFEST.MF | 3 - .../descriptor/application.xml | 29 - .../descriptor/client/MANIFEST.MF | 3 - .../descriptor/client/application-client.xml | 30 - .../client/sun-application-client.xml | 25 - .../descriptor/ejb/MANIFEST.MF | 3 - .../descriptor/ejb/ejb-jar.xml | 45 -- .../descriptor/ejb/sun-ejb-jar.xml | 34 - .../descriptor/ejb/webservices.xml | 42 -- .../descriptor/web/sun-web.xml | 23 - .../provider-oneway/descriptor/web/web.xml | 34 - .../descriptor/web/webservices.xml | 42 -- .../provider-oneway/ejb/InterestEJB.java | 50 -- .../provider-oneway/mapping/FIMapping.xml | 28 - .../mapping/FIMappingClient.xml | 28 - .../provider-oneway/mapping/FIMappingWeb.xml | 28 - .../assembly/META-INF/jbi.xml | 43 -- .../su/FindInterest.wsdl | 41 -- .../su/FindInterest_Schema.xsd | 31 - .../su/META-INF/jbi.xml | 27 - .../soap-binding-su-alaska/su/endpoints.xml | 22 - .../web/FindInterestServletImpl.java | 49 -- .../provider-oneway/wscompile_config.xml | 25 - .../wscompile_config_client.xml | 25 - .../provider-oneway/wscompile_config_web.xml | 25 - .../jax-rpc/provider/FindInterest.wsdl | 46 -- .../provider/FindInterestNonHttpBC.wsdl | 41 -- .../jax-rpc/provider/FindInterest_Schema.xsd | 39 -- .../jax-rpc/provider/build.properties | 24 - .../jax-rpc/provider/build.xml | 348 ---------- .../provider/client/FindInterestClient.java | 107 ---- .../client/FindInterestClientNonHttpBC.java | 105 --- .../provider/client/SOAPEjbConsumer.java | 71 --- .../client/SOAPEjbConsumerNonHttpBC.java | 69 -- .../jax-rpc/provider/descriptor/MANIFEST.MF | 3 - .../provider/descriptor/application.xml | 29 - .../provider/descriptor/client/MANIFEST.MF | 3 - .../descriptor/client/application-client.xml | 30 - .../client/sun-application-client.xml | 25 - .../provider/descriptor/ejb/MANIFEST.MF | 3 - .../provider/descriptor/ejb/ejb-jar.xml | 45 -- .../provider/descriptor/ejb/sun-ejb-jar.xml | 34 - .../provider/descriptor/ejb/webservices.xml | 42 -- .../provider/descriptor/web/sun-web.xml | 23 - .../jax-rpc/provider/descriptor/web/web.xml | 34 - .../provider/descriptor/web/webservices.xml | 42 -- .../jax-rpc/provider/ejb/InterestEJB.java | 51 -- .../jax-rpc/provider/mapping/FIMapping.xml | 28 - .../provider/mapping/FIMappingClient.xml | 28 - .../jax-rpc/provider/mapping/FIMappingWeb.xml | 28 - .../assembly/META-INF/jbi.xml | 43 -- .../su/FindInterest.wsdl | 46 -- .../su/FindInterest_Schema.xsd | 39 -- .../su/META-INF/jbi.xml | 31 - .../soap-binding-su-alaska/su/endpoints.xml | 22 - .../soap-binding-su/assembly/META-INF/jbi.xml | 43 -- .../soap-binding-su/su/META-INF/jbi.xml | 31 - .../provider/soap-binding-su/su/endpoints.xml | 42 -- .../provider/web/FindInterestServletImpl.java | 50 -- .../jax-rpc/provider/wscompile_config.xml | 25 - .../provider/wscompile_config_client.xml | 25 - .../jax-rpc/provider/wscompile_config_web.xml | 25 - .../jbi-serviceengine/oneway/build.xml | 199 +++--- .../bundled_wsdl/build.xml | 249 ++++---- .../generated_wsdl/build.xml | 229 +++---- .../security/jse_only/build.xml | 256 ++++---- .../security/jse_only/client/TestClient.java | 4 +- .../server/ejb/hello/stress.xml | 90 +-- .../service_unit/add-numbers/build.xml | 217 ++++--- .../service_unit/compApp-client/build.xml | 177 +++--- .../service_unit/endpoint_mapping/build.xml | 217 ++++--- .../endpoint_mapping_consumer/build.xml | 177 +++--- .../enterprise_app/build.properties | 2 +- .../soapfault/se_consumer/build.xml | 201 +++--- .../soapfault/se_consumerNprovider/build.xml | 192 +++--- .../jbi-serviceengine/soapoverjms/build.xml | 593 +++++++++-------- .../transactions/jse_only/build.xml | 189 +++--- .../transactions/jse_only_ejbcommit/build.xml | 240 +++---- .../jse_only_ejbcommit1/build.xml | 240 +++---- .../jse_only_ejbrollback/build.xml | 240 +++---- .../jse_only_ejbrollback1/build.xml | 240 +++---- .../mapping/j2w/signature/build.properties | 33 - .../mapping/j2w/signature/build.xml | 132 ---- .../mapping/j2w/signature/client/Client.java | 116 ---- .../mapping/j2w/signature/client/MANIFEST.MF | 2 - .../mapping/j2w/signature/config.xml | 25 - .../descriptor/application-client.xml | 32 - .../j2w/signature/descriptor/application.xml | 29 - .../j2w/signature/descriptor/ejb-jar.xml | 41 -- .../descriptor/sun-application-client.xml | 32 - .../j2w/signature/descriptor/sun-ejb-jar.xml | 37 -- .../j2w/signature/descriptor/webservices.xml | 40 -- .../signatureejb/MyDateValueType.java | 58 -- .../signatureejb/MySecondDateValueType.java | 48 -- .../signature/signatureejb/SignatureEJB.java | 87 --- .../signature/signatureejb/SignatureTest.java | 37 -- .../signature/wscompile_config_appclient.xml | 25 - .../j2w/signature/wscompile_config_ejb.xml | 28 - .../devtests/webservice/security/build.xml | 16 +- .../security/ejb3_ssl_cacert/build.xml | 10 + .../security/ejb_ssl_cacert/build.properties | 42 -- .../security/ejb_ssl_cacert/build.xml | 184 ------ .../ejb_ssl_cacert/client/MANIFEST.MF | 2 - .../ejb_ssl_cacert/client/TaxCalClient.java | 137 ---- .../ejb_ssl_cacert/config/config-client.xml | 25 - .../config/config-client.xml.save | 25 - .../ejb_ssl_cacert/config/config-ejb.xml | 25 - .../ejb_ssl_cacert/config/config-sei.xml | 33 - .../ejb_ssl_cacert/descriptor/application.xml | 29 - .../descriptor/client/application-client.xml | 30 - .../client/sun-application-client.xml | 25 - .../ejb_ssl_cacert/descriptor/ejb/ejb-jar.xml | 64 -- .../descriptor/ejb/sun-ejb-jar.xml | 47 -- .../descriptor/ejb/webservices.xml | 53 -- .../descriptor/sun-application.xml | 30 - .../ejb_ssl_cacert/ejb/FedTaxEjb.java | 50 -- .../security/ejb_ssl_cacert/ejb/FedTaxIF.java | 27 - .../ejb_ssl_cacert/ejb/StateTaxEjb.java | 50 -- .../ejb_ssl_cacert/ejb/StateTaxIF.java | 27 - .../ejb_ssl_cacert/wsdl/TaxCalEjbService.wsdl | 60 -- .../servlethandler/build.properties | 37 -- .../webservice/servlethandler/build.xml | 109 ---- .../servlethandler/client/Client.java | 65 -- .../servlethandler/client/MANIFEST.MF | 2 - .../servlethandler/config-interface.xml | 29 - .../descriptor/application-client.xml | 34 - .../descriptor/sun-application-client.xml | 36 -- .../servlethandler/descriptor/sun-web.xml | 32 - .../servlethandler/descriptor/web.xml | 30 - .../servlethandler/descriptor/webservices.xml | 44 -- .../webservice/servlethandler/docroot/README | 2 - .../servlet/ServletHandlerTestImpl.java | 44 -- .../servlethandler/servlet/SimpleHandler.java | 56 -- .../servlethandler/servlet/SimpleServer.java | 25 - .../shared/war/WebServiceServletTest.wsdl | 46 -- .../webservice/shared/war/WebServiceTest.java | 25 - .../shared/war/WebServiceTestImpl.java | 67 -- .../devtests/webservice/shared/war/config.xml | 29 - .../webservice/shared/war/webservices.xml | 34 - .../webservice/simplefault/build.properties | 37 -- .../devtests/webservice/simplefault/build.xml | 104 --- .../webservice/simplefault/client/Client.java | 72 --- .../webservice/simplefault/client/MANIFEST.MF | 2 - .../simplefault/config-interface.xml | 29 - .../descriptor/application-client.xml | 34 - .../simplefault/descriptor/ejb-jar.xml | 31 - .../descriptor/sun-application-client.xml | 36 -- .../simplefault/descriptor/sun-ejb-jar.xml | 32 - .../simplefault/descriptor/webservices.xml | 40 -- .../simplefault/ejb/SimpleSoapException.java | 30 - .../simplefault/ejb/SimpleSoapFaultImpl.java | 62 -- .../simplefault/ejb/SimpleSoapFaultSEI.java | 26 - .../webservice/soapfaults/build.properties | 33 - .../devtests/webservice/soapfaults/build.xml | 172 ----- .../webservice/soapfaults/client/Client.java | 82 --- .../webservice/soapfaults/client/MANIFEST.MF | 2 - .../devtests/webservice/soapfaults/config.xml | 25 - .../descriptor/application-client.xml | 32 - .../soapfaults/descriptor/application.xml | 29 - .../soapfaults/descriptor/ejb-jar.xml | 41 -- .../descriptor/sun-application-client.xml | 36 -- .../soapfaults/descriptor/sun-ejb-jar.xml | 37 -- .../soapfaults/descriptor/webservices.xml | 40 -- .../soapfaults/ejb/SoapFaultsEJB.java | 80 --- .../webservice/soapfaults/soapfaults.wsdl | 139 ---- .../soapfaults/wscompile_config_appclient.xml | 25 - .../soapfaults/wscompile_config_ejb.xml | 25 - .../webstub_properties/build.properties | 37 -- .../webservice/webstub_properties/build.xml | 148 ----- .../webstub_properties/client/Client.java | 73 --- .../webstub_properties/client/MANIFEST.MF | 2 - .../webstub_properties/config-interface.xml | 29 - .../descriptor/application-client.xml | 23 - .../webstub_properties/descriptor/ejb-jar.xml | 31 - .../descriptor/sun-ejb-jar.xml | 33 - .../webstub_properties/descriptor/sun-web.xml | 40 -- .../webstub_properties/descriptor/web.xml | 45 -- .../descriptor/webservices.xml | 40 -- .../webstub_properties/docroot/README | 2 - .../stubprops/SimpleServer.java | 36 -- .../stubprops/SimpleServerImpl.java | 60 -- .../stubprops/TestServlet.java | 78 --- .../wls_dd/service_endpoint_address/build.xml | 95 +-- .../wls_dd/wsdl_exposed_false/build.xml | 130 ++-- .../devtests/webservice/wsi/README | 9 - .../webservice/wsi/faultcode/build.properties | 33 - .../webservice/wsi/faultcode/build.xml | 149 ----- .../wsi/faultcode/client/Client.java | 75 --- .../wsi/faultcode/client/MANIFEST.MF | 2 - .../webservice/wsi/faultcode/config.xml | 25 - .../descriptor/application-client.xml | 32 - .../wsi/faultcode/descriptor/application.xml | 29 - .../wsi/faultcode/descriptor/ejb-jar.xml | 41 -- .../descriptor/sun-application-client.xml | 36 -- .../wsi/faultcode/descriptor/sun-ejb-jar.xml | 37 -- .../wsi/faultcode/descriptor/webservices.xml | 40 -- .../wsi/faultcode/ejb/FaultCodeEJB.java | 52 -- .../webservice/wsi/faultcode/faultcode.wsdl | 61 -- .../faultcode/wscompile_config_appclient.xml | 25 - .../wsi/faultcode/wscompile_config_ejb.xml | 25 - .../webservice/xsdany/build.properties | 33 - .../devtests/webservice/xsdany/build.xml | 149 ----- .../webservice/xsdany/client/Client.java | 73 --- .../webservice/xsdany/client/MANIFEST.MF | 2 - .../devtests/webservice/xsdany/config.xml | 25 - .../xsdany/descriptor/application-client.xml | 32 - .../xsdany/descriptor/application.xml | 29 - .../webservice/xsdany/descriptor/ejb-jar.xml | 41 -- .../descriptor/sun-application-client.xml | 32 - .../xsdany/descriptor/sun-ejb-jar.xml | 37 -- .../xsdany/descriptor/webservices.xml | 40 -- .../webservice/xsdany/ejb/XsdAnyEJB.java | 72 --- .../xsdany/wscompile_config_appclient.xml | 25 - .../xsdany/wscompile_config_ejb.xml | 25 - .../devtests/webservice/xsdany/xsdany.wsdl | 116 ---- 440 files changed, 4162 insertions(+), 20936 deletions(-) delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/GoogleSearch.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/README delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/descriptor/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_partial.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_types.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client/TestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/samplebuild.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloIF.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/TestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/samplebuild.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloIF.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterestNonHttpBC.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest_Schema.xsd delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClientNonHttpBC.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumer.java delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumerNonHttpBC.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/ServletInvoker.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMapping.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMappingClient.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest_Schema.xsd delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/META-INF/jbi.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/endpoints.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/assembly/META-INF/jbi.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/META-INF/jbi.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest_Schema.xsd delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClientNonHttpBC.java delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumer.java delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumerNonHttpBC.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMapping.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingClient.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingWeb.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest_Schema.xsd delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/META-INF/jbi.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/endpoints.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterestNonHttpBC.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest_Schema.xsd delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClient.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClientNonHttpBC.java delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumer.java delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumerNonHttpBC.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMapping.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingClient.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingWeb.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest_Schema.xsd delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/META-INF/jbi.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/endpoints.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/assembly/META-INF/jbi.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/META-INF/jbi.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/config.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MyDateValueType.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MySecondDateValueType.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureTest.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_ejb.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/MANIFEST.MF delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/TaxCalClient.java delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml.save delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/application.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/application-client.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/sun-application-client.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/ejb-jar.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/webservices.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/sun-application.xml delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxIF.java delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxIF.java delete mode 100755 appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/wsdl/TaxCalEjbService.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/docroot/README delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceServletTest.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTest.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/shared/war/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/config.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/soapfaults.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/docroot/README delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/README delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/config.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/faultcode.wsdl delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/client/MANIFEST.MF delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/config.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-application-client.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-ejb-jar.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/webservices.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml delete mode 100644 appserver/tests/appserv-tests/devtests/webservice/xsdany/xsdany.wsdl diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml index e6fb6870d19..658780c3619 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml @@ -29,9 +29,6 @@ - - - @@ -53,7 +50,7 @@ diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml index 36dfdfc1f13..e13a16ea815 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml @@ -64,8 +64,9 @@ value="-keep -b custom-client.xml -d ${build.classes.dir}/client http://${http.host}:${http.port}/${appname}/webservice/AsyncService?WSDL"/> + classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar" + includes="client/**" + /> diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml index dfd257c4bf3..b4058a8ca56 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml @@ -17,14 +17,17 @@ --> - - - - true - - + version="3.0" +> + + + true + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml index ee5b26f3c52..d27bbe27b41 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml @@ -36,9 +36,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml index 48f1716c4cb..3bf875cc54f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml index 09881225ad9..53b52c8e36e 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml index b13b1222f42..8a1a8869635 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml @@ -67,9 +67,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml index 48f1716c4cb..3bf875cc54f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml index 09881225ad9..53b52c8e36e 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml index 323c00ea066..250f69056c7 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml @@ -35,9 +35,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml index 4b99e1e6f8f..2544a8cf739 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml @@ -33,13 +33,10 @@ - - - - + - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml index 48f1716c4cb..3bf875cc54f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml index 09881225ad9..53b52c8e36e 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java index 9a9fdfcfdfa..f188a5f8e75 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java @@ -16,7 +16,9 @@ package endpoint; -@jakarta.jws.WebService (serviceName="junkjunkjunk", portName="SubtractNumbersPortType", endpointInterface="endpoint.SubtractNumbersPortType") +import jakarta.jws.WebService; + +@WebService(serviceName="junkjunkjunk", portName="SubtractNumbersPortType", endpointInterface="endpoint.SubtractNumbersPortType") public class SubtractNumbersImpl implements SubtractNumbersPortType { public int subtractNumbers (int number1, int number2) { diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webservices.xml index b132d4f182d..41260b79942 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webservices.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webservices.xml @@ -17,10 +17,10 @@ --> - + version="2.0" + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd"> SubtractNumbersService SubtractNumbersService diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties deleted file mode 100644 index 6d7128d49ef..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml deleted file mode 100644 index cb619c01ff0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java deleted file mode 100644 index ea2b6816123..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package simplehandler; - -import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.namespace.QName; -import javax.xml.rpc.Stub; -import javax.xml.rpc.Service; -import jakarta.xml.soap.SOAPElement; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import servlet.*; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public static void main (String[] args) { - stat.addDescription("webservices-jaxrpc-handler-injection"); - Client client = new Client(); - client.doTest(args); - stat.printSummary("webservices-jaxrpc-handler-injection"); - } - - public void doTest(String[] args) { - try { - - String targetEndpointAddress = args[0]; - - Context ic = new InitialContext(); - - Service testService = (Service) ic.lookup("java:comp/env/service/simplehandler"); - SimpleServer test = (SimpleServer) - testService.getPort(SimpleServer.class); - - ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - System.out.println("endpoint address = " + targetEndpointAddress); - System.out.println("Invocation returned " + test.sayHello("jerome")); - } catch (Exception ex) { - ex.printStackTrace(); - stat.addStatus("jaxrpc-handler-injection main", stat.FAIL); - System.out.println("CAUGHT UNEXPECTED EXCEPTION: " + ex.getMessage()); - return; - } - stat.addStatus("webservices-jaxrpc-handler-injection", stat.PASS); - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/MANIFEST.MF deleted file mode 100644 index 5085a53cb58..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: simplehandler.Client diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml deleted file mode 100644 index 4b08059b546..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml deleted file mode 100644 index d2d8301fcaf..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - This is my handler app client - handlerClient - - simple handler service ref - service/simplehandler - javax.xml.rpc.Service - META-INF/wsdl/SimpleHandlerServlet.wsdl - SimpleHandlerMapping_servlet.xml - servicens:SimpleHandlerServlet - - ejb.SimpleServer - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-application-client.xml deleted file mode 100644 index a4ce49f86e8..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-application-client.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - service/simplehandler - - ejb.SimpleServer - - com.sun.enterprise.webservice.client.transport.log - file:jaxrpc.log - - - - urn:HandlerTest - SimpleHandlerServer - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-web.xml deleted file mode 100644 index 2089c307eb6..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-web.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - ServletHandlerTest - - ServletHandlerTest - - SimpleServerPort - true - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/web.xml deleted file mode 100644 index e3a3201272e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/web.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - ServletHandlerTest - servlet.ServletHandlerTestImpl - 0 - - - ServletHandlerTest - /ServletHandlerTest - - - stringValue - java.lang.String - injectedValue - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/webservices.xml deleted file mode 100644 index e66dd794387..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/webservices.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - desc - - SimpleHandlerServlet - WEB-INF/wsdl/SimpleHandlerServlet.wsdl - SimpleHandlerMapping_servlet.xml - - port component description - SimpleServerPort - servicens:SimpleServerPort - servlet.SimpleServer - - ServletHandlerTest - - - SimpleHandler - servlet.SimpleHandler - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java deleted file mode 100644 index 891d555abc7..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package servlet; - -import java.rmi.*; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; - -public class ServletHandlerTestImpl implements SessionBean { - SessionContext sc; - - public String sayHello(String hello) throws RemoteException { - return "salut " + hello; - } - - public void ejbCreate() throws RemoteException { - System.out.println("In SimpleServer:::ejbCreate !!"); - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java deleted file mode 100644 index 5a81f198232..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package servlet; - -import java.util.Date; -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.*; -import jakarta.annotation.Resource; - -public class SimpleHandler extends GenericHandler { - - protected HandlerInfo info = null; - -/* - @Resource(name="stringValue") - String injectedString = "undefined"; -*/ - - public void init(HandlerInfo info) { - this.info = info; - } - - public boolean handleRequest(MessageContext context) { -/* - if ("undefined".equals(injectedString)) { - System.out.println("Handler not injected property"); - return false; - } - System.out.println("injectedString = " + injectedString); -*/ - try { - Date startTime = new Date(); - context.setProperty("startTime", startTime); - } catch(Exception e) { - e.printStackTrace(); - } - return true; - } - - public boolean handleResponse(MessageContext context) { - try { - Date startTime = (Date) context.getProperty("startTime"); - Date endTime = new Date(); - long elapsed = endTime.getTime() - startTime.getTime(); - System.out.println(" in handler, elapsed " + elapsed); - } catch(Exception e) { - e.printStackTrace(); - } - return true; - } - - public QName[] getHeaders() { - return new QName[0]; - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java deleted file mode 100644 index 0675cd2976e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package servlet; - -import java.rmi.*; - -public interface SimpleServer extends Remote { - - public String sayHello(String source) throws RemoteException; - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml index 9a5eacae024..df1d91ad38c 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml @@ -20,9 +20,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml index bace84a3466..01ef8c3d282 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml @@ -52,7 +52,8 @@ - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java index 0e2c9768af5..5e67cd9300b 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java @@ -16,9 +16,6 @@ package client; -import jakarta.xml.ws.WebServiceRef; - - import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; public class Client { diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml index 74f9e128ab1..ed1b4a4c38e 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml @@ -36,9 +36,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml index 48f1716c4cb..3bf875cc54f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml index 09881225ad9..53b52c8e36e 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml index c3ec9e96d0a..d5fa374cec0 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml @@ -70,8 +70,9 @@ value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/multiport/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.wsdl"/> + classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar" + includes="client/**" + /> diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml index 60f53c442d7..6c3f1020ea5 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml @@ -35,9 +35,6 @@ - - - @@ -104,7 +101,7 @@ value="-b custom-client.xml -keep -d ${build.classes.dir}/appclient ${env.APS_HOME}/devtests/webservice/annotations/prepkged-svc-1/AddNumbers.wsdl"/> diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml index 713874b0498..d97f17cd205 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml @@ -33,56 +33,58 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml index 85852de2b23..2a2aee08a3b 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml @@ -33,58 +33,57 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml index ef09191cc04..5a9e62205e1 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml @@ -31,91 +31,105 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml index fe3f7364403..4b4fa044762 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml index e6bb2378ce1..23489f9629f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml index 01c9fca6c05..df0b14de3a2 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml @@ -35,10 +35,8 @@ - - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml index 1188534c0ae..3e660e9e8ba 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml @@ -41,9 +41,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml index 48f1716c4cb..3bf875cc54f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml index 09881225ad9..53b52c8e36e 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml index 4931cafae84..d3d5205e335 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml @@ -40,17 +40,13 @@ - + - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml index 48f1716c4cb..3bf875cc54f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml index 09881225ad9..53b52c8e36e 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml index e72a8814342..6569c97d691 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml @@ -32,13 +32,10 @@ &jaxwsTools; - + - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml index 48f1716c4cb..3bf875cc54f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml index 09881225ad9..53b52c8e36e 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml index 16062893915..55113baa638 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml @@ -33,13 +33,10 @@ &testproperties; &jaxwsTools; - + - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml index 48f1716c4cb..3bf875cc54f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml index 09881225ad9..53b52c8e36e 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml @@ -17,19 +17,20 @@ --> - - - - - + version="3.0" +> + + + + - - - + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml index f1f48e9f655..e2a257e0c1b 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml @@ -35,9 +35,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml index 421049388e1..1530e317876 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml @@ -35,9 +35,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml index 8aca3eb0128..751b71cdb80 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml @@ -17,7 +17,7 @@ --> - @@ -33,78 +33,86 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml index 09611632a9c..530d5d5c49b 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml @@ -35,9 +35,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml index 4ae30186392..fb8c04fe8ed 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml @@ -35,9 +35,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml index 8ef10aa9f82..b5073f9e5e4 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml @@ -35,9 +35,6 @@ - - - @@ -78,7 +75,7 @@ + value="-p client -Xendorsed -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/webservices13-clientdds/webservice/SubtractNumbersService?wsdl"/> diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java index 4c9bc4e9dc4..3ecd86622fc 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java @@ -16,7 +16,7 @@ package endpoint; -import jakarta.jws.WebService ; +import jakarta.jws.WebService; @WebService( portName="SubtractNumbersPortType", diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml index 12922e9b7d4..e06d3938d42 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml @@ -35,9 +35,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml index 7c416042cb8..20c6aecc911 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml @@ -31,70 +31,74 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml index d15839ecf9c..f1eba8d61da 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml @@ -17,18 +17,20 @@ --> - - - - - - - - - - - - - + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml index 8ebaf938e7e..dde9e4cf31e 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml @@ -17,18 +17,20 @@ --> - - - - - - - - - - - - - + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/build.xml b/appserver/tests/appserv-tests/devtests/webservice/build.xml index ba142c348eb..e358c815116 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/build.xml @@ -36,59 +36,19 @@ - - - - - - - - + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml b/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml index d6dea534f22..7e6b433cd77 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml @@ -20,9 +20,6 @@ - - - @@ -36,9 +33,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml index 9a35134507c..a5c5765b5dc 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml @@ -48,22 +48,14 @@ - - - - - - - - - - - - - - - - + + + + + + + + @@ -159,6 +151,10 @@ + + + + Current time (ISO): ${TIMESTAMP} diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml index e02613ed6d6..e1f68135e59 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml @@ -33,54 +33,58 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml index 0e3aca64027..e6e4e2b26d6 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml @@ -17,14 +17,16 @@ --> - - - - true - - - + version="3.0" +> + + + true + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml index eafa23efb37..a4f6a98a35f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml @@ -26,72 +26,71 @@ &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml index 67df59bbbf5..a65cc3e085f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml @@ -17,14 +17,16 @@ --> - - - - true - - - + version="3.0" +> + + + true + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml index 5a88fc3fe26..aa86f6d4579 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml @@ -33,72 +33,74 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml index c0a0496b671..89aa341ed1c 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml @@ -25,7 +25,7 @@ - + @@ -43,9 +43,9 @@ - + - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml index 6399029868d..c62159d5410 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml @@ -23,69 +23,68 @@ - - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + &commonBuild; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml index 23fc718881d..1b365953b17 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml @@ -38,9 +38,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml index f788575dd41..2ced4e6abb1 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml @@ -38,9 +38,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml index f788575dd41..2ced4e6abb1 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml @@ -38,9 +38,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml index f788575dd41..2ced4e6abb1 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml @@ -38,9 +38,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml index f788575dd41..2ced4e6abb1 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml @@ -38,9 +38,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml index 911c65c4504..9cea8916dcd 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml @@ -33,61 +33,67 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml index 995cdb6ef70..aafc609df0f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml @@ -33,65 +33,72 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml index cfd00f4b975..1f6ee84df26 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml @@ -33,64 +33,69 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml index 29258f0e782..fccb706f6e5 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml @@ -23,40 +23,43 @@ - &commonBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + &commonBuild; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java index 1caffc30562..311e1b6321a 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java @@ -28,7 +28,7 @@ public class Client { private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests"); - @WebServiceRef(wsdlLocation="http://localhost:8080/HelloImplService/HelloImpl?WSDL") + @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL") static HelloImplService service; public static void main(String[] args) { diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml index df6e1f32c90..ab78ffc5e9a 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml @@ -33,48 +33,52 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml index 563bed3fcb5..d0a7b33fd9f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml @@ -33,65 +33,72 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml index 6acf7fe39d0..9ce747fdb8d 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml @@ -38,9 +38,6 @@ - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml index 6435ae1c16c..ff3d47a24c5 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml @@ -33,49 +33,53 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/GoogleSearch.wsdl b/appserver/tests/appserv-tests/devtests/webservice/google/GoogleSearch.wsdl deleted file mode 100644 index b54422003a1..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/GoogleSearch.wsdl +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/README b/appserver/tests/appserv-tests/devtests/webservice/google/README deleted file mode 100644 index 1129dcffc92..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/README +++ /dev/null @@ -1,3 +0,0 @@ -This test uses a J2EE application client to access Google's Beta -web service called GoogleSearch. It also includes an implementation -of the web service in an ejb. diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/build.properties b/appserver/tests/appserv-tests/devtests/webservice/google/build.properties deleted file mode 100644 index 776d694442d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/build.properties +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/build.xml b/appserver/tests/appserv-tests/devtests/webservice/google/build.xml deleted file mode 100644 index 31b65e4613f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/build.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Usage: - ant all (Executes the WebServices test) - ant contactgoogle (Executes the appclient contacting the Google.com WebServices) - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java deleted file mode 100644 index 6ce28ab9b20..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package google; - -import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.rpc.Stub; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - private String googleKey; - - public static void main (String[] args) { - stat.addDescription("webservices-google"); - Client client = new Client(); - client.doTest(args); - stat.printSummary("webservices-googleID"); - } - - public void doTest(String[] args) { - String word = (args.length == 0) ? - "spellng" : args[0]; - String targetEndpointAddress = (args.length == 2) ? - args[1] : "http://api.google.com/search/beta2"; - - try { - Context ic = new InitialContext(); - - - String googleKey = (String) ic.lookup("java:comp/env/googlekey"); - GoogleSearchService googleSearchService = - (GoogleSearchService) ic.lookup("java:comp/env/service/GoogleSearch"); - GoogleSearchPort googlePort = - googleSearchService.getGoogleSearchPort(); - - ((Stub)googlePort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - System.out.println("Contacting google for a spelling suggestion at " + targetEndpointAddress); - String spellingSuggestion = - googlePort.doSpellingSuggestion(googleKey, word); - System.out.println("Gave google the word '" + word + "' ... " + - " and the suggested spelling is '" + - spellingSuggestion + "'"); - - stat.addStatus("googleclient main", stat.PASS); - - } catch (Exception ex) { - System.out.println("google client test failed"); - ex.printStackTrace(); - stat.addStatus("googleclient main" , stat.FAIL); - //System.exit(15); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/google/client/MANIFEST.MF deleted file mode 100644 index bbc5dde9074..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: google.Client diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml deleted file mode 100644 index 5590d34c524..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - This is my google app client - googleClient - - googlekey - java.lang.String - vCkqMIpV1WMKIRpNa7gBiYQZxDUYOYOj - - - google service ref - service/GoogleSearch - google.GoogleSearchService - META-INF/wsdl/GoogleSearch.wsdl - GoogleMapping_appclient.xml - servicens:GoogleSearchService - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application.xml deleted file mode 100644 index f8709baca39..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Application description - GoogleApp - - google-client.jar - - - google-ejb.jar - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/ejb-jar.xml deleted file mode 100644 index 1ffa8025c7c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/ejb-jar.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Ejb1 - - - GoogleEjb - googleejb.GoogleSearchPort - googleejb.GoogleEJB - Stateless - Container - - - - - - GoogleEjb - ServiceEndpoint - * - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-application-client.xml deleted file mode 100644 index 6b916e19b81..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-application-client.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - service/GoogleSearch - - google.GoogleSearchPort - - - urn:GoogleSearch - GoogleSearchService - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 50713e36049..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - 0 - - GoogleEjb - GoogleEjb - false - false - -1 - - - GoogleSearchPort - googleejb/GoogleSearch - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/webservices.xml deleted file mode 100644 index 8625fc64e91..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/webservices.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - desc - - GoogleServiceEjb - META-INF/wsdl/GoogleSearch.wsdl - GoogleMapping_ejb.xml - - port component description - GoogleSearchPort - googlens:GoogleSearchPort - googleejb.GoogleSearchPort - - - GoogleEjb - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java deleted file mode 100644 index 72056583b7b..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package googleejb; - -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; -import javax.xml.rpc.handler.MessageContext; -import java.security.Principal; - -public class GoogleEJB implements SessionBean { - private SessionContext sc; - - public GoogleEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In GoogleEJB::ejbCreate !!"); - } - - public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) - { - return null; - } - - public String doSpellingSuggestion(java.lang.String key, - java.lang.String phrase) - { - - try { - Principal p = sc.getCallerPrincipal(); - if( p != null ) { - System.out.println("getCallerPrincipal() was successful"); - } else { - throw new EJBException("getCallerPrincipal() returned null"); - } - } catch(Exception e) { - EJBException ejbEx = new EJBException("getCallerPrincipal exception"); - ejbEx.initCause(e); - throw ejbEx; - } - - MessageContext msgContext = sc.getMessageContext(); - System.out.println("msgContext = " + msgContext); - - System.out.println("GoogleEJB.doSpellingSuggestion() called with " + - phrase); - - String returnValue = phrase + "spelling suggestion"; - - System.out.println("GoogleEJB returning " + returnValue); - - return returnValue; - } - - public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) { - return null; - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml deleted file mode 100644 index 5298488c5c8..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml deleted file mode 100644 index beb846c9121..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch.wsdl b/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch.wsdl deleted file mode 100644 index b6186340dbe..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch.wsdl +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_partial.wsdl b/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_partial.wsdl deleted file mode 100644 index 845af9e954b..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_partial.wsdl +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_types.wsdl b/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_types.wsdl deleted file mode 100644 index 8bd283930c5..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_types.wsdl +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties b/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties deleted file mode 100644 index 8c2012e3434..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml deleted file mode 100644 index 04df2c0b245..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml +++ /dev/null @@ -1,312 +0,0 @@ - - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &commonRun; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Usage: - ant all (Executes the WebServices test) - ant contactgoogle (Executes the appclient contacting the Google.com WebServices) - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java deleted file mode 100644 index c8d29994d24..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java +++ /dev/null @@ -1,297 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package googleclient; - -import java.io.*; -import java.util.*; -import java.net.URL; -import javax.naming.*; -import javax.xml.namespace.QName; -import javax.xml.rpc.Stub; -import javax.xml.rpc.Call; -import javax.xml.rpc.Service; -import java.rmi.Remote; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - private static final QName PORT_QNAME = - new QName("urn:GoogleSearch", "GoogleSearchPort"); - private static final QName OPERATION_QNAME = - new QName("urn:GoogleSearch", "doSpellingSuggestion"); - - private String word; - private String targetEndpointAddress; - - public static void main (String[] args) { - - stat.addDescription("googleserver appclient"); - Client client = new Client(args); - client.doTest(); - stat.printSummary("googleserver-applientID"); - } - - public Client(String[] args) { - word = (args.length > 0) ? args[0] : "spellng"; - targetEndpointAddress = (args.length > 1) ? args[1] : null; - } - - public void doTest() { - - try { - Context ic = new InitialContext(); - String googleKey = (String) - ic.lookup("java:comp/env/googlekey"); - GoogleSearchService googleSearchService = (GoogleSearchService) - ic.lookup("java:comp/env/service/GoogleSearch"); - - try { - googleSearchService.getHandlerRegistry(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println - ("Successfully caught unsupported operation exception " + - "for Service.getHandlerRegistry()"); - } - - try { - googleSearchService.getTypeMappingRegistry(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println - ("Successfully caught unsupported operation exception " + - "for Service.getTypeMappingRegistry()"); - } - - doDynamicProxyTest(googleSearchService, googleKey); - - GoogleSearchPort googleSearchPort = - googleSearchService.getGoogleSearchPort(); - doSpellingSuggestion(googleSearchPort, googleKey, - targetEndpointAddress); - - System.out.println("Using dynamic proxy to invoke endpoint"); - Service genericServiceWithWsdl = (Service) - ic.lookup("java:comp/env/service/GoogleSearchProxy"); - - doDynamicProxyTest(genericServiceWithWsdl, googleKey); - - googleSearchPort = (GoogleSearchPort) - genericServiceWithWsdl.getPort(GoogleSearchPort.class); - doSpellingSuggestion(googleSearchPort, googleKey, - targetEndpointAddress); - - doDIINoWSDLTest(ic, googleKey, targetEndpointAddress); - - System.out.println("Doing wsdl override tests"); - - Service partialWsdlServiceGeneric = (Service) - ic.lookup("java:comp/env/service/partialGeneric"); - GoogleSearchPort googleSearch = (GoogleSearchPort) - partialWsdlServiceGeneric.getPort(GoogleSearchPort.class); - googleSearch.doSpellingSuggestion(googleKey, word); - -/** GoogleSearchService partialWsdlServiceGenerated = - (GoogleSearchService) - ic.lookup("java:comp/env/service/partialGenerated"); - googleSearch = partialWsdlServiceGenerated.getGoogleSearchPort(); - googleSearch.doSpellingSuggestion(googleKey, word); -**/ - stat.addStatus("appclient main", stat.PASS); - - - } catch (Exception ex) { - System.out.println("google client test failed"); - ex.printStackTrace(); - stat.addStatus("appclient main" , stat.FAIL); - } - - } - - private void doSpellingSuggestion(GoogleSearchPort googleSearchPort, - String googleKey, - String endpointAddress) - throws Exception { - - if( endpointAddress != null ) { - ((Stub)googleSearchPort)._setProperty - (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress); - System.out.println("Setting target endpoint address to " + - endpointAddress); - } else { - // if not set, use default - endpointAddress = (String) - ((Stub)googleSearchPort)._getProperty - (Stub.ENDPOINT_ADDRESS_PROPERTY); - } - - System.out.println("Contacting google for spelling " + - "suggestion at " + endpointAddress); - - String spellingSuggestion = - googleSearchPort.doSpellingSuggestion(googleKey, word); - System.out.println("Gave google the word '" + word + "' ... " + - " and the suggested spelling is '" + - spellingSuggestion + "'"); - } - - private void doDynamicProxyTest(Service service, String googleKey) throws Exception { - - Call c1 = service.createCall(); - Call c2 = service.createCall(PORT_QNAME); - Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME); - Call c4 = service.createCall(PORT_QNAME, - OPERATION_QNAME.getLocalPart()); - Call[] calls = service.getCalls(PORT_QNAME); - - if( targetEndpointAddress != null ) { - c3.setTargetEndpointAddress(targetEndpointAddress); - } - Object params[] = new Object[] {googleKey, "hello" }; - String response = (String) c3.invoke(params); - System.out.println("Response = " + response); - - // container-managed port selection - GoogleSearchPort sei = (GoogleSearchPort) - service.getPort(GoogleSearchPort.class); - sei = (GoogleSearchPort) - service.getPort(PORT_QNAME, GoogleSearchPort.class); - - QName serviceName = service.getServiceName(); - URL wsdlLocation = service.getWSDLDocumentLocation(); - if( wsdlLocation != null ) { - System.out.println("wsdlLocation = " + wsdlLocation); - } - Iterator ports = service.getPorts(); - - System.out.println("Calling oneway operation"); - Call oneway = service.createCall(PORT_QNAME, "helloOneWay"); - if( targetEndpointAddress != null ) { - oneway.setTargetEndpointAddress(targetEndpointAddress); - } - - long oneWayMethodWaitTimeInMillis = 7000; - - Date before = new Date(); - oneway.invokeOneWay(new Object[] - { oneWayMethodWaitTimeInMillis + "" }); - Date after = new Date(); - long elapsedTime = after.getTime() - before.getTime(); - System.out.println("one way operation began at " + before + - " and returned at " + after + - " and took " + elapsedTime + " milli-seconds"); - if( elapsedTime > oneWayMethodWaitTimeInMillis ) { - throw new Exception("one way operation blocked for too long "); - } - - // now wait for the remainder of the time. this is to - // avoid race conditions where we finish the test and begin - // to undeploy, but the endpoint is still executing its - // oneway operation. - long sleepTime = (oneWayMethodWaitTimeInMillis - elapsedTime); - - System.out.println("now sleeping for " + sleepTime + " milli secs"); - Thread.sleep(sleepTime); - System.out.println("returning from doDynamicProxyTest"); - } - - private void doDIINoWSDLTest(Context ic, String googleKey, - String endpointAddress) throws Exception { - - System.out.println("Doing DII without WSDL tests"); - - Service service =(Service) ic.lookup("java:comp/env/service/DIINoWSDL"); - - try { - Call call = service.createCall(PORT_QNAME); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.createCall(QName port)"); - } - - try { - Call call = service.createCall(PORT_QNAME, OPERATION_QNAME); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getCall(QName, QName)"); - } - - - try { - Call call = service.createCall(PORT_QNAME, "doSpellingSuggestion"); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getCall(QName, String)"); - } - - try { - Call[] calls = service.getCalls(PORT_QNAME); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getCalls()"); - } - - try { - service.getHandlerRegistry(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println - ("Successfully caught unsupported operation exception " + - "for Service.getHandlerRegistry()"); - } - - try { - Remote remote = service.getPort(GoogleSearchPort.class); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getPort(SEI)"); - } - - try { - Remote remote = service.getPort(PORT_QNAME, GoogleSearchPort.class); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getPort(QName, SEI)"); - } - - try { - Iterator ports = service.getPorts(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getPorts()"); - } - - try { - QName serviceName = service.getServiceName(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println("Successfully caught unsupported operation " + - "for Service.getName()"); - } - - try { - service.getTypeMappingRegistry(); - } catch(java.lang.UnsupportedOperationException uoe) { - System.out.println - ("Successfully caught unsupported operation exception " + - "for Service.getTypeMappingRegistry()"); - } - - Call untypedCall = service.createCall(); - - } -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java deleted file mode 100644 index 36d796060c4..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package googleclient; - -import java.util.Map; - -import javax.xml.rpc.handler.Handler; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.namespace.QName; - -import javax.naming.InitialContext; - -public class ClientHandler extends GenericHandler { - - public void destroy() { - System.out.println("In ClientHandler::destroy()"); - } - - public QName[] getHeaders() { - return new QName[0]; - } - - public boolean handleFault(MessageContext context) { - System.out.println("In ClientHandler::handleFault()"); - return true; - } - - public boolean handleRequest(MessageContext context) { - System.out.println("In ClientHandler::handleRequest()"); - return true; - } - - public boolean handleResponse(MessageContext context) { - System.out.println("In ClientHandler::handleResponse()"); - return true; - } - - public void init(HandlerInfo config) { - System.out.println("In ClientHandler::init()"); - try { - InitialContext ic = new InitialContext(); - String googleKey = (String) ic.lookup("java:comp/env/googlekey"); - System.out.println("google key = " + googleKey); - } catch(Exception e) { - e.printStackTrace(); - } - - System.out.println("Handler init params = " + - config.getHandlerConfig()); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/MANIFEST.MF deleted file mode 100644 index 6541a727892..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: googleclient.Client diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml deleted file mode 100644 index 4e7445a1be8..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - This is my google app client - googleserverClient - - googlekey - java.lang.String - vCkqMIpV1WMKIRpNa7gBiYQZxDUYOYOj - - - google service ref - MY GOOGLE SERVICE REF DISPLAY name - service/GoogleSearch - googleclient.GoogleSearchService - META-INF/wsdl/GoogleSearch.wsdl - GoogleMapping_appclient.xml - - googleclient.GoogleSearchPort - - GoogleSearchEjbPort - - - handler 1 - handler1 - googleclient.ClientHandler - - param1 description - a - b - - googlens:DirectoryCategory - - Role1 - Role2 - GoogleSearchPort - - - - dynamic proxy google service ref - service/GoogleSearchProxy - javax.xml.rpc.Service - META-INF/wsdl/GoogleSearch.wsdl - googleclient.model - - googleclient.GoogleSearchPort - - - - handler 1 - handler1 - googleclient.ClientHandler - - param description - c - d - - - - - dii google service ref - service/DIINoWSDL - javax.xml.rpc.Service - - - partial wsdl test google service ref - service/partialGeneric - javax.xml.rpc.Service - META-INF/wsdl/GoogleSearch_partial.wsdl - GoogleMapping_appclient.xml - - googleclient.GoogleSearchPort - - googleserver-web.war#GoogleSearchPort - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application.xml deleted file mode 100644 index 8559847826e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Application description - GoogleServerApp - - - googleserver-web.war - - - - - googleserver-client.jar - - - googleserver-ejb.jar - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/ejb-jar.xml deleted file mode 100644 index 6a7e35ed9cf..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/ejb-jar.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Ejb1 - - - GoogleEjb - googleserver.GoogleSearchPort - googleserver.GoogleEJB - Stateless - Container - - entry1 - java.lang.String - Blah - - - service ref for web endpoint - service/WebDIIReference - javax.xml.rpc.Service - META-INF/wsdl/GoogleSearch.wsdl - GoogleMapping_ejb.xml - - googleserver.GoogleSearchPort - - googleserver-web.war#GoogleSearchPort - - - - foo - User - - - - - - - - - User - - - Admin - - - User - - GoogleEjb - ServiceEndpoint - doGoogleSearch - - - GoogleEjb - ServiceEndpoint - doSpellingSuggestion - - - - - GoogleEjb - ServiceEndpoint - * - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application-client.xml deleted file mode 100644 index 7a3aa87c3c2..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application-client.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - service/GoogleSearch - - googleclient.GoogleSearchPort - - - urn:GoogleSearch - GoogleSearchPort - - - javax.xml.rpc.security.auth.username - j2ee - - - javax.xml.rpc.security.auth.password - j2ee - - - javax.xml.rpc.security.auth.username - j2ee - - - javax.xml.rpc.security.auth.password - j2ee - - - - - service/GoogleSearchProxy - - googleclient.GoogleSearchPort - - - urn:GoogleSearch - GoogleSearchPort - - - javax.xml.rpc.service.endpoint.address - http://localhost:8000/google/GoogleSearch - - - javax.xml.rpc.security.auth.username - j2ee - - - javax.xml.rpc.security.auth.password - j2ee - - - javax.xml.rpc.security.auth.username - j2ee - - - javax.xml.rpc.security.auth.password - j2ee - - - - - service/partialGeneric - file:GoogleSearch_final.wsdl - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml deleted file mode 100644 index c534d7853d9..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - googleserver-web.war - GoogleServlet - - - User - staff - - - Admin - staff - eng - mgr - guest - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 5a1c38f3fba..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - 0 - - GoogleEjb - GoogleEjb - false - false - -1 - - - GoogleSearchEjbPort - google/GoogleSearch - - BASIC - - - - - GoogleServiceEjb - - file:publish - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/sun-web.xml deleted file mode 100644 index 89b43b9308f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/sun-web.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - service/EjbDIIReference - - googleserverweb.GoogleSearchPort - - - urn:GoogleSearch - GoogleSearchPort - - - javax.xml.rpc.security.auth.username - j2ee - - - javax.xml.rpc.security.auth.password - j2ee - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/web.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/web.xml deleted file mode 100644 index 07da28298b1..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/web.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - GoogleWebApp - - GoogleServlet - googleserverweb.GoogleServletImpl - 0 - - - GoogleServlet - /GoogleSearch - - - 54 - - - entry1 - java.lang.String - Blah - - - service ref for ejb endpoint - service/EjbDIIReference - javax.xml.rpc.Service - WEB-INF/wsdl/GoogleSearch.wsdl - googleweb.model - googlens:GoogleSearchService - - googleserverweb.GoogleSearchPort - - googleserver-ejb.jar#GoogleSearchEjbPort - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/webservices.xml deleted file mode 100644 index a4338289bc4..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/webservices.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - desc - - GoogleServiceServlet - WEB-INF/wsdl/GoogleSearch.wsdl - googleweb.model - - port component description - GoogleSearchPort - googlens:GoogleSearchPort - googleserverweb.GoogleSearchPort - - - GoogleServlet - - - handler 1 - handler1 - googleserverweb.FooHandler - - param1 description - a - b - - googlens:DirectoryCategory - Role1 - Role2 - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/webservices.xml deleted file mode 100644 index 804e42a6834..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/webservices.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - desc - - GoogleServiceEjb - META-INF/wsdl/GoogleSearch.wsdl - GoogleMapping_ejb.xml - - port component description - GoogleSearchEjbPort - googlens:GoogleSearchPort - googleserver.GoogleSearchPort - - - GoogleEjb - - - handler 1 - handler1 - googleserver.FooHandler - - param1 description - a - b - - googlens:DirectoryCategory - Role1 - Role2 - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java deleted file mode 100644 index abe2723eb5e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package googleserver; - -import java.util.Map; - -import javax.xml.rpc.handler.Handler; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.namespace.QName; - -import javax.naming.InitialContext; - -public class FooHandler extends GenericHandler { - - public void destroy() { - System.out.println("In FooHandler::destroy()"); - } - - public QName[] getHeaders() { - return new QName[0]; - } - - public boolean handleFault(MessageContext context) { - System.out.println("In FooHandler::handleFault()"); - return true; - } - - public boolean handleRequest(MessageContext context) { - System.out.println("In FooHandler::handleRequest()"); - return true; - } - - public boolean handleResponse(MessageContext context) { - System.out.println("In FooHandler::handleResponse()"); - return true; - } - - public void init(HandlerInfo config) { - System.out.println("In FooHandler::init()"); - try { - InitialContext ic = new InitialContext(); - String envEntry = (String) ic.lookup("java:comp/env/entry1"); - System.out.println("env-entry = " + envEntry); - } catch(Exception e) { - e.printStackTrace(); - } - - System.out.println("Handler init params = " + - config.getHandlerConfig()); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java deleted file mode 100644 index cc37d86cc4d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package googleserver; - -import java.util.Iterator; -import java.util.Date; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.Service; -import javax.xml.rpc.Call; -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; - -public class GoogleEJB implements SessionBean { - private SessionContext sc; - - private static final QName PORT_QNAME = - new QName("urn:GoogleSearch", "GoogleSearchPort"); - private static final QName OPERATION_QNAME = - new QName("urn:GoogleSearch", "doSpellingSuggestion"); - - public GoogleEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In GoogleEJB::ejbCreate !!"); - } - - public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) - { - return null; - } - - public String doSpellingSuggestion(java.lang.String key, - java.lang.String phrase) - { - - try { - InitialContext ic = new InitialContext(); - String entry1 = (String) ic.lookup("java:comp/env/entry1"); - System.out.println("java:comp/env/entry1 = " + entry1); - } catch(Exception e) { - e.printStackTrace(); - throw new EJBException(e.getMessage(), e); - } - - MessageContext msgContext = sc.getMessageContext(); - - System.out.println("GoogleEJB.doSpellingSuggestion() called with " + - phrase); - - try { - java.security.Principal principal = sc.getCallerPrincipal(); - System.out.println("GoogleEJB.doSpellingSuggestion():getCallerPrincipal() = " + principal); - if(principal == null) { - throw new EJBException("GoogleEJB.doSpellingSuggestion():getCallerPrincipal() cannot return NULL"); - } - } catch (Exception ex) { - ex.printStackTrace(); - throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught - ", ex); - } - - try { - boolean result = sc.isCallerInRole("foo"); - System.out.println( - "GoogleEJB.doSpellingSuggestion():isCallerInRole(foo) returned - " + result); - if(!result) { - throw new EJBException("GoogleEJB.doSpellingSuggestion():isCallerInRole(foo) should not have returned false"); - } - } catch (Exception ex) { - ex.printStackTrace(); - throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught in isCallerInRole(foo) call ", ex); - } - - String returnValue = "spelling suggestion from ejb"; - if( phrase.equals("forwardweb") ) { - System.out.println("Forwarding spelling suggestion to webendpoint"); - Service genericServiceWithWSDL = null; - try { - InitialContext ic = new InitialContext(); - Service service = (Service) - ic.lookup("java:comp/env/service/WebDIIReference"); - doDynamicProxyTest(service); - GoogleSearchPort webPort = (GoogleSearchPort) - service.getPort(GoogleSearchPort.class); - returnValue = webPort.doSpellingSuggestion(key, phrase); - } catch(Exception e) { - e.printStackTrace(); - throw new EJBException(e.getMessage(), e); - } - } - - System.out.println("GoogleEJB returning " + returnValue); - return returnValue; - } - - public void helloOneWay(String s1) { - - System.out.println("In GoogleEJB::helloOneWay. param = " + - s1); - System.out.println("Sleeping for " + s1 + " milliseconds starting " - + " at " + new Date()); - - try { - Thread.sleep((new Integer(s1)).intValue()); - } catch(Exception e) { - e.printStackTrace(); - } - System.out.println("Exiting GoogleEJB:helloOneWay at " + - new Date()); - } - - public googleserver.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) { - return null; - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} - - private void doDynamicProxyTest(Service service) throws Exception { - - Call c1 = service.createCall(); - Call c2 = service.createCall(PORT_QNAME); - Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME); - Call c4 = service.createCall(PORT_QNAME, - OPERATION_QNAME.getLocalPart()); - Call[] calls = service.getCalls(PORT_QNAME); - - // container-managed port selection - GoogleSearchPort sei = (GoogleSearchPort) - service.getPort(GoogleSearchPort.class); - sei = (GoogleSearchPort) - service.getPort(PORT_QNAME, GoogleSearchPort.class); - - QName serviceName = service.getServiceName(); - URL wsdlLocation = service.getWSDLDocumentLocation(); - if( wsdlLocation != null ) { - System.out.println("wsdlLocation = " + wsdlLocation); - } - Iterator ports = service.getPorts(); - - } - - - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java deleted file mode 100644 index 7f11da1c15e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package standalone; - -import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.rpc.Stub; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class StandAloneClient { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - private String word; - private String targetEndpointAddress; - private String googleKey; - - public static void main (String[] args) { - stat.addDescription("googleserver standalone"); - StandAloneClient client = new StandAloneClient(args); - client.doTest(); - stat.printSummary("googleserver-standaloneID"); - } - - public StandAloneClient(String[] args) { - word = (args.length > 0) ? "spellng" : args[0]; - targetEndpointAddress = (args.length > 1) ? - args[1] : "http://api.google.com/search/beta2"; - googleKey = (args.length > 2) ? - args[2] : "vCkqMIpV1WMKIRpNa7gBiYQZxDUYOYOj"; - } - - public void doTest() { - try { - GoogleSearchService googleSearchService = - new GoogleSearchService_Impl(); - - GoogleSearchPort googleSearchPort = - googleSearchService.getGoogleSearchPort(); - - ((Stub)googleSearchPort)._setProperty - (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - ((Stub)googleSearchPort)._setProperty - (Stub.USERNAME_PROPERTY, "j2ee"); - ((Stub)googleSearchPort)._setProperty - (Stub.PASSWORD_PROPERTY, "j2ee"); - - System.out.println("Contacting google for spelling suggestion at " - + targetEndpointAddress); - String spellingSuggestion = - googleSearchPort.doSpellingSuggestion(googleKey, word); - System.out.println("Gave google the word '" + word + "' ... " + - " and the suggested spelling is '" + - spellingSuggestion + "'"); - - stat.addStatus("appclient main", stat.PASS); - - } catch (Exception ex) { - System.out.println("google client test failed"); - ex.printStackTrace(); - stat.addStatus("appclient main" , stat.FAIL); - - } - - } - -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java deleted file mode 100644 index cbe53fffa3e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package googleserverweb; - -import java.util.Map; - -import javax.xml.rpc.handler.Handler; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.namespace.QName; - -import javax.naming.InitialContext; - -public class FooHandler extends GenericHandler { - - public void destroy() { - System.out.println("In FooHandler::destroy()"); - } - - public QName[] getHeaders() { - return new QName[0]; - } - - public boolean handleFault(MessageContext context) { - System.out.println("In FooHandler::handleFault()"); - return true; - } - - public boolean handleRequest(MessageContext context) { - System.out.println("In FooHandler::handleRequest()"); - return true; - } - - public boolean handleResponse(MessageContext context) { - System.out.println("In FooHandler::handleResponse()"); - return true; - } - - public void init(HandlerInfo config) { - System.out.println("In FooHandler::init()"); - try { - InitialContext ic = new InitialContext(); - String envEntry = (String) ic.lookup("java:comp/env/entry1"); - System.out.println("env-entry = " + envEntry); - } catch(Exception e) { - e.printStackTrace(); - } - - System.out.println("Handler init params = " + - config.getHandlerConfig()); - } - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java deleted file mode 100644 index b41c202a3be..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package googleserverweb; - -import java.util.Date; -import java.util.Iterator; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.rpc.Call; -import java.io.Serializable; -import java.rmi.RemoteException; -import javax.naming.*; -import javax.xml.rpc.Service; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.namespace.QName; - -public class GoogleServletImpl implements jakarta.servlet.SingleThreadModel, ServiceLifecycle { - - private static final QName PORT_QNAME = - new QName("urn:GoogleSearch", "GoogleSearchPort"); - private static final QName OPERATION_QNAME = - new QName("urn:GoogleSearch", "doSpellingSuggestion"); - - private boolean gotInit = false; - - public GoogleServletImpl() { - System.out.println("GoogleServletImpl() instantiated"); - } - - public void init(Object context) { - System.out.println("Got ServiceLifecycle::init call " + context); - gotInit = true; - } - - public void destroy() { - System.out.println("Got ServiceLifecycle::destroy call"); - } - - public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) - { - return null; - } - - public void helloOneWay(String s1) { - - System.out.println("In GoogleServletImpl::helloOneWay. param = " + - s1); - System.out.println("Sleeping for " + s1 + " milliseconds starting " - + " at " + new Date()); - - try { - Thread.sleep((new Integer(s1)).intValue()); - } catch(Exception e) { - e.printStackTrace(); - } - System.out.println("Exiting GoogleServletImpl:helloOneWay at " + - new Date()); - } - - public String doSpellingSuggestion(java.lang.String key, - java.lang.String phrase) - - throws RemoteException { - System.out.println("GoogleServletImpl.doSpellingSuggestion() " + - " called with " + phrase); - - if( !gotInit ) { - throw new RuntimeException("Got business method before init()"); - } - - String returnValue = "spelling suggestion from web"; - if( phrase.equals("forwardejb") ) { - System.out.println("Forwarding spelling suggestion to ejbendpoint"); - Service genericServiceWithWSDL = null; - try { - InitialContext ic = new InitialContext(); - Service service = (Service) - ic.lookup("java:comp/env/service/EjbDIIReference"); - doDynamicProxyTest(service); - GoogleSearchPort ejbPort = (GoogleSearchPort) - service.getPort(GoogleSearchPort.class); - returnValue = ejbPort.doSpellingSuggestion(key, phrase); - } catch(Exception e) { - e.printStackTrace(); - throw new RemoteException(e.getMessage(), e); - } - } - - System.out.println("GoogleServletImpl returning " + returnValue); - return returnValue; - } - - public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) { - return null; - } - - private void doDynamicProxyTest(Service service) throws Exception { - - Call c1 = service.createCall(); - Call c2 = service.createCall(PORT_QNAME); - Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME); - Call c4 = service.createCall(PORT_QNAME, - OPERATION_QNAME.getLocalPart()); - Call[] calls = service.getCalls(PORT_QNAME); - - // container-managed port selection - GoogleSearchPort sei = (GoogleSearchPort) - service.getPort(GoogleSearchPort.class); - sei = (GoogleSearchPort) - service.getPort(PORT_QNAME, GoogleSearchPort.class); - - QName serviceName = service.getServiceName(); - URL wsdlLocation = service.getWSDLDocumentLocation(); - if( wsdlLocation != null ) { - System.out.println("wsdlLocation = " + wsdlLocation); - } - Iterator ports = service.getPorts(); - - } - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml deleted file mode 100644 index 5634c14d340..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml deleted file mode 100644 index f1a81167386..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml deleted file mode 100644 index 99ad91c14f1..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml deleted file mode 100644 index db0ca772381..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties b/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties deleted file mode 100644 index 389fdeb84d0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml deleted file mode 100644 index dec7290b1fd..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java deleted file mode 100644 index 073cb49f014..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package simplehandler; - -import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.namespace.QName; -import javax.xml.rpc.Stub; -import javax.xml.rpc.Service; -import jakarta.xml.soap.SOAPElement; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import ejb.*; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public static void main (String[] args) { - stat.addDescription("webservices-simple-soapfault"); - Client client = new Client(); - client.doTest(args); - stat.printSummary("webservices-soapfaultID"); - } - - public void doTest(String[] args) { - try { - - String targetEndpointAddress = args[0]; - - Context ic = new InitialContext(); - - Service testService = (Service) ic.lookup("java:comp/env/service/simplehandler"); - SimpleServer test = (SimpleServer) - testService.getPort(SimpleServer.class); - - ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - System.out.println("endpoint address = " + targetEndpointAddress); - System.out.println("Invocation returned " + test.sayHello("jerome")); - } catch (Exception ex) { - ex.printStackTrace(); - stat.addStatus("soapfaultsclient main", stat.FAIL); - System.out.println("CAUGHT UNEXPECTED EXCEPTION: " + ex.getMessage()); - } - - stat.addStatus("soapfaultsclient main", stat.PASS); - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/handler/client/MANIFEST.MF deleted file mode 100644 index 5085a53cb58..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: simplehandler.Client diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml deleted file mode 100644 index d7dba236658..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml deleted file mode 100644 index cb7fbe093ff..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - This is my handler app client - handlerClient - - simple handler service ref - service/simplehandler - javax.xml.rpc.Service - META-INF/wsdl/SimpleHandlerServer.wsdl - SimpleHandlerMapping_ejb.xml - servicens:SimpleHandlerServer - - ejb.SimpleServer - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/ejb-jar.xml deleted file mode 100644 index f42856d2026..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/ejb-jar.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - Ejb1 - - - SimpleHandlerEJB - ejb.SimpleServer - ejb.SimpleServerImpl - Stateless - Container - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-application-client.xml deleted file mode 100644 index a4ce49f86e8..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-application-client.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - service/simplehandler - - ejb.SimpleServer - - com.sun.enterprise.webservice.client.transport.log - file:jaxrpc.log - - - - urn:HandlerTest - SimpleHandlerServer - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-ejb-jar.xml deleted file mode 100644 index fdeffbe832a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - SimpleHandlerEJB - SimpleHandlerEJB - - SimpleServerPort - simplehandler - true - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/webservices.xml deleted file mode 100644 index a6885105d7e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/webservices.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - desc - - SimpleHandlerServer - META-INF/wsdl/SimpleHandlerServer.wsdl - SimpleHandlerMapping_ejb.xml - - port component description - SimpleServerPort - servicens:SimpleServerPort - ejb.SimpleServer - - SimpleHandlerEJB - - - ejb.SimpleHandler - ejb.SimpleHandler - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java deleted file mode 100644 index d2ac35b7053..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package ejb; - -import java.util.Date; -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.*; - -public class SimpleHandler extends GenericHandler { - - protected HandlerInfo info = null; - - public void init(HandlerInfo info) { - this.info = info; - } - - public boolean handleRequest(MessageContext context) { - try { - Date startTime = new Date(); - context.setProperty("startTime", startTime); - } catch(Exception e) { - e.printStackTrace(); - } - return true; - } - - public boolean handleResponse(MessageContext context) { - try { - Date startTime = (Date) context.getProperty("startTime"); - Date endTime = new Date(); - long elapsed = endTime.getTime() - startTime.getTime(); - System.out.println(" in handler, elapsed " + elapsed); - } catch(Exception e) { - e.printStackTrace(); - } - return true; - } - - public QName[] getHeaders() { - return new QName[0]; - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java deleted file mode 100644 index 653d44c2345..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package ejb; - -import java.rmi.*; - -public interface SimpleServer extends Remote { - - public String sayHello(String source) throws RemoteException; - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java deleted file mode 100644 index 27b2aadeef4..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package ejb; - -import java.rmi.*; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; - -public class SimpleServerImpl implements SessionBean { - SessionContext sc; - - public String sayHello(String hello) throws RemoteException { - return "salut " + hello; - } - - public void ejbCreate() throws RemoteException { - System.out.println("In SimpleServer:::ejbCreate !!"); - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties deleted file mode 100644 index 6c58733239f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml deleted file mode 100644 index a5be6efc617..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - -]> - - - - - - - - - - - &jaxrpctargets; - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-sun-web.xml deleted file mode 100644 index 000e37668f2..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-sun-web.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml deleted file mode 100644 index dccfbc04a86..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - A test application - WebTier - - centralServlet - RequestProcessor - client.Client - - - RequestProcessor - /RequestProcessor - - - - 54 - - - service/MyHelloService - helloservice.MyHelloService - WEB-INF/wsdl/hello.wsdl - WEB-INF/hello-mapping.xml - - helloservice.HelloIF - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client/TestClient.java deleted file mode 100644 index 7628c1e7353..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client/TestClient.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package client; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class TestClient { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public boolean found1 = false; - public boolean found2 = false; - - public static void main (String[] args) { - stat.addDescription("jaxrpc ejb"); - TestClient client = new TestClient(); - client.doTest(args); - stat.printSummary("jaxrpc-ejb"); - } - - public void doTest(String[] args) { - - String url = args[0]; - try { - int code = invokeServlet(url); - report(code); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private int invokeServlet(String url) throws Exception { - log("Invoking url = " + url); - URL u = new URL(url); - HttpURLConnection c1 = (HttpURLConnection)u.openConnection(); - int code = c1.getResponseCode(); - InputStream is = c1.getInputStream(); - BufferedReader input = new BufferedReader (new InputStreamReader(is)); - String line = null; - while ((line = input.readLine()) != null) { - log(line); - if(line.indexOf("So the RESULT OF jaxrpc web SERVICE IS") != -1) - found1 = true; - if(line.indexOf("[Hello All]") != -1) - found2 = true; - } - return code; - } - - private void report(int code) { - if(code != 200) { - log("Incorrect return code: " + code); - fail(); - } - if(!found1) { - fail(); - } - if(!found2) { - fail(); - } - pass(); - } - - private void log(String message) { - System.out.println("[client.TestClient]:: " + message); - } - - private void pass() { - stat.addStatus("jaxrpc-ejb", stat.PASS); - } - - private void fail() { - stat.addStatus("jaxrpc-ejb", stat.FAIL); - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml deleted file mode 100644 index b13a5753f87..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml deleted file mode 100644 index 54a2454524e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/ejb-jar.xml deleted file mode 100644 index 097927e9e4f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/ejb-jar.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - -HelloEJB -HelloEJB -helloservice.HelloIF -helloservice.HelloImpl -Stateless -Container - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/samplebuild.properties b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/samplebuild.properties deleted file mode 100644 index 74f8a768a18..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/samplebuild.properties +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -example=helloservice -wsdl.file=MyHelloEJBService.wsdl -ear.file=jaxrpc-hello-ejb.ear -ejbjar.file=jaxrpc-hello-ejb.jar -ear.name=jaxrpc-hello-ejb.ear -earname=jaxrpc-hello-ejb - -config.interface.file=config-interface.xml -config.wsdl.file=config-wsdl.xml -mapping.file=mapping.xml -build= build -assemble=assemble -assemble.war=${assemble}/war -assemble.ear=${assemble}/ear - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloIF.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloIF.java deleted file mode 100644 index af0f518dbfd..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloIF.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package helloservice; - -import java.rmi.Remote; -import java.rmi.RemoteException; - - -public interface HelloIF extends Remote { - public String sayHello(String s) throws RemoteException; -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloImpl.java deleted file mode 100644 index aede9114e5f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package helloservice; - -import java.io.*; - - -public class HelloImpl implements HelloIF { - public String message = "Hello "; - - public String sayHello(String s) { - return message + s; - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/sun-ejb-jar.xml deleted file mode 100644 index 86b97144d97..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/sun-ejb-jar.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - 0 - - HelloEJB - - HelloIF - /hello-jaxrpc-ejb/hello - - urn:Foo - MyHelloService - - true - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java deleted file mode 100644 index e48c4752785..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package client; - -import jakarta.servlet.*; -import java.io.IOException; -import java.io.PrintWriter; -import javax.naming.InitialContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import javax.xml.rpc.Stub; -import helloservice.*; - - -public class Client extends HttpServlet { - - - public void doGet(HttpServletRequest req, HttpServletResponse resp) - throws jakarta.servlet.ServletException { - doPost(req, resp); - } - - public void doPost(HttpServletRequest req, HttpServletResponse resp) - throws jakarta.servlet.ServletException { - try { - String targetEndpointAddress = "http://HTTP_HOST:HTTP_PORT/hello-jaxrpc-ejb/hello";//?wsdl - InitialContext ic = new InitialContext(); - - MyHelloService myHelloService = - (MyHelloService) ic.lookup( - "java:comp/env/service/MyHelloService"); - - HelloIF helloPort = myHelloService.getHelloIFPort(); - ((Stub)helloPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - String ret= helloPort.sayHello("All"); - - PrintWriter out = resp.getWriter(); - resp.setContentType("text/html"); - out.println(""); - out.println(""); - out.println("TestServlet"); - out.println(""); - out.println(""); - out.println("

"); - out.println("So the RESULT OF jaxrpc web SERVICE IS :"); - out.println("

"); - out.println("[" + ret + "]"); - out.println(""); - out.println(""); - out.flush(); - out.close(); - } catch(Exception e) { - e.printStackTrace(); - } - } -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webservices.xml deleted file mode 100644 index 0e8a818b114..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webservices.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - -MyHelloService -MyHelloService -META-INF/wsdl/MyHelloService.wsdl -build/mapping.xml - -HelloIF -HelloIF -wsdl-port_ns__:HelloIFPort -helloservice.HelloIF - -HelloEJB - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties deleted file mode 100644 index 9a608f5f477..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml deleted file mode 100644 index 448785b7ee5..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - -]> - - - - - - - - - - - &jaxrpctargets; - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-sun-web.xml deleted file mode 100644 index 000e37668f2..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-sun-web.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml deleted file mode 100644 index dccfbc04a86..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - A test application - WebTier - - centralServlet - RequestProcessor - client.Client - - - RequestProcessor - /RequestProcessor - - - - 54 - - - service/MyHelloService - helloservice.MyHelloService - WEB-INF/wsdl/hello.wsdl - WEB-INF/hello-mapping.xml - - helloservice.HelloIF - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/Client.java deleted file mode 100644 index 3354283546e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/Client.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package client; - -/*import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.namespace.QName; -import javax.xml.rpc.Stub; -import helloservice.*; -import javax.xml.rpc.Service; -import jakarta.xml.soap.SOAPElement; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -*/ -public class Client { - - /* private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public static void main (String[] args) { - stat.addDescription("jaxrpc-hello-web-client"); - Client client = new Client(); - client.doTest(args); - stat.printSummary("jaxrpc-hello-web-client"); - } - - public void doTest(String[] args) { - try { - - String targetEndpointAddress = args[0]; - Context ic = new InitialContext(); - - MyHelloService myHelloService = - (MyHelloService) ic.lookup( - "java:comp/env/service/helloservice"); - - HelloIF helloPort = myHelloService.getHelloIFPort(); - - - ((Stub)helloPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - System.out.println("endpoint address = " + targetEndpointAddress); - System.out.println("Invocation returned " + helloPort.sayHello("All")); - } catch (Exception ex) { - ex.printStackTrace(); - stat.addStatus("jaxrpc-hello-web-client main", stat.FAIL); - System.out.println("CAUGHT UNEXPECTED EXCEPTION: " + ex.getMessage()); - } - - stat.addStatus("jaxrpc-hello-web-client main", stat.PASS); - } -*/ -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/MANIFEST.MF deleted file mode 100644 index 0fb13ca3df4..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: client.Client diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/TestClient.java deleted file mode 100644 index 93aadd8187b..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/TestClient.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package client; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class TestClient { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public boolean found1 = false; - public boolean found2 = false; - - public static void main (String[] args) { - stat.addDescription("jaxrpc web"); - TestClient client = new TestClient(); - client.doTest(args); - stat.printSummary("jaxrpc-web"); - } - - public void doTest(String[] args) { - - String url = args[0]; - try { - int code = invokeServlet(url); - report(code); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private int invokeServlet(String url) throws Exception { - log("Invoking url = " + url); - URL u = new URL(url); - HttpURLConnection c1 = (HttpURLConnection)u.openConnection(); - int code = c1.getResponseCode(); - InputStream is = c1.getInputStream(); - BufferedReader input = new BufferedReader (new InputStreamReader(is)); - String line = null; - while ((line = input.readLine()) != null) { - log(line); - if(line.indexOf("So the RESULT OF jaxrpc web SERVICE IS") != -1) - found1 = true; - if(line.indexOf("[Hello All]") != -1) - found2 = true; - } - return code; - } - - private void report(int code) { - if(code != 200) { - log("Incorrect return code: " + code); - fail(); - } - if(!found1) { - fail(); - } - if(!found2) { - fail(); - } - pass(); - } - - private void log(String message) { - System.out.println("[client.TestClient]:: " + message); - } - - private void pass() { - stat.addStatus("jaxrpc-web", stat.PASS); - } - - private void fail() { - stat.addStatus("jaxrpc-web", stat.FAIL); - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml deleted file mode 100644 index b13a5753f87..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml deleted file mode 100644 index 54a2454524e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml deleted file mode 100644 index 40836423aba..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - This is my jaxrpc app client - jaxrpcClient - - simple jaxrpc service ref - service/helloservice - javax.xml.rpc.Service - META-INF/wsdl/MyHelloService.wsdl - mapping.xml - servicens:HelloIF - - helloservice.HelloIF - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/sun-application-client.xml deleted file mode 100644 index d0bac8d0f34..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/sun-application-client.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - service/helloservice - - helloservice.helloIF - - com.sun.enterprise.webservice.client.transport.log - file:jaxrpc.log - - - - urn:Foo - HelloImpl - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/samplebuild.properties b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/samplebuild.properties deleted file mode 100644 index 2bc2a751327..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/samplebuild.properties +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -example=helloservice -assemble=assemble -assemble.war=assemble -wsdl.file=MyHelloService.wsdl -warname=jaxrpc-hello-web -war.file=jaxrpc-hello-web.war -war.name=jaxrpc-hello-web.war - -client.src=client - -config.interface.file=config-interface.xml -config.wsdl.file=config-wsdl.xml -mapping.file=mapping.xml -build= build - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloIF.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloIF.java deleted file mode 100644 index af0f518dbfd..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloIF.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package helloservice; - -import java.rmi.Remote; -import java.rmi.RemoteException; - - -public interface HelloIF extends Remote { - public String sayHello(String s) throws RemoteException; -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloImpl.java deleted file mode 100644 index aede9114e5f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package helloservice; - -import java.io.*; - - -public class HelloImpl implements HelloIF { - public String message = "Hello "; - - public String sayHello(String s) { - return message + s; - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/sun-web.xml deleted file mode 100644 index 6c649bd7c5e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/sun-web.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - /hello-jaxrpc - - HelloImpl - - HelloIF - hello - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/web.xml deleted file mode 100644 index ac8a55d97ab..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/web.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - -MyHelloService - -HelloImpl -HelloImpl -helloservice.HelloImpl - - -HelloImpl -/hello - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java deleted file mode 100644 index fd8a8bc02da..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package client; - -import jakarta.servlet.*; -import java.io.IOException; -import java.io.PrintWriter; -import javax.naming.InitialContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import javax.xml.rpc.Stub; -import helloservice.*; - - -public class Client extends HttpServlet { - - - public void doGet(HttpServletRequest req, HttpServletResponse resp) - throws jakarta.servlet.ServletException { - doPost(req, resp); - } - - public void doPost(HttpServletRequest req, HttpServletResponse resp) - throws jakarta.servlet.ServletException { - try { - String targetEndpointAddress = "http://HTTP_HOST:HTTP_PORT/hello-jaxrpc/hello";//?wsdl - InitialContext ic = new InitialContext(); - - MyHelloService myHelloService = - (MyHelloService) ic.lookup( - "java:comp/env/service/MyHelloService"); - - HelloIF helloPort = myHelloService.getHelloIFPort(); - ((Stub)helloPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - String ret= helloPort.sayHello("All"); - - PrintWriter out = resp.getWriter(); - resp.setContentType("text/html"); - out.println(""); - out.println(""); - out.println("TestServlet"); - out.println(""); - out.println(""); - out.println("

"); - out.println("So the RESULT OF jaxrpc web SERVICE IS :"); - out.println("

"); - out.println("[" + ret + "]"); - out.println(""); - out.println(""); - out.flush(); - out.close(); - } catch(Exception e) { - e.printStackTrace(); - } - } -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webservices.xml deleted file mode 100644 index 664e057e1d6..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webservices.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - -MyHelloService -MyHelloService -WEB-INF/wsdl/MyHelloService.wsdl -build/mapping.xml - -HelloIF -HelloIF -wsdl-port_ns__:HelloIFPort -helloservice.HelloIF - -HelloImpl - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml index 1f07b611e45..608a37f49b1 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml @@ -34,117 +34,126 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml index 3abc8bb4040..34ed13c05c3 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml index 793e5275d37..482d5bd26b7 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml @@ -35,291 +35,320 @@ &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml index 632eb41690e..1e8d8455647 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml @@ -34,102 +34,111 @@ &jaxwsTools; &jbicommon; &jbiproperties; - + - - - + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml deleted file mode 100644 index 06556a78f6d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest.wsdl deleted file mode 100644 index 4dc31e95aff..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest.wsdl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterestNonHttpBC.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterestNonHttpBC.wsdl deleted file mode 100644 index 47835282e49..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterestNonHttpBC.wsdl +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest_Schema.xsd deleted file mode 100644 index fc4c721a581..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest_Schema.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.properties deleted file mode 100644 index e6c549180b1..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.properties +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml deleted file mode 100644 index 68162391c4e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml +++ /dev/null @@ -1,357 +0,0 @@ - - - - - - - - -]> - - - - - - &commonSetup; - &commonBuild; - &jbicommon; - &jbiproperties; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClient.java deleted file mode 100644 index 36ef163a2b5..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClient.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; - -import com.sun.ejte.ccl .reporter.SimpleReporterAdapter; - -public class FindInterestClient { - - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - private static String testId = "jbi-serviceengine/jax-rpc/consumer"; - - public FindInterestClient() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - FindInterestClient client = new FindInterestClient(); - - client.doTest(); - // client.doServletTest(); - } - - public double doTest() { - - //String targetEndpointAddress = - // "http://localhost:8080/findintr/FindInterest"; - String targetEndpointAddress = - "http://localhost:12013/InterestIFPort"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); - System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 105.0) { - status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS); - } - return interest; - - } catch (Exception ex) { - status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - return -1; - } - - /* public void doServletTest() { - try { - String targetEndpointAddress = - "http://localhost:8080/FindInterestServlet/FindInterest"; - - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); - - System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 210.0) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS); - } - } catch (Exception ex) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - status.printSummary("JSR109 - FindInterestTest"); - }*/ -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClientNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClientNonHttpBC.java deleted file mode 100644 index 0ee7b942b96..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClientNonHttpBC.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; - -import com.sun.ejte.ccl .reporter.SimpleReporterAdapter; - -public class FindInterestClientNonHttpBC { - - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - private static String testId = "jbi-serviceengine/jax-rpc/consumer"; - - public FindInterestClientNonHttpBC() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - FindInterestClientNonHttpBC client = new FindInterestClientNonHttpBC(); - - client.doTest(); - // client.doServletTest(); - } - - public double doTest() { - - String targetEndpointAddress = - "http://localhost:8080/findintr/FindInterest"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); - System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 105.0) { - status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS); - } - return interest; - - } catch (Exception ex) { - status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - return -1; - } - - /* public void doServletTest() { - try { - String targetEndpointAddress = - "http://localhost:8080/FindInterestServlet/FindInterest"; - - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); - - System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 210.0) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS); - } - } catch (Exception ex) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - status.printSummary("JSR109 - FindInterestTest"); - }*/ -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java deleted file mode 100644 index e260cc0987e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import jakarta.servlet.*; -import jakarta.servlet.http.*; -import java.io.Serializable; -import java.io.PrintWriter; -import java.rmi.RemoteException; -import javax.naming.*; -import javax.xml.namespace.QName; - -public class FindInterestServletClient extends HttpServlet - { - HttpServletResponse resp; - public FindInterestServletClient() { - System.out.println("FindInterestServletImpl() instantiated"); - } - - public void doGet(HttpServletRequest req, HttpServletResponse resp) - throws jakarta.servlet.ServletException { - this.resp = resp; - doPost(req, resp); - } - - public void doPost(HttpServletRequest req, HttpServletResponse resp) - throws jakarta.servlet.ServletException { - try{ - this.resp = resp; - calculateInterest(); - }catch(Exception e) { - throw new jakarta.servlet.ServletException(e); - } - - } - - public void calculateInterest() throws Exception { - System.out.println("calculateInterest invoked from servlet "); - FindInterestClient client = new FindInterestClient(); - double interest= client.doTest(); - PrintWriter out = resp.getWriter(); - resp.setContentType("text/html"); - out.println(""); - out.println(""); - out.println("FindInterestServletClient"); - out.println(""); - out.println(""); - out.println("

"); - out.println("So the RESULT OF FindInterest SERVICE IS :"); - out.println("

"); - out.println("[" + interest + "]"); - out.println(""); - out.println(""); - out.flush(); - out.close(); - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumer.java deleted file mode 100755 index 3dfffb1ca31..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumer.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class SOAPEjbConsumer { - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - - private static String testId = "jbi-serviceengine/jax-rpc/consumer"; - - public SOAPEjbConsumer() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - SOAPEjbConsumer client = new SOAPEjbConsumer(); - - client.doTest(); - } - - private void doTest() { - //String targetEndpointAddress = - // "http://localhost:8080/soap/web/findinterest"; - String targetEndpointAddress = - "http://localhost:12013/InterestIFPort"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 105.0) { - status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS); - } - - } catch (Exception ex) { - status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumerNonHttpBC.java deleted file mode 100755 index 87a75edfc80..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumerNonHttpBC.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class SOAPEjbConsumerNonHttpBC { - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - - private static String testId = "jbi-serviceengine/jax-rpc/consumer"; - - public SOAPEjbConsumerNonHttpBC() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - SOAPEjbConsumerNonHttpBC client = new SOAPEjbConsumerNonHttpBC(); - - client.doTest(); - } - - private void doTest() { - String targetEndpointAddress = - "http://localhost:8080/soap/web/findinterest"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 105.0) { - status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS); - } - - } catch (Exception ex) { - status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/ServletInvoker.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/ServletInvoker.java deleted file mode 100644 index f5687e78a29..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/ServletInvoker.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class ServletInvoker { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public boolean found1 = false; - public boolean found2 = false; - - private static String testId = "jbi-serviceengine/jax-rpc/consumer"; - - public static void main (String[] args) { - stat.addDescription(testId); - ServletInvoker client = new ServletInvoker(); - client.doTest(args); - stat.printSummary(testId); - } - - public void doTest(String[] args) { - - String url = args[0]; - try { - int code = invokeServlet(url); - report(code); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private int invokeServlet(String url) throws Exception { - log("Invoking url = " + url); - URL u = new URL(url); - HttpURLConnection c1 = (HttpURLConnection)u.openConnection(); - int code = c1.getResponseCode(); - InputStream is = c1.getInputStream(); - BufferedReader input = new BufferedReader (new InputStreamReader(is)); - String line = null; - while ((line = input.readLine()) != null) { - log(line); - if(line.indexOf("So the RESULT OF FindInterest SERVICE IS") != -1) - found1 = true; - if(line.indexOf("[105.0]") != -1) - found2 = true; - } - return code; - } - - private void report(int code) { - if(code != 200) { - log("Incorrect return code: " + code); - fail(); - } - if(!found1) { - fail(); - } - if(!found2) { - fail(); - } - pass(); - } - - private void log(String message) { - System.out.println("[client.TestClient]:: " + message); - } - - private void pass() { - stat.addStatus(testId, stat.PASS); - } - - private void fail() { - stat.addStatus(testId, stat.FAIL); - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/MANIFEST.MF deleted file mode 100644 index d4ea871eed0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Created-By: Ant 1.4.1 - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/application.xml deleted file mode 100644 index 34de701589a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/application.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - FindInterestApp - - - web.war - FindInterestServlet - - - - appclient.jar - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/MANIFEST.MF deleted file mode 100644 index 7cc1828e23d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: myclient.SOAPEjbConsumer - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/application-client.xml deleted file mode 100644 index f3268b8aaba..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/application-client.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - This is my findintr app client - MyAppClient - - findintr service ref - service/FindInterest - myclient.FindInterest - META-INF/wsdl/FindInterest.wsdl - IntrClientMapping.xml - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/sun-application-client.xml deleted file mode 100644 index a313c5b38aa..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/sun-application-client.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - service/FindInterest - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/MANIFEST.MF deleted file mode 100644 index d4ea871eed0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Created-By: Ant 1.4.1 - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/ejb-jar.xml deleted file mode 100644 index 4acc04c5b6d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/ejb-jar.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - Ejb1 - - - InterestEjb - InterestEjb - myejb.InterestIF - myejb.InterestEJB - Stateless - Container - - - - - - - - - InterestEjb - ServiceEndpoint - * - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/sun-ejb-jar.xml deleted file mode 100644 index d23c4269c64..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/sun-ejb-jar.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - ejb.jar - 0 - - InterestEjb - - - InterestIFPort - findintr/FindInterest - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/webservices.xml deleted file mode 100644 index f2719c9221c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/webservices.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - desc - - FindInterestEjb - META-INF/wsdl/FindInterest.wsdl - IntrEjbMapping.xml - - port component description - InterestIFPort - hellons:InterestIFPort - - myejb.InterestIF - - - InterestEjb - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml deleted file mode 100644 index 2b0cec324f3..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - FindInterestServlet - - service/FindInterest - - - http://hello.org/wsdl - InterestIFPort - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/web.xml deleted file mode 100644 index 0fc85ea6f2a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/web.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - FindInterestApp - - FindInterestServletClient - myclient.FindInterestServletClient - 0 - - - FindInterestServletClient - /FindInterestClient - - - findintr service ref - service/FindInterest - myclient.FindInterest - WEB-INF/wsdl/FindInterest.wsdl - IntrClientMapping.xml - - - 54 - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java deleted file mode 100644 index b25badf193e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myejb; - -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; - -public class InterestEJB implements SessionBean { - - private SessionContext sc; - - public InterestEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In InterestEJB::ejbCreate !!"); - } - - public double calculateInterest(double balance, double period) { - System.out.println(" Inside calculateInterest "); - return (balance * period * 0.1); - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMapping.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMapping.xml deleted file mode 100644 index 4aa2beacb62..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMapping.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - myejb - http://hello.org/wsdl - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMappingClient.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMappingClient.xml deleted file mode 100644 index 588fa003da0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMappingClient.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - myclient - http://hello.org/wsdl - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml deleted file mode 100755 index ac2e5e66b6a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - ejb_findinterest_provider_assembly - This is an AU for Soap Binding deployments - - - - provider_for_ejb_jaxrpc - provider service to the soap binding - - - ejb_jaxrpc_provider_su.jar - sun-http-binding - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest.wsdl deleted file mode 100644 index f269b0ecfaf..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest.wsdl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest_Schema.xsd deleted file mode 100644 index fc4c721a581..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest_Schema.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/META-INF/jbi.xml deleted file mode 100755 index 09720f704b0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/META-INF/jbi.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/endpoints.xml deleted file mode 100755 index 0c2318542c8..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/endpoints.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/assembly/META-INF/jbi.xml deleted file mode 100755 index 73efb32827d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/assembly/META-INF/jbi.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - ejb_findinterest_provider_assembly - This is an AU for Soap Binding deployments - - - - provider_for_ejb_jaxrpc - provider service to the soap binding - - - ejb_jaxrpc_provider_su.jar - SunSOAPBinding - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/META-INF/jbi.xml deleted file mode 100755 index 1d3719ed830..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/META-INF/jbi.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml deleted file mode 100755 index 307693bf38c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - http://hello.org/wsdl - FindInterest - - InterestIFPort - provider - http://localhost:8080/findintr/FindInterest - - - calculateInterest - http://www.w3.org/2004/08/wsdl/in-out - "" - - http://hello.org/wsdl - - - http://hello.org/wsdl - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java deleted file mode 100644 index 180f8fd7c3b..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myweb; - -import java.util.Iterator; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.rpc.Call; -import java.io.Serializable; -import java.rmi.RemoteException; -import javax.naming.*; -import javax.xml.rpc.Service; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.namespace.QName; -import jakarta.servlet.SingleThreadModel; - -public class FindInterestServletImpl implements - SingleThreadModel, ServiceLifecycle { - - public FindInterestServletImpl() { - System.out.println("FindInterestServletImpl() instantiated"); - } - - public void init(Object context) { - System.out.println("Got ServiceLifecycle::init call " + context); - } - - public void destroy() { - System.out.println("Got ServiceLifecycle::destroy call"); - } - - public double calculateInterest(double balance, double period) { - System.out.println("calculateInterest invoked from servlet endpoint"); - return 0.2*balance*period; - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml deleted file mode 100644 index c11b886e88e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml deleted file mode 100644 index 9c318c84e70..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest.wsdl deleted file mode 100644 index fd6d8713a9f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest.wsdl +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest_Schema.xsd deleted file mode 100644 index 8490a84b670..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest_Schema.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.properties deleted file mode 100644 index ba6114f92c8..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.properties +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml deleted file mode 100644 index 2e65e89add7..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml +++ /dev/null @@ -1,334 +0,0 @@ - - - - - - - -]> - - - - - - &commonSetup; - &jbicommon; - &jbiproperties; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClient.java deleted file mode 100644 index 91ae707b1a4..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClient.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; - -import com.sun.ejte.ccl .reporter.SimpleReporterAdapter; - -public class FindInterestClient { - - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - - private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway"; - - public FindInterestClient() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - FindInterestClient client = new FindInterestClient(); - - client.doTest(); - // client.doServletTest(); - } - - public void doTest() { - - //String targetEndpointAddress = - // "http://localhost:8080/findintr/FindInterest"; - String targetEndpointAddress = - "http://localhost:12013/InterestIFPort"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - interestIFPort.calculateInterest(balance, period); - - status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.PASS); - - } catch (Exception ex) { - status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - } - - /* public void doServletTest() { - try { - String targetEndpointAddress = - "http://localhost:8080/FindInterestServlet/FindInterest"; - - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); - - System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 210.0) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS); - } - } catch (Exception ex) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - status.printSummary("JSR109 - FindInterestTest"); - }*/ -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClientNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClientNonHttpBC.java deleted file mode 100644 index 38fb9d964f6..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClientNonHttpBC.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; - -import com.sun.ejte.ccl .reporter.SimpleReporterAdapter; - -public class FindInterestClientNonHttpBC { - - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - - private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway"; - - public FindInterestClientNonHttpBC() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - FindInterestClientNonHttpBC client = new FindInterestClientNonHttpBC(); - - client.doTest(); - // client.doServletTest(); - } - - public void doTest() { - - String targetEndpointAddress = - "http://localhost:8080/findintr/FindInterest"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - interestIFPort.calculateInterest(balance, period); - - status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.PASS); - - } catch (Exception ex) { - status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - } - - /* public void doServletTest() { - try { - String targetEndpointAddress = - "http://localhost:8080/FindInterestServlet/FindInterest"; - - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); - - System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 210.0) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS); - } - } catch (Exception ex) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - status.printSummary("JSR109 - FindInterestTest"); - }*/ -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumer.java deleted file mode 100755 index e536ed636f7..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumer.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class SOAPEjbConsumer { - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - - private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway"; - - public SOAPEjbConsumer() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - SOAPEjbConsumer client = new SOAPEjbConsumer(); - - client.doTest(); - status.printSummary(testId); - } - - private void doTest() { - //String targetEndpointAddress = - // "http://localhost:8080/soap/web/findinterest"; - String targetEndpointAddress = - "http://localhost:12013/InterestIFPort"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress); - - interestIFPort.calculateInterest(balance, period); - - status.addStatus(testId + "1 : EJB Endpoint Test", status.PASS); - - } catch (Exception ex) { - status.addStatus(testId + "1 : EJB Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumerNonHttpBC.java deleted file mode 100755 index 9bbacd5af28..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumerNonHttpBC.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class SOAPEjbConsumerNonHttpBC { - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - - private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway"; - - public SOAPEjbConsumerNonHttpBC() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - SOAPEjbConsumerNonHttpBC client = new SOAPEjbConsumerNonHttpBC(); - - client.doTest(); - status.printSummary(testId); - } - - private void doTest() { - String targetEndpointAddress = - "http://localhost:8080/soap/web/findinterest"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress); - - interestIFPort.calculateInterest(balance, period); - - status.addStatus(testId + "1 : EJB Endpoint Test", status.PASS); - - } catch (Exception ex) { - status.addStatus(testId + "1 : EJB Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/MANIFEST.MF deleted file mode 100644 index d4ea871eed0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Created-By: Ant 1.4.1 - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/application.xml deleted file mode 100644 index abe9e086660..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/application.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - FindInterestApp - - ejb.jar - - - appclient.jar - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/MANIFEST.MF deleted file mode 100644 index 7cc1828e23d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: myclient.SOAPEjbConsumer - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/application-client.xml deleted file mode 100644 index f3268b8aaba..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/application-client.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - This is my findintr app client - MyAppClient - - findintr service ref - service/FindInterest - myclient.FindInterest - META-INF/wsdl/FindInterest.wsdl - IntrClientMapping.xml - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/sun-application-client.xml deleted file mode 100644 index a313c5b38aa..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/sun-application-client.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - service/FindInterest - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/MANIFEST.MF deleted file mode 100644 index d4ea871eed0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Created-By: Ant 1.4.1 - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/ejb-jar.xml deleted file mode 100644 index 4acc04c5b6d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/ejb-jar.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - Ejb1 - - - InterestEjb - InterestEjb - myejb.InterestIF - myejb.InterestEJB - Stateless - Container - - - - - - - - - InterestEjb - ServiceEndpoint - * - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/sun-ejb-jar.xml deleted file mode 100644 index d23c4269c64..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/sun-ejb-jar.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - ejb.jar - 0 - - InterestEjb - - - InterestIFPort - findintr/FindInterest - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/webservices.xml deleted file mode 100644 index f2719c9221c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/webservices.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - desc - - FindInterestEjb - META-INF/wsdl/FindInterest.wsdl - IntrEjbMapping.xml - - port component description - InterestIFPort - hellons:InterestIFPort - - myejb.InterestIF - - - InterestEjb - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/sun-web.xml deleted file mode 100644 index 14674e94c0f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/sun-web.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - FindInterestServlet - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/web.xml deleted file mode 100644 index 0203114f784..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/web.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - FindInterestApp - - FindInterestServlet - myweb.FindInterestServletImpl - 0 - - - FindInterestServlet - /FindInterest - - - 54 - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/webservices.xml deleted file mode 100644 index 51cd5acde9a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/webservices.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - desc - - FindInterestServlet - WEB-INF/wsdl/FindInterest.wsdl - IntrWebMapping.xml - - port component description - InterestIFPort - hellons:InterestIFPort - - myweb.InterestIF - - - FindInterestServlet - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java deleted file mode 100644 index bf15003b768..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myejb; - -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; - -public class InterestEJB implements SessionBean { - - private SessionContext sc; - - public InterestEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In InterestEJB::ejbCreate !!"); - } - - public void calculateInterest(double balance, double period) { - System.out.println(" Inside calculateInterest interest is : " + (balance * period * 0.1)); - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMapping.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMapping.xml deleted file mode 100644 index 4aa2beacb62..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMapping.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - myejb - http://hello.org/wsdl - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingClient.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingClient.xml deleted file mode 100644 index 588fa003da0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingClient.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - myclient - http://hello.org/wsdl - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingWeb.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingWeb.xml deleted file mode 100644 index fc8a3a8fabb..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingWeb.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - myweb - http://hello.org/wsdl - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml deleted file mode 100755 index f1b3f7ae3fc..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - ejb_findinterest_assembly - This is an AU for Soap Binding deployments - - - - consumer_for_ejb_jaxrpc - consumer service to the soap binding - - - ejb_jaxrpc_consumer_su.jar - sun-http-binding - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest.wsdl deleted file mode 100644 index 4727803eb59..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest.wsdl +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest_Schema.xsd deleted file mode 100644 index 8490a84b670..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest_Schema.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/META-INF/jbi.xml deleted file mode 100755 index beec0808d9d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/META-INF/jbi.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/endpoints.xml deleted file mode 100755 index 66627fdef3f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/endpoints.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java deleted file mode 100644 index f9d56f5356c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myweb; - -import java.util.Iterator; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.rpc.Call; -import java.io.Serializable; -import java.rmi.RemoteException; -import javax.naming.*; -import javax.xml.rpc.Service; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.namespace.QName; -import jakarta.servlet.SingleThreadModel; - -public class FindInterestServletImpl implements - SingleThreadModel, ServiceLifecycle { - - public FindInterestServletImpl() { - System.out.println("FindInterestServletImpl() instantiated"); - } - - public void init(Object context) { - System.out.println("Got ServiceLifecycle::init call " + context); - } - - public void destroy() { - System.out.println("Got ServiceLifecycle::destroy call"); - } - - public void calculateInterest(double balance, double period) { - System.out.println("calculateInterest invoked from servlet endpoint " + (0.2*balance*period)); - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml deleted file mode 100644 index c11b886e88e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml deleted file mode 100644 index 9c318c84e70..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml deleted file mode 100644 index e8001cdb4d6..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest.wsdl deleted file mode 100644 index 4dc31e95aff..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest.wsdl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterestNonHttpBC.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterestNonHttpBC.wsdl deleted file mode 100644 index 47835282e49..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterestNonHttpBC.wsdl +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest_Schema.xsd deleted file mode 100644 index fc4c721a581..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest_Schema.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.properties deleted file mode 100644 index ba6114f92c8..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.properties +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml deleted file mode 100644 index fc952cb9c6c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml +++ /dev/null @@ -1,348 +0,0 @@ - - - - - - - - -]> - - - - - - &commonSetup; - &commonBuild; - &jbicommon; - &jbiproperties; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClient.java deleted file mode 100644 index f2c4d98da30..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClient.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; - -import com.sun.ejte.ccl .reporter.SimpleReporterAdapter; - -public class FindInterestClient { - - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - - private static String testId = "jbi-serviceengine/jax-rpc/provider"; - - public FindInterestClient() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - FindInterestClient client = new FindInterestClient(); - - client.doTest(); - // client.doServletTest(); - } - - public void doTest() { - - //String targetEndpointAddress = - // "http://localhost:8080/findintr/FindInterest"; - String targetEndpointAddress = - "http://localhost:12013/InterestIFPort"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); - System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 105.0) { - status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.PASS); - } - - } catch (Exception ex) { - status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - } - - /* public void doServletTest() { - try { - String targetEndpointAddress = - "http://localhost:8080/FindInterestServlet/FindInterest"; - - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); - - System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 210.0) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS); - } - } catch (Exception ex) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - status.printSummary("JSR109 - FindInterestTest"); - }*/ -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClientNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClientNonHttpBC.java deleted file mode 100644 index 87688b55b15..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClientNonHttpBC.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; - -import com.sun.ejte.ccl .reporter.SimpleReporterAdapter; - -public class FindInterestClientNonHttpBC { - - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - - private static String testId = "jbi-serviceengine/jax-rpc/provider"; - - public FindInterestClientNonHttpBC() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - FindInterestClientNonHttpBC client = new FindInterestClientNonHttpBC(); - - client.doTest(); - // client.doServletTest(); - } - - public void doTest() { - - String targetEndpointAddress = - "http://localhost:8080/findintr/FindInterest"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); - System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 105.0) { - status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.PASS); - } - - } catch (Exception ex) { - status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - } - - /* public void doServletTest() { - try { - String targetEndpointAddress = - "http://localhost:8080/FindInterestServlet/FindInterest"; - - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); - - System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 210.0) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS); - } - } catch (Exception ex) { - status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - status.printSummary("JSR109 - FindInterestTest"); - }*/ -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumer.java deleted file mode 100755 index d26175a452f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumer.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class SOAPEjbConsumer { - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - - private static String testId = "jbi-serviceengine/jax-rpc/provider"; - - public SOAPEjbConsumer() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - SOAPEjbConsumer client = new SOAPEjbConsumer(); - - client.doTest(); - status.printSummary(testId); - } - - private void doTest() { - //String targetEndpointAddress = - // "http://localhost:8080/soap/web/findinterest"; - String targetEndpointAddress = - "http://localhost:12013/InterestIFPort"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 105.0) { - status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS); - } - - } catch (Exception ex) { - status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumerNonHttpBC.java deleted file mode 100755 index a32d4ef3efa..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumerNonHttpBC.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myclient; - -import javax.naming.*; -import javax.xml.rpc.Stub; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class SOAPEjbConsumerNonHttpBC { - private double balance = 300.00; - private double period = 3.5; - - private static SimpleReporterAdapter status = new SimpleReporterAdapter(); - - private static String testId = "jbi-serviceengine/jax-rpc/provider"; - - public SOAPEjbConsumerNonHttpBC() { - status.addDescription(testId); - } - - public static void main (String[] args) { - - SOAPEjbConsumerNonHttpBC client = new SOAPEjbConsumerNonHttpBC(); - - client.doTest(); - status.printSummary(testId); - } - - private void doTest() { - String targetEndpointAddress = - "http://localhost:8080/soap/web/findinterest"; - - try { - Context ic = new InitialContext(); - FindInterest findIntrService = (FindInterest) - ic.lookup("java:comp/env/service/FindInterest"); - - InterestIF interestIFPort = findIntrService.getInterestIFPort(); - - ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress); - - double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is " - + interest); - - if (interest == 105.0) { - status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS); - } - - } catch (Exception ex) { - status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL); - System.out.println("findintr client failed"); - ex.printStackTrace(); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/MANIFEST.MF deleted file mode 100644 index d4ea871eed0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Created-By: Ant 1.4.1 - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/application.xml deleted file mode 100644 index abe9e086660..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/application.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - FindInterestApp - - ejb.jar - - - appclient.jar - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/MANIFEST.MF deleted file mode 100644 index 7cc1828e23d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: myclient.SOAPEjbConsumer - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/application-client.xml deleted file mode 100644 index f3268b8aaba..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/application-client.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - This is my findintr app client - MyAppClient - - findintr service ref - service/FindInterest - myclient.FindInterest - META-INF/wsdl/FindInterest.wsdl - IntrClientMapping.xml - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/sun-application-client.xml deleted file mode 100644 index a313c5b38aa..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/sun-application-client.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - service/FindInterest - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/MANIFEST.MF deleted file mode 100644 index d4ea871eed0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Created-By: Ant 1.4.1 - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/ejb-jar.xml deleted file mode 100644 index 4acc04c5b6d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/ejb-jar.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - Ejb1 - - - InterestEjb - InterestEjb - myejb.InterestIF - myejb.InterestEJB - Stateless - Container - - - - - - - - - InterestEjb - ServiceEndpoint - * - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/sun-ejb-jar.xml deleted file mode 100644 index d23c4269c64..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/sun-ejb-jar.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - ejb.jar - 0 - - InterestEjb - - - InterestIFPort - findintr/FindInterest - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/webservices.xml deleted file mode 100644 index f2719c9221c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/webservices.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - desc - - FindInterestEjb - META-INF/wsdl/FindInterest.wsdl - IntrEjbMapping.xml - - port component description - InterestIFPort - hellons:InterestIFPort - - myejb.InterestIF - - - InterestEjb - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/sun-web.xml deleted file mode 100644 index 14674e94c0f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/sun-web.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - FindInterestServlet - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/web.xml deleted file mode 100644 index 0203114f784..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/web.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - FindInterestApp - - FindInterestServlet - myweb.FindInterestServletImpl - 0 - - - FindInterestServlet - /FindInterest - - - 54 - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/webservices.xml deleted file mode 100644 index 51cd5acde9a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/webservices.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - desc - - FindInterestServlet - WEB-INF/wsdl/FindInterest.wsdl - IntrWebMapping.xml - - port component description - InterestIFPort - hellons:InterestIFPort - - myweb.InterestIF - - - FindInterestServlet - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java deleted file mode 100644 index b25badf193e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myejb; - -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; - -public class InterestEJB implements SessionBean { - - private SessionContext sc; - - public InterestEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In InterestEJB::ejbCreate !!"); - } - - public double calculateInterest(double balance, double period) { - System.out.println(" Inside calculateInterest "); - return (balance * period * 0.1); - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMapping.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMapping.xml deleted file mode 100644 index 4aa2beacb62..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMapping.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - myejb - http://hello.org/wsdl - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingClient.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingClient.xml deleted file mode 100644 index 588fa003da0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingClient.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - myclient - http://hello.org/wsdl - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingWeb.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingWeb.xml deleted file mode 100644 index fc8a3a8fabb..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingWeb.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - myweb - http://hello.org/wsdl - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml deleted file mode 100755 index f1b3f7ae3fc..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - ejb_findinterest_assembly - This is an AU for Soap Binding deployments - - - - consumer_for_ejb_jaxrpc - consumer service to the soap binding - - - ejb_jaxrpc_consumer_su.jar - sun-http-binding - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest.wsdl deleted file mode 100644 index 601e969c894..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest.wsdl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest_Schema.xsd deleted file mode 100644 index fc4c721a581..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest_Schema.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/META-INF/jbi.xml deleted file mode 100755 index e5a98e677c8..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/META-INF/jbi.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/endpoints.xml deleted file mode 100755 index 66627fdef3f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/endpoints.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/assembly/META-INF/jbi.xml deleted file mode 100755 index 3891d55a22c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/assembly/META-INF/jbi.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - ejb_findinterest_assembly - This is an AU for Soap Binding deployments - - - - consumer_for_ejb_jaxrpc - consumer service to the soap binding - - - ejb_jaxrpc_consumer_su.jar - SunSOAPBinding - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/META-INF/jbi.xml deleted file mode 100755 index 1d3719ed830..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/META-INF/jbi.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml deleted file mode 100755 index 5ef965deb12..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - http://hello.org/wsdl - FindInterest - - InterestIFPort - consumer - http://localhost:8080/soap/web/findinterest - - - calculateInterest - http://www.w3.org/2004/08/wsdl/in-out - "" - - http://hello.org/wsdl - - - http://hello.org/wsdl - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java deleted file mode 100644 index 180f8fd7c3b..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package myweb; - -import java.util.Iterator; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.rpc.Call; -import java.io.Serializable; -import java.rmi.RemoteException; -import javax.naming.*; -import javax.xml.rpc.Service; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.namespace.QName; -import jakarta.servlet.SingleThreadModel; - -public class FindInterestServletImpl implements - SingleThreadModel, ServiceLifecycle { - - public FindInterestServletImpl() { - System.out.println("FindInterestServletImpl() instantiated"); - } - - public void init(Object context) { - System.out.println("Got ServiceLifecycle::init call " + context); - } - - public void destroy() { - System.out.println("Got ServiceLifecycle::destroy call"); - } - - public double calculateInterest(double balance, double period) { - System.out.println("calculateInterest invoked from servlet endpoint"); - return 0.2*balance*period; - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml deleted file mode 100644 index c11b886e88e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml deleted file mode 100644 index 9c318c84e70..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml deleted file mode 100644 index e8001cdb4d6..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml index 1bfc16426ad..fd0ca87f4e7 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml @@ -34,101 +34,112 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml index dc2aad02f3c..8e43b87c11c 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml @@ -34,123 +34,140 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml index 4cb08cf4968..ffbd6bf7fcd 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml @@ -34,117 +34,126 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml index b62313f4c7a..f80c17d286e 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml @@ -34,129 +34,139 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java index 96dc0d90a90..f81e35abdc7 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java @@ -22,6 +22,8 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.Base64; import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; @@ -57,7 +59,7 @@ public void doTest(String[] args) { private int invokeServlet(String url, String userPassword) throws Exception { log("Invoking url = " + url+", password = " + userPassword); URL u = new URL(url); - String encoding = new sun.misc.BASE64Encoder().encode (userPassword.getBytes()); + String encoding = Base64.getEncoder().encodeToString(userPassword.getBytes(StandardCharsets.UTF_8));; HttpURLConnection c1 = (HttpURLConnection)u.openConnection(); c1.setRequestProperty ("Authorization", "Basic " + encoding); int code = c1.getResponseCode(); diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml index f42d6d65ce6..5e402ebb96f 100755 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml @@ -33,64 +33,70 @@ &commonEjbAnnotationsBuild; &jbiCommon; &jbiBuild; - - - - + + + + - - - - - + + + + + - + - + - + - + - - + + - + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml index f2b852bd7ef..64f32eb17f3 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml @@ -34,109 +34,122 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml index a243147f5a2..a4a4f4f714c 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml @@ -34,90 +34,101 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml index 9c55b6f0c13..c321cf422d5 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml @@ -34,109 +34,122 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml index 6c6d91022ed..9ff27cbcec5 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml @@ -34,90 +34,101 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties index 1dfb07e0b25..8fc46079a18 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties @@ -33,4 +33,4 @@ serviceengine.dir=${domain.dir}/jbi/components/sun-javaee-engine/install_root ejb.path=${domain.dir}/applications/j2ee-modules/${ejb.module} output.dir=${serviceengine.dir}/workspace asadmin.command=${server.dir}/bin/asadmin -client.classpath=".:build:${env.S1AS_HOME}/lib/activation.jar:${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar" +client.classpath=".:build:${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-api-osgi.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar" diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml index bb98f0fab1a..f52e6745e88 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml @@ -34,102 +34,113 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml index d251b75240c..5d79bbd49a0 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml @@ -34,102 +34,104 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml index 157e5405727..140bbeec79c 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml @@ -35,289 +35,320 @@ &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml index fe23a88f45a..d6039b32854 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml @@ -34,97 +34,106 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml index 05ecd1efb94..56b6bc5c35f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml @@ -34,121 +34,131 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml index 05ecd1efb94..56b6bc5c35f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml @@ -34,121 +34,131 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml index 05ecd1efb94..56b6bc5c35f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml @@ -34,121 +34,131 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml index 05ecd1efb94..56b6bc5c35f 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml @@ -34,121 +34,131 @@ &jaxwsTools; &jbicommon; &jbiproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties deleted file mode 100644 index 56a61490f11..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml deleted file mode 100644 index 147300182e0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Usage: - ant all (Executes the WebServices test) - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/Client.java deleted file mode 100644 index a9447aa5af4..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/Client.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package signature; - -import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.rpc.Stub; -import jakarta.xml.soap.SOAPElement; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import java.util.GregorianCalendar; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public static void main (String[] args) { - stat.addDescription("webservices-signature"); - Client client = new Client(); - client.doTest(args); - stat.printSummary("webservices-signatureID"); - } - - public void doTest(String[] args) { - try { - - String targetEndpointAddress = args[0]; - - Context ic = new InitialContext(); - - SignatureTestService testService = - (SignatureTestService) ic.lookup("java:comp/env/service/signature"); - SignatureTest test = testService.getSignatureTestPort(); - - ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - System.out.println("endpoint address = " + targetEndpointAddress); - stat.addStatus("signature client main", stat.PASS); - - try { - String msg = test.sayHello("world"); - System.out.println("MSG: " + msg); - stat.addStatus("signature SEI.sayHello(msg)", stat.PASS); - } catch (Exception e1) { - e1.printStackTrace(); - stat.addStatus("signature SEI.sayHello(msg)", stat.FAIL); - } - - -/* uncomment the following when the date->calendar is done - MySecondDateValueType d = - new MySecondDateValueType(new java.util.GregorianCalendar(), "Suck it up and do it!"); - MyDateValueType c = new MyDateValueType(); - c.setDate(new java.util.GregorianCalendar()); - c.setWhine("Stop Whining!!"); - c.setMySecondDateValueTypes(new MySecondDateValueType[0]); - - try { - test.setTestDate(new java.util.GregorianCalendar()); - java.util.Calendar date1 = test.getTestDate(); - System.out.println("RETURNED LUCKY DATE = " + date1); - stat.addStatus("signature SEI.setDate(java.util.Date)", stat.PASS); - } catch (Exception e1) { - stat.addStatus("signature SEI.setDate(java.util.Date)", stat.FAIL); - } - - try { - test.setMyDateValueType(c); - MyDateValueType date2 = test.getMyDateValueType(); - System.out.println("RETURNED ANOTHER LUCKY DATE = " - + date2.getDate() + "; with message = " + date2.getWhine()); - stat.addStatus("signature SEI.setValueTypeWithDate", stat.PASS); - - MySecondDateValueType[] seconddates = date2.getMySecondDateValueTypes(); - if (seconddates != null) { - stat.addStatus("signature SEI.setSecondValueTypeArray", stat.PASS); - } else { - stat.addStatus("signature SEI.setSecondValueTypeArray", stat.FAIL); - } - - } catch (Exception e2) { - stat.addStatus("signature SEI.setValueTypeWithDate", stat.FAIL); - } - - try { - test.setMyDateValueTypes(new MyDateValueType[0]); - MyDateValueType[] date3 = test.getMyDateValueTypes(); - System.out.println("RETURNED MULTIPLE LUCKY DATES.size = " + date3.length); - stat.addStatus("signature SEI.setValueTypeWithDates", stat.PASS); - } catch (Exception e2) { - stat.addStatus("signature SEI.setValueTypeWithDates", stat.FAIL); - } -*/ - } catch (Exception ex) { - System.out.println("signature client test failed"); - ex.printStackTrace(); - stat.addStatus("signature client main", stat.FAIL); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/MANIFEST.MF deleted file mode 100644 index 2ab99b6a3a2..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: signature.Client diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/config.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/config.xml deleted file mode 100644 index 38b8d7499a2..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml deleted file mode 100644 index dffacb6cd1c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - This is my signature app client - signatureClient - - signature service ref - service/signature - signature.SignatureTestService - META-INF/wsdl/SignatureTestService.wsdl - SignatureMapping_appclient.xml - servicens:SignatureTestService - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application.xml deleted file mode 100644 index 0732035f82c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Application description - SignatureApp - - signature-client.jar - - - signature-ejb.jar - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/ejb-jar.xml deleted file mode 100644 index 41935d74b3e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/ejb-jar.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Ejb1 - - - SignatureEjb - signatureejb.SignatureTest - signatureejb.SignatureEJB - Stateless - Container - - - - - - SignatureEjb - ServiceEndpoint - * - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-application-client.xml deleted file mode 100644 index 8b0c0a185ba..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-application-client.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - service/signature - - signature.SignatureTest - - - urn:SignatureTestService - SignatureTestService - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-ejb-jar.xml deleted file mode 100644 index aae303da1bd..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - 0 - - SignatureEjb - SignatureEjb - false - false - -1 - - - SignatureTestPort - signatureejb/SignatureTest - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/webservices.xml deleted file mode 100644 index 5b94905ab51..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/webservices.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - desc - - SignatureWebServiceEjb - META-INF/wsdl/SignatureTestService.wsdl - SignatureMapping_ejb.xml - - port component description - SignatureTestPort - signaturens:SignatureTestPort - signatureejb.SignatureTest - - SignatureEjb - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MyDateValueType.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MyDateValueType.java deleted file mode 100644 index 5c864dae73b..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MyDateValueType.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package signatureejb; - -import java.util.Date; - -public class MyDateValueType { - protected java.util.Date date; - protected String whine; - protected MySecondDateValueType[] dates; - - public MyDateValueType() {} - - public MyDateValueType(Date date, java.lang.String whine, - MySecondDateValueType[] dates) { - this.date = date; - this.whine = whine; - this.dates = dates; - } - - public java.util.Date getDate() { - return date; - } - - public void setDate(java.util.Date date) { - this.date = date; - } - - public java.lang.String getWhine() { - return whine; - } - - public void setWhine(java.lang.String whine) { - this.whine = whine; - } - - public MySecondDateValueType[] getMySecondDateValueTypes() { - return dates; - } - - public void setMySecondDateValueTypes(MySecondDateValueType[] dates) { - this.dates = dates; - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MySecondDateValueType.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MySecondDateValueType.java deleted file mode 100644 index 7b3f63a94a5..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MySecondDateValueType.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package signatureejb; - -import java.util.Date; - -public class MySecondDateValueType { - protected java.util.Date date; - protected String whine; - - public MySecondDateValueType() { - } - - public MySecondDateValueType(Date date, java.lang.String whine) { - this.date = date; - this.whine = whine; - } - - public java.util.Date getDate() { - return date; - } - - public void setDate(java.util.Date date) { - this.date = date; - } - - public java.lang.String getWhine() { - return whine; - } - - public void setWhine(java.lang.String whine) { - this.whine = whine; - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java deleted file mode 100644 index 78e834c8010..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package signatureejb; - -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; -import javax.xml.rpc.handler.MessageContext; -import java.util.Date; - -public class SignatureEJB implements SessionBean { - private SessionContext sc; - - private java.util.Date date; - private MyDateValueType myDate; - private MyDateValueType[] myDates; - - public SignatureEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In SignatureEJB::ejbCreate !!"); - } - - public void SetTestDate(java.util.Date testDate) { - System.out.println("In SignatureEJB::setTestDate = " + testDate); - date = testDate; - } - - public java.util.Date GetTestDate() { - System.out.println("In SignatureEJB::getTestDate !!"); - return date; - } - - public void setMyDateValueType(MyDateValueType mytestdate) { - System.out.println("In SignatureEJB::setMyDateValueType: date = " - + mytestdate.getDate() + " ; whine = " + mytestdate.getWhine()); - myDate = mytestdate; - } - - public MyDateValueType getMyDateValueType() { - System.out.println("In SignatureEJB::getMyDateValueType !!"); - return myDate; - } - - public void setMyDateValueTypes(MyDateValueType[] mytestdates) { - System.out.println("In SignatureEJB::setMyDateValueTypes: dates.size = " - + mytestdates.length); - myDates = mytestdates; - } - - public MyDateValueType[] getMyDateValueTypes() { - System.out.println("In SignatureEJB::getMyDateValueTypes !!"); - return myDates; - } - - public String SayHello(String msg) { - System.out.println("In SignatureEJB::SayHello !!"); - return "Hello! " + msg; - } - - public void setSessionContext(SessionContext sc) { - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureTest.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureTest.java deleted file mode 100644 index d890e27c3ce..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package signatureejb; - -import java.util.Date; - -public interface SignatureTest extends java.rmi.Remote { - -/* - public void SetTestDate(java.util.Date testDate) throws java.rmi.RemoteException; - public java.util.Date GetTestDate() throws java.rmi.RemoteException; -*/ - - -/* - public void setMyDateValueType(MyDateValueType myDate) throws java.rmi.RemoteException; - public MyDateValueType getMyDateValueType() throws java.rmi.RemoteException; - public void setMyDateValueTypes(MyDateValueType[] myDate) throws java.rmi.RemoteException; - public MyDateValueType[] getMyDateValueTypes() throws java.rmi.RemoteException; -*/ - - public String SayHello(String hello) throws java.rmi.RemoteException; -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml deleted file mode 100644 index cc694df893b..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_ejb.xml deleted file mode 100644 index 771ca5b493a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_ejb.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/build.xml b/appserver/tests/appserv-tests/devtests/webservice/security/build.xml index ab34c019b8c..e1deff74177 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/security/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/security/build.xml @@ -51,8 +51,10 @@ - + + + @@ -65,8 +67,10 @@ - + + + @@ -89,7 +93,7 @@ - + @@ -97,7 +101,7 @@ - + @@ -176,7 +180,6 @@ - @@ -185,15 +188,12 @@ - Usage: ant all (Executes all the webservice security tests) - - ant ejb_ssl_cacert (Executes the client certificate ejb ssl endpoint test) diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml index 1418c5c73a4..86baf5aa632 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml @@ -51,6 +51,16 @@ + diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties deleted file mode 100755 index e68c05bf2c9..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml deleted file mode 100755 index 663d4676367..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - -]> - - - - &commonSetup; - &commonBuild; - &commonSecurity; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/MANIFEST.MF deleted file mode 100644 index 65b3bd4b483..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: com.sun.s1peqe.webservices.ejb.taxcal.client.TaxCalClient diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/TaxCalClient.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/TaxCalClient.java deleted file mode 100755 index 798e2625141..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/TaxCalClient.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1peqe.webservices.ejb.taxcal.client; - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -import javax.naming.*; -import javax.xml.rpc.Stub; - - -public class TaxCalClient { - - private static SimpleReporterAdapter stat = new SimpleReporterAdapter(); - private static String stateTaxEndpoint = null; - private static String fedTaxEndpoint = null; - private static String testSuite = "TaxCalEjbbasedWS"; - private static String testCase = null; - private static TaxCalEjbService taxCalService = null; - - public static void main(String[] args) { - - boolean stateTaxIntendedResult=true; - boolean fedTaxIntendedResult=true; - - if(args[0] == null || args[1] == null){ - System.out.println("TaxCal client: Argument missing. Please provide target" + - "endpoint address as argument"); - System.exit(1); - } else { - stateTaxEndpoint = args[0]; - fedTaxEndpoint = args[1]; - if (args.length>2) { - stateTaxIntendedResult = (new Boolean(args[2])).booleanValue(); - fedTaxIntendedResult = (new Boolean(args[3])).booleanValue(); - } - } - - stat.addDescription("This is to test ejb based webservice"); - try { - TaxCalClient client = new TaxCalClient(); - Context ic = new InitialContext(); - taxCalService = (TaxCalEjbService) - ic.lookup("java:comp/env/service/TaxCalEjbService"); - - client.callStateTaxService(stateTaxIntendedResult); - client.callFedTaxService(fedTaxIntendedResult); - }catch(Exception e){ - e.printStackTrace(); - } - - stat.printSummary(testSuite); - } - - public void callStateTaxService(boolean intendedResult) { - double income = 85000.00; - double deductions = 5000.00; - - //String targetEndpointAddress = - // "http://localhost:1024/taxcalculator"; - - try { - - StateTaxIF taxCalIFPort = taxCalService.getStateTaxIFPort(); - - ((Stub)taxCalIFPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - stateTaxEndpoint); - - double stateTax = taxCalIFPort.getStateTax(income, deductions); - System.out.println("State tax from ejb based TaxCalService :" + stateTax); - - if(stateTax == 24000.00 && intendedResult) - stat.addStatus(testSuite + " StateTaxPort", stat.PASS); - else { - System.out.println("Call succeeded while it should have failed"); - stat.addStatus(testSuite + " StateTaxPort", stat.FAIL); - } - - } catch (Exception ex) { - if (intendedResult) { - System.out.println("TaxCalEjbWebservice client failed"); - stat.addStatus(testSuite + " StateTaxPort", stat.FAIL); - ex.printStackTrace(); - } else { - System.out.println("Expected Exception caught :"); - System.out.println(ex.getMessage()); - ex.printStackTrace(); - stat.addStatus(testSuite + "StateTaxPort", stat.PASS); - } - } - } - - public void callFedTaxService(boolean intendedResult) { - double income = 97000.00; - double deductions = 7000.00; - try { - - FedTaxIF taxCalIFPort = taxCalService.getFedTaxIFPort(); - ((Stub)taxCalIFPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - fedTaxEndpoint); - - double fedTax = taxCalIFPort.getFedTax(income, deductions); - System.out.println("Fed tax from Ejb based TaxCalService :" + fedTax); - - if(fedTax == 18000.00 && intendedResult) - stat.addStatus(testSuite + " FedTaxPort", stat.PASS); - else { - System.out.println("Call succeeded while it should have failed"); - stat.addStatus(testSuite + " FedTaxPort", stat.FAIL); - } - } catch (Exception ex) { - if (intendedResult) { - System.out.println("TaxCalEjbWebService client failed"); - stat.addStatus(testSuite + " FedTaxPort", stat.FAIL); - ex.printStackTrace(); - } else { - System.out.println("Expected Exception caught :"); - System.out.println(ex.getMessage()); - stat.addStatus(testSuite + "FedTaxPort", stat.PASS); - } - } - } -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml deleted file mode 100755 index e55096de3f4..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml.save b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml.save deleted file mode 100755 index 9df53d2992c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml.save +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml deleted file mode 100755 index 2afdcaa208b..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml deleted file mode 100755 index da00336a731..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/application.xml deleted file mode 100755 index b1a0453568d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/application.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - TaxCalculatorApp - - ws-ejbtaxcal-ejb.jar - - - ws-ejbtaxcal-client.jar - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/application-client.xml deleted file mode 100755 index e6a5aa9ecd1..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/application-client.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - app client dd for taxcalculator - ws-ejbtaxcalClient - - taxcal service ref - service/TaxCalEjbService - com.sun.s1peqe.webservices.ejb.taxcal.client.TaxCalEjbService - META-INF/wsdl/TaxCalEjbService.wsdl - TaxCalClientMapping.xml - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/sun-application-client.xml deleted file mode 100755 index cd48c1f62db..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/sun-application-client.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - service/TaxCalEjbService - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/ejb-jar.xml deleted file mode 100755 index 6aa66a049d0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/ejb-jar.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - Ejb1 - - - TaxCalEjb - StateTaxEjb - com.sun.s1peqe.webservices.ejb.taxcal.StateTaxIF - com.sun.s1peqe.webservices.ejb.taxcal.StateTaxEjb - Stateless - Container - - - - - - TaxCalEjb - FedTaxEjb - com.sun.s1peqe.webservices.ejb.taxcal.FedTaxIF - com.sun.s1peqe.webservices.ejb.taxcal.FedTaxEjb - Stateless - Container - - - - - - - - - StateTaxEjb - ServiceEndpoint - * - - Required - - - - FedTaxEjb - ServiceEndpoint - * - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml deleted file mode 100755 index ae28a327109..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - ws-taxcal-ejb.jar - 0 - - StateTaxEjb - - - StateTaxIFPort - statetaxejb - CONFIDENTIAL - - CLIENT-CERT - - - - - FedTaxEjb - - - FedTaxIFPort - fedtaxejb - CONFIDENTIAL - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/webservices.xml deleted file mode 100755 index 3b66b4f88be..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/webservices.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - desc - - TaxcalculatorEjb - META-INF/wsdl/TaxCalEjbService.wsdl - TaxCalMapping.xml - - port component description - StateTaxIFPort - taxns:StateTaxIFPort - - com.sun.s1peqe.webservices.ejb.taxcal.StateTaxIF - - - StateTaxEjb - - - - port component description - FedTaxIFPort - taxns:FedTaxIFPort - - com.sun.s1peqe.webservices.ejb.taxcal.FedTaxIF - - - FedTaxEjb - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/sun-application.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/sun-application.xml deleted file mode 100755 index 19eecca8b2e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/sun-application.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - 0 - - users - dilbert - - CN=Dilbert, OU=Comic Division, O=Sun Solarsystems Inc, C=US - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java deleted file mode 100755 index 48a86b3023d..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1peqe.webservices.ejb.taxcal; - -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; - -public class FedTaxEjb implements SessionBean { - - private SessionContext sc; - - public FedTaxEjb(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In FedTaxEjb::ejbCreate !!"); - } - - public double getFedTax(double income, double deductions) { - return ((income - deductions) * 0.2); - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxIF.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxIF.java deleted file mode 100755 index 3a099d5f4a6..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxIF.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1peqe.webservices.ejb.taxcal; - -import java.rmi.RemoteException; -import java.rmi.Remote; - - -public interface FedTaxIF extends Remote{ - - public double getFedTax(double income, double deductions) throws RemoteException; - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java deleted file mode 100755 index d99c7f91957..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1peqe.webservices.ejb.taxcal; - -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; - -public class StateTaxEjb implements SessionBean { - - private SessionContext sc; - - public StateTaxEjb(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In StateTaxEjb::ejbCreate !!"); - } - - public double getStateTax(double income, double deductions) { - return ((income - deductions) * 0.3); - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxIF.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxIF.java deleted file mode 100755 index 38a1531920a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxIF.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package com.sun.s1peqe.webservices.ejb.taxcal; - -import java.rmi.RemoteException; -import java.rmi.Remote; - - -public interface StateTaxIF extends Remote{ - - public double getStateTax(double income, double deductions) throws RemoteException; - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/wsdl/TaxCalEjbService.wsdl b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/wsdl/TaxCalEjbService.wsdl deleted file mode 100755 index 62dbdf8073a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/wsdl/TaxCalEjbService.wsdl +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties deleted file mode 100644 index 389b69b205a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml deleted file mode 100644 index 3d01ebac594..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java deleted file mode 100644 index e9d91ecc250..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package simplehandler; - -import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.namespace.QName; -import javax.xml.rpc.Stub; -import javax.xml.rpc.Service; -import jakarta.xml.soap.SOAPElement; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import servlet.*; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public static void main (String[] args) { - stat.addDescription("webservices-simple-soapfault"); - Client client = new Client(); - client.doTest(args); - stat.printSummary("webservices-soapfaultID"); - } - - public void doTest(String[] args) { - try { - - String targetEndpointAddress = args[0]; - - Context ic = new InitialContext(); - - Service testService = (Service) ic.lookup("java:comp/env/service/simplehandler"); - SimpleServer test = (SimpleServer) - testService.getPort(SimpleServer.class); - - ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - System.out.println("endpoint address = " + targetEndpointAddress); - System.out.println("Invocation returned " + test.sayHello("jerome")); - } catch (Exception ex) { - ex.printStackTrace(); - stat.addStatus("soapfaultsclient main", stat.FAIL); - System.out.println("CAUGHT UNEXPECTED EXCEPTION: " + ex.getMessage()); - } - - stat.addStatus("soapfaultsclient main", stat.PASS); - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/MANIFEST.MF deleted file mode 100644 index 5085a53cb58..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: simplehandler.Client diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml deleted file mode 100644 index 4b08059b546..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml deleted file mode 100644 index d2d8301fcaf..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - This is my handler app client - handlerClient - - simple handler service ref - service/simplehandler - javax.xml.rpc.Service - META-INF/wsdl/SimpleHandlerServlet.wsdl - SimpleHandlerMapping_servlet.xml - servicens:SimpleHandlerServlet - - ejb.SimpleServer - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-application-client.xml deleted file mode 100644 index a4ce49f86e8..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-application-client.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - service/simplehandler - - ejb.SimpleServer - - com.sun.enterprise.webservice.client.transport.log - file:jaxrpc.log - - - - urn:HandlerTest - SimpleHandlerServer - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-web.xml deleted file mode 100644 index f96bc1bf16c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-web.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - ServletHandlerTest - - ServletHandlerTest - - SimpleServerPort - true - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/web.xml deleted file mode 100644 index 7649ec2e2d3..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/web.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - ServletHandlerTest - servlet.ServletHandlerTestImpl - 0 - - - ServletHandlerTest - /ServletHandlerTest - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/webservices.xml deleted file mode 100644 index 7f873e1dc64..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/webservices.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - desc - - SimpleHandlerServlet - WEB-INF/wsdl/SimpleHandlerServlet.wsdl - SimpleHandlerMapping_servlet.xml - - port component description - SimpleServerPort - servicens:SimpleServerPort - servlet.SimpleServer - - ServletHandlerTest - - - SimpleHandler - servlet.SimpleHandler - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/docroot/README b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/docroot/README deleted file mode 100644 index 1ac4e4f3ab5..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/docroot/README +++ /dev/null @@ -1,2 +0,0 @@ -this is a fake directory to work around the -quicklook hardness problem. diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java deleted file mode 100644 index 891d555abc7..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package servlet; - -import java.rmi.*; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; - -public class ServletHandlerTestImpl implements SessionBean { - SessionContext sc; - - public String sayHello(String hello) throws RemoteException { - return "salut " + hello; - } - - public void ejbCreate() throws RemoteException { - System.out.println("In SimpleServer:::ejbCreate !!"); - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java deleted file mode 100644 index c985152abfa..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package servlet; - -import java.util.Date; -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.*; - -public class SimpleHandler extends GenericHandler { - - protected HandlerInfo info = null; - - public void init(HandlerInfo info) { - this.info = info; - } - - public boolean handleRequest(MessageContext context) { - try { - Date startTime = new Date(); - context.setProperty("startTime", startTime); - } catch(Exception e) { - e.printStackTrace(); - } - return true; - } - - public boolean handleResponse(MessageContext context) { - try { - Date startTime = (Date) context.getProperty("startTime"); - Date endTime = new Date(); - long elapsed = endTime.getTime() - startTime.getTime(); - System.out.println(" in handler, elapsed " + elapsed); - } catch(Exception e) { - e.printStackTrace(); - } - return true; - } - - public QName[] getHeaders() { - return new QName[0]; - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java deleted file mode 100644 index 0675cd2976e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package servlet; - -import java.rmi.*; - -public interface SimpleServer extends Remote { - - public String sayHello(String source) throws RemoteException; - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceServletTest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceServletTest.wsdl deleted file mode 100644 index c5118553afd..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceServletTest.wsdl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTest.java b/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTest.java deleted file mode 100644 index 1c74d61e792..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTest.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.webservice; - -import java.rmi.*; - -public interface WebServiceTest extends Remote { - - public String doTest(String[] params) throws RemoteException; -} - diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java deleted file mode 100644 index 965eeac6029..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test.webservice; - -import java.rmi.*; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.rpc.server.ServletEndpointContext; - -public class WebServiceTestImpl implements ServiceLifecycle, WebServiceTest { - - WebServiceTest delegate; - - public void destroy() { - System.out.println("Driver servlet destroyed"); - } - - public void init(Object context) { - ServletEndpointContext seContext = (ServletEndpointContext) context; - String testClassName = seContext.getServletContext().getInitParameter("testclassname"); - if (testClassName==null) { - System.out.println("Error : no delegate servlet provided for test"); - return; - } - try { - Class clazz = Class.forName(testClassName); - if (clazz==null) { - System.out.println("Error : cannot load delegate " + testClassName); - return; - } - Object o = clazz.newInstance(); - if (o instanceof WebServiceTest) { - delegate = (WebServiceTest) o; - } else { - System.out.println("Error : delegate not of type WebServiceTest"); - } - } catch(ClassNotFoundException cnfe) { - System.out.println("Error : cannot load delegate " + testClassName); - } catch(InstantiationException ie) { - System.out.println("Error : cannot instantiate " + testClassName); - } catch(Exception e) { - System.out.println("Error : cannot load delegate " + testClassName + " " + e.getMessage()); - } - } - - public String doTest(String[] params) throws RemoteException { - - if (delegate!=null) { - return delegate.doTest(params); - } else { - throw new RemoteException("No delegate for test harness"); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml b/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml deleted file mode 100644 index 21c84b0e8f3..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/shared/war/webservices.xml deleted file mode 100644 index 3f3b49e52b5..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/webservices.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - -WebServiceServletTest -WEB-INF/wsdl/WebServiceServletTest.wsdl -WebServiceTestMapping.xml - -Port -tns:WebServiceTestPort -test.webservice.WebServiceTest - -WebServiceTestServlet - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties b/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties deleted file mode 100644 index f62be9f0c33..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml deleted file mode 100644 index 9933ebe7651..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java deleted file mode 100644 index b232739b657..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package soapfault; - -import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.namespace.QName; -import javax.xml.rpc.Stub; -import javax.xml.rpc.Service; -import jakarta.xml.soap.SOAPElement; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import soapfault.ejb.*; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public static void main (String[] args) { - stat.addDescription("webservices-simple-soapfault"); - Client client = new Client(); - client.doTest(args); - stat.printSummary("webservices-soapfaultID"); - } - - public void doTest(String[] args) { - try { - - String targetEndpointAddress = args[0]; - - Context ic = new InitialContext(); - - Service testService = (Service) ic.lookup("java:comp/env/service/soapfault"); - SimpleSoapFaultSEI test = (SimpleSoapFaultSEI) - testService.getPort(new QName("urn:SoapFaultTest", "SimpleSoapFaultSEIPort"), - SimpleSoapFaultSEI.class); - - ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - System.out.println("endpoint address = " + targetEndpointAddress); - - try { - String ret = test.simpleMethod(); - } catch (SimpleSoapException ex) { - System.out.println("CAUGHT EXPECTED EXCEPTION: FaultOne: " + ex.getReason()); - } - - stat.addStatus("soapfaultsclient main", stat.PASS); - } catch (Exception ex) { - System.out.println("soapfaults client test failed"); - ex.printStackTrace(); - stat.addStatus("soapfaultsclient main", stat.FAIL); - //System.exit(15); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/MANIFEST.MF deleted file mode 100644 index ff21673a01a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: soapfault.Client diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml deleted file mode 100644 index 8bef2654752..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml deleted file mode 100644 index 87ba0248597..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - This is my soapfaults app client - soapfaultsClient - - simple soapfault service ref - service/soapfault - javax.xml.rpc.Service - META-INF/wsdl/SoapFaultService.wsdl - SoapFaultMapping_ejb.xml - servicens:SoapFaultService - - soapfault.ejb.SimpleSoapFaultSEI - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/ejb-jar.xml deleted file mode 100644 index 8bea6aa9b93..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/ejb-jar.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - Ejb1 - - - SimpleSoapFaultEJB - soapfault.ejb.SimpleSoapFaultSEI - soapfault.ejb.SimpleSoapFaultImpl - Stateless - Container - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-application-client.xml deleted file mode 100644 index fc415418e40..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-application-client.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - service/soapfault - - soapfault.ejb.SimpleSoapFaultSEI - - com.sun.enterprise.webservice.client.transport.log - file:jaxrpc.log - - - - urn:SoapFaultTest - SoapFaultService - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 8f7d0abf558..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - SimpleSoapFaultEJB - SimpleSoapFaultEJB - - SimpleSoapFaultSEIPort - soapfault/SimpleSoapFault - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/webservices.xml deleted file mode 100644 index 11c892af168..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/webservices.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - desc - - SoapFaultService - META-INF/wsdl/SoapFaultService.wsdl - SoapFaultMapping_ejb.xml - - port component description - SimpleSoapFaultSEIPort - servicens:SimpleSoapFaultSEIPort - soapfault.ejb.SimpleSoapFaultSEI - - SimpleSoapFaultEJB - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java deleted file mode 100644 index 0c58545ba5b..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package soapfault.ejb; - -public class SimpleSoapException extends Exception { - - private String reason; - - public SimpleSoapException(String reason) { - this.reason = reason; - } - - public String getReason() { - return reason; - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java deleted file mode 100644 index 1b4ebc74d43..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * SimpleServerImpl.java - * - * Created on September 13, 2004, 11:24 AM - */ - -package soapfault.ejb; - -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import java.rmi.RemoteException; - -/** - * - * @author dochez - */ -public class SimpleSoapFaultImpl implements SessionBean { - - SessionContext sc; - - /** Creates a new instance of SimpleServerImpl */ - public SimpleSoapFaultImpl() { - } - - public void ejbCreate() throws RemoteException { - System.out.println("In GoogleEJB::ejbCreate !!"); -} - - public String simpleMethod() - throws SimpleSoapException, RemoteException { - - throw new SimpleSoapException("I only raise exceptions !"); - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java deleted file mode 100644 index 113d8f154a7..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package soapfault.ejb; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -public interface SimpleSoapFaultSEI extends Remote { - - public String simpleMethod() throws SimpleSoapException, RemoteException; - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties deleted file mode 100644 index 5bddbff0289..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml deleted file mode 100644 index 90c19d0ddbf..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Usage: - ant all (Executes the WebServices test) - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java deleted file mode 100644 index bce2079362f..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package soapfaults; - -import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.rpc.Stub; -import jakarta.xml.soap.SOAPElement; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public static void main (String[] args) { - stat.addDescription("webservices-soapfaults"); - Client client = new Client(); - client.doTest(args); - stat.printSummary("webservices-soapfaultsID"); - } - - public void doTest(String[] args) { - try { - - String targetEndpointAddress = args[0]; - - Context ic = new InitialContext(); - - TestService testService = - (TestService) ic.lookup("java:comp/env/service/soapfaults"); - Test test = testService.getTestPort(); - - ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - System.out.println("endpoint address = " + targetEndpointAddress); - - Test2RequestType c = new Test2RequestType("recess", "weekender"); - - try { - Test1ResponseType ret = test.test1("1", "test fault one", c); - } catch (FaultOne ex) { - System.out.println("CAUGHT EXPECTED EXCEPTION: FaultOne: " + ex.getMessage1()); - } - - try { - Test1ResponseType ret = test.test1("2", "test fault two", c); - } catch (FaultTwo ex) { - System.out.println("CAUGHT EXPECTED EXCEPTION: FaultTwo: " + ex.getMessage2()); - } - - try { - Test1ResponseType ret = test.test1("3", "test fault three", c); - } catch (FaultThree ex) { - System.out.println("CAUGHT EXPECTED EXCEPTION: FaultThree: " + ex.getMessage3()); - } - - stat.addStatus("soapfaultsclient main", stat.PASS); - } catch (Exception ex) { - System.out.println("soapfaults client test failed"); - ex.printStackTrace(); - stat.addStatus("soapfaultsclient main", stat.FAIL); - //System.exit(15); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/MANIFEST.MF deleted file mode 100644 index 6eea9a6ae31..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: soapfaults.Client diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/config.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/config.xml deleted file mode 100644 index b8e05e25b3c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml deleted file mode 100644 index 9ec3319117c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - This is my soapfaults app client - soapfaultsClient - - soapfaults service ref - service/soapfaults - soapfaults.TestService - META-INF/wsdl/soapfaults.wsdl - mapping_appclient.xml - servicens:TestService - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application.xml deleted file mode 100644 index 33626f9ad4a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Application description - App - - soapfaults-client.jar - - - soapfaults-ejb.jar - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/ejb-jar.xml deleted file mode 100644 index a93c3c02a4b..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/ejb-jar.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Ejb1 - - - SoapFaultsEjb - soapfaultsejb.Test - soapfaultsejb.SoapFaultsEJB - Stateless - Container - - - - - - SoapFaultsEjb - ServiceEndpoint - * - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-application-client.xml deleted file mode 100644 index 0dc6db971dd..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-application-client.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - service/soapfaults - - soapfaults.Test - - com.sun.enterprise.webservice.client.transport.log - file:jaxrpc.log - - - - urn:TestService - TestService - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 3d93db33f60..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - 0 - - SoapFaultsEjb - SoapFaultsEjb - false - false - -1 - - - TestPort - soapfaultsejb/SoapFaultsTest - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/webservices.xml deleted file mode 100644 index e74d8dc3e46..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/webservices.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - desc - - SoapFaultsWebServiceEjb - META-INF/wsdl/soapfaults.wsdl - mapping_ejb.xml - - port component description - TestPort - myns:TestPort - soapfaultsejb.Test - - SoapFaultsEjb - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java deleted file mode 100644 index 77c5ed292a3..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package soapfaultsejb; - -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; -import javax.xml.rpc.handler.MessageContext; - -public class SoapFaultsEJB implements SessionBean { - private SessionContext sc; - - public SoapFaultsEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In SoapFaultsEJB::ejbCreate !!"); - } - - public Test1ResponseType test1(String a, String b, - Test2RequestType c) - throws FaultOne, FaultThree, FaultTwo, java.rmi.RemoteException - { - MessageContext msgContext = sc.getMessageContext(); - System.out.println("msgContext = " + msgContext); - - System.out.println("SoapFaultsEJB.test1() called with "); - System.out.println("a = " + a); - System.out.println("b = " + b); - - System.out.println("Test2RequestType.a = " + c.getTest2RequestParamA()); - System.out.println("Test2RequestType.b = " + c.getTest2RequestParamB()); - - if ("1".equals(a)) { - System.out.println("SoapFaultsEJB... throwing FaultOne Exception"); - throw new FaultOne("1", "I need a life."); - } - - if ("2".equals(a)) { - System.out.println("SoapFaultsEJB... throwing FaultTwo Exception"); - throw new FaultTwo("2", "I am so tired"); - } - - if ("3".equals(a)) { - System.out.println("SoapFaultsEJB... throwing FaultThree Exception"); - throw new FaultThree("3", "I love fortune cookies"); - } - - Test1ResponseType t = new Test1ResponseType(1,2); - return t; - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/soapfaults.wsdl b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/soapfaults.wsdl deleted file mode 100644 index 8ad5e8a3d3a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/soapfaults.wsdl +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml deleted file mode 100644 index 20a2fdf8202..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml deleted file mode 100644 index bb3634b3ba4..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties deleted file mode 100644 index ffdf9223369..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml deleted file mode 100644 index 48f3172fc86..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java deleted file mode 100644 index 11a1660a93c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -import java.net.URL; -import javax.xml.rpc.ServiceFactory; -import javax.xml.rpc.Service; -import javax.xml.rpc.Call; -import javax.xml.namespace.QName; - - -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -import test.webservice.WebServiceTest; - -/** - * - * @author dochez - */ - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public static void main(String[] args) { - stat.addDescription("webservices-web-stubs-properties"); - Client client = new Client(); - client.doTest(args); - stat.printSummary("webservices-web-stubs-properties"); - } - - public void doTest(String[] args) { - try { - dynamic(args); - stat.addStatus("web-stubs-properties Dynamic Proxy", stat.PASS); - } catch(Exception e) { - System.out.println("Failure " + e.getMessage()); - e.printStackTrace(); - stat.addStatus("web-stubs-properties Dynamic Proxy", stat.FAIL); - } - } - - public void dynamic(String[] args) throws Exception { - String endpoint = args[0]; - System.out.println("Invoking dynamic proxies with endpoint at " + endpoint); - URL wsdlURL = new URL(endpoint+"?WSDL"); - ServiceFactory factory = ServiceFactory.newInstance(); - Service service = factory.createService(wsdlURL, - new QName("urn:WebServiceTest","WebServiceServletTest")); - System.out.println("Obtained Service"); - WebServiceTest intf = (WebServiceTest) service.getPort( - new QName("urn:WebServiceTest","WebServiceTestPort"), - WebServiceTest.class); - String[] params = new String[1]; - params[0] = " from client"; - System.out.println(intf.doTest(params)); - } - - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/MANIFEST.MF deleted file mode 100644 index cc0dbf69987..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: Client \ No newline at end of file diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml deleted file mode 100644 index 5c9ef9164b4..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/application-client.xml deleted file mode 100644 index 717198463fa..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/application-client.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - This is my web stub properties test app client - WebStubProperties - diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/ejb-jar.xml deleted file mode 100644 index b2bbfeb2123..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/ejb-jar.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - Ejb1 - - - SayHelloEJB - stubprops.SimpleServer - stubprops.SimpleServerImpl - Stateless - Container - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 6fe5532f3d9..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - SayHelloEJB - SayHelloEJB - - SimpleServerPort - simpleserver/SimpleServer - true - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml deleted file mode 100644 index 36605daa48e..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - WebServiceTestServlet - - test.webservice.WebServiceTestImpl - - Port - true - - - - service/SimpleServiceReference - - stubprops.SimpleServer - - javax.xml.rpc.service.endpoint.address - http://@webHost@:@webPort@/simpleserver/SimpleServer - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml deleted file mode 100644 index 283ad48d6ce..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - testclassname - stubprops.TestServlet - - - test.webservice.WebServiceTestImpl - test.webservice.WebServiceTestImpl - 0 - - - test.webservice.WebServiceTestImpl - /WebServiceTestService - - - service ref for ejb endpoint - service/SimpleServiceReference - javax.xml.rpc.Service - WEB-INF/wsdl/SayHelloService.wsdl - SayHelloMapping_ejb.xml - servicens:SayHelloService - - stubprops.SimpleServer - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/webservices.xml deleted file mode 100644 index 680e3502cc0..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/webservices.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - desc - - SayHelloService - META-INF/wsdl/SayHelloService.wsdl - SayHelloMapping_ejb.xml - - port component description - SimpleServerPort - servicens:SimpleServerPort - stubprops.SimpleServer - - SayHelloEJB - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/docroot/README b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/docroot/README deleted file mode 100644 index 1ac4e4f3ab5..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/docroot/README +++ /dev/null @@ -1,2 +0,0 @@ -this is a fake directory to work around the -quicklook hardness problem. diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java deleted file mode 100644 index 8c189bc0b84..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * SimpleServer.java - * - * Created on September 13, 2004, 11:23 AM - */ - -package stubprops; - -import java.rmi.RemoteException; -import java.rmi.Remote; - -/** - * Simple WebServices Interface - * - * @author Jerome Dochez - */ -public interface SimpleServer extends Remote { - - public String sayHello(String who) throws RemoteException; -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java deleted file mode 100644 index 21e33bb58de..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * SimpleServerImpl.java - * - * Created on September 13, 2004, 11:24 AM - */ - -package stubprops; - -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import java.rmi.RemoteException; - -/** - * - * @author dochez - */ -public class SimpleServerImpl implements SessionBean { - - SessionContext sc; - - /** Creates a new instance of SimpleServerImpl */ - public SimpleServerImpl() { - } - - public void ejbCreate() throws RemoteException { - System.out.println("In GoogleEJB::ejbCreate !!"); -} - - public String sayHello(String who) throws RemoteException { - return "hello" + who; - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java deleted file mode 100644 index 94706ffa917..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -/* - * TestServlet.java - * - * Created on September 13, 2004, 3:16 PM - */ - -package stubprops; - -import test.webservice.WebServiceTest; -import java.rmi.RemoteException; -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - - -/** - * - * @author dochez - */ -public class TestServlet implements WebServiceTest { - - SimpleServer port; - - /** Creates a new instance of TestServlet */ - public TestServlet() { - System.out.println("Test servlet instantiated"); - } - - public String doTest(String[] parameters) throws RemoteException { - - System.out.println("Test servlet invoked"); - Service ref; - try { - InitialContext ic = new InitialContext(); - ref = (Service) ic.lookup("java:comp/env/service/SimpleServiceReference"); - } catch(javax.naming.NamingException e) { - e.printStackTrace(); - return "Failed - " + e.getMessage(); - } - if (ref==null) { - System.out.println("failure : cannot get service ref"); - return "Failed - Cannot get ref"; - } - try { - java.util.Iterator itr = ref.getPorts(); - while (itr.hasNext()) { - System.out.println(itr.next()); - - } - - port = (SimpleServer) ref.getPort(SimpleServer.class); - } catch(javax.xml.rpc.ServiceException e) { - e.printStackTrace(); - System.out.println("Failed - Cannot get port"); - return "Failed - " + e.getMessage(); - } - if (port==null) { - System.out.println("failure : cannot get port"); - return "Failed - Cannot get port"; - } - return port.sayHello(parameters[0]); - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml index 348af5c9f0d..10b344b5f36 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml @@ -33,51 +33,54 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml index 78d64b515f3..11fb5375ea6 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml +++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml @@ -33,69 +33,71 @@ &testproperties; &jaxwsTools; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/README b/appserver/tests/appserv-tests/devtests/webservice/wsi/README deleted file mode 100644 index 07e7f941fc5..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/README +++ /dev/null @@ -1,9 +0,0 @@ - -this directory contains some unit tests that are meant to touch -some wsi compliant areas wrt faultcode. - -we now have rpc/literal style only. - -since CTS does not have any tests on faultcode handling using -an ejb endpoint, we will exclusive test out just web services -with ejb endpoints diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties deleted file mode 100644 index 34fd60d0ae9..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml deleted file mode 100644 index f3ad3d49d06..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Usage: - ant all (Executes the WebServices test) - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java deleted file mode 100644 index 4db8f10311c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package faultcode; - -import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.rpc.Stub; -import jakarta.xml.soap.SOAPElement; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public static void main (String[] args) { - stat.addDescription("webservices-faultcode"); - Client client = new Client(); - client.doTest(args); - stat.printSummary("webservices-faultcodeID"); - } - - public void doTest(String[] args) { - try { - - String targetEndpointAddress = args[0]; - - Context ic = new InitialContext(); - - SimpleTestService testService = - (SimpleTestService) ic.lookup("java:comp/env/service/faultcode"); - SimpleTest test = testService.getSimpleTest(); - - ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - System.out.println("endpoint address = " + targetEndpointAddress); - - //SingleWildcardType c = new SingleWildcardType(8, "Single", new SOAPElement()); -/* - SingleWildcardType c = new SingleWildcardType(8, "Single", "BUGGGY how to do single soapelement"); - - String[] dd = new String[2]; - dd[0] = "wild"; - dd[1] = "card"; - RepeatedWildcardType d = new RepeatedWildcardType(88, "Repeated", new SOAPElement[0]); - - int ret = test.test1(888, c, d); - - System.out.println("RETURN LUCKY NUMBER = " + ret); -*/ - stat.addStatus("xsdanyclient main", stat.PASS); - - } catch (Exception ex) { - System.out.println("xsdany client test failed"); - ex.printStackTrace(); - stat.addStatus("xsdanyclient main", stat.FAIL); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/MANIFEST.MF deleted file mode 100644 index cb2a28136cd..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: xsdany.Client diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/config.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/config.xml deleted file mode 100644 index 2bfe80ed1ef..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml deleted file mode 100644 index 1ccab9c37a2..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - This is my faultcode app client - faultcodeClient - - faultcode service ref - service/faultcode - faultcode.TestService - META-INF/wsdl/faultcode.wsdl - FaultCodeMapping_appclient.xml - servicens:TestService - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application.xml deleted file mode 100644 index 645b13780fe..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Application description - FaultCodeApp - - faultcode-client.jar - - - faultcode-ejb.jar - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/ejb-jar.xml deleted file mode 100644 index 0717702cfb1..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/ejb-jar.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Ejb1 - - - FaultCodeEjb - faultcodeejb.Test - faultcodeejb.FaultCodeEJB - Stateless - Container - - - - - - FaultCodeEjb - ServiceEndpoint - * - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-application-client.xml deleted file mode 100644 index 5a9d210448c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-application-client.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - service/faultcode - - faultcode.Test - - com.sun.enterprise.webservice.client.transport.log - file:jaxrpc.log - - - - urn:TestService - TestService - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 01e36b6ccf7..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - 0 - - FaultCodeEjb - FaultCodeEjb - false - false - -1 - - - TestPort - faultcode/FaultCodeTest - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/webservices.xml deleted file mode 100644 index a7961481c19..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/webservices.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - desc - - FaultCodeWebServiceEjb - META-INF/wsdl/faultcode.wsdl - FaultCodeMapping_ejb.xml - - port component description - TestPort - faultcodens:TestPort - faultcodeejb.Test - - FaultCodeEjb - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java deleted file mode 100644 index 55734c94b22..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package faultcodeejb; - -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; -import javax.xml.rpc.handler.MessageContext; - -public class FaultCodeEJB implements SessionBean { - private SessionContext sc; - - public FaultCodeEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In FaultCodeEJB::ejbCreate !!"); - } - - public String echoString(String body) { - System.out.println("In FaultCodeEJB:: echoString = " + body); - return body; - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/faultcode.wsdl b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/faultcode.wsdl deleted file mode 100644 index c04d055aa7b..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/faultcode.wsdl +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml deleted file mode 100644 index 1dde122ad49..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml deleted file mode 100644 index af5e53f6d18..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties b/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties deleted file mode 100644 index 458c81948f8..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml deleted file mode 100644 index fc34f0695b2..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - -]> - - - - - &commonSetup; - &commonBuild; - &testproperties; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Usage: - ant all (Executes the WebServices test) - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java deleted file mode 100644 index 696658d94a5..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package xsdany; - -import java.io.*; -import java.util.*; -import javax.naming.*; -import javax.xml.rpc.Stub; -import jakarta.xml.soap.SOAPElement; -import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; - -public class Client { - - private static SimpleReporterAdapter stat = - new SimpleReporterAdapter("appserv-tests"); - - public static void main (String[] args) { - stat.addDescription("webservices-xsdany"); - Client client = new Client(); - client.doTest(args); - stat.printSummary("webservices-xsdanyID"); - } - - public void doTest(String[] args) { - try { - - String targetEndpointAddress = args[0]; - - Context ic = new InitialContext(); - - TestService testService = - (TestService) ic.lookup("java:comp/env/service/xsdany"); - Test test = testService.getTestPort(); - - ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, - targetEndpointAddress); - - System.out.println("endpoint address = " + targetEndpointAddress); - - //SingleWildcardType c = new SingleWildcardType(8, "Single", new SOAPElement()); - SingleWildcardType c = new SingleWildcardType(8, "Single", "BUGGGY how to do single soapelement"); - - String[] dd = new String[2]; - dd[0] = "wild"; - dd[1] = "card"; - RepeatedWildcardType d = new RepeatedWildcardType(88, "Repeated", new SOAPElement[0]); - - int ret = test.test1(888, c, d); - - System.out.println("RETURN LUCKY NUMBER = " + ret); - stat.addStatus("xsdanyclient main", stat.PASS); - - } catch (Exception ex) { - System.out.println("xsdany client test failed"); - ex.printStackTrace(); - stat.addStatus("xsdanyclient main", stat.FAIL); - } - } -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/MANIFEST.MF deleted file mode 100644 index cb2a28136cd..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: xsdany.Client diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/config.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/config.xml deleted file mode 100644 index 2bfe80ed1ef..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml deleted file mode 100644 index f018ec887c8..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - This is my xsdany app client - xsdanyClient - - xsdany service ref - service/xsdany - xsdany.TestService - META-INF/wsdl/xsdany.wsdl - XsdAnyMapping_appclient.xml - servicens:TestService - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application.xml deleted file mode 100644 index 9329a499dd4..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Application description - XsdAnyApp - - xsdany-client.jar - - - xsdany-ejb.jar - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/ejb-jar.xml deleted file mode 100644 index e09a41cd679..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/ejb-jar.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Ejb1 - - - XsdAnyEjb - xsdanyejb.Test - xsdanyejb.XsdAnyEJB - Stateless - Container - - - - - - XsdAnyEjb - ServiceEndpoint - * - - Required - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-application-client.xml deleted file mode 100644 index 6c87a9d812c..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-application-client.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - service/xsdany - - xsdany.Test - - - urn:TestService - TestService - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-ejb-jar.xml deleted file mode 100644 index 33e357fd77a..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-ejb-jar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - 0 - - XsdAnyEjb - XsdAnyEjb - false - false - -1 - - - TestPort - xsdanyejb/XsdAnyTest - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/webservices.xml deleted file mode 100644 index 121427af5ad..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/webservices.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - desc - - XsdAnyWebServiceEjb - META-INF/wsdl/xsdany.wsdl - XsdAnyMapping_ejb.xml - - port component description - TestPort - xsdanyns:TestPort - xsdanyejb.Test - - XsdAnyEjb - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java b/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java deleted file mode 100644 index 9488540c082..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package xsdanyejb; - -import java.io.Serializable; -import java.rmi.RemoteException; -import jakarta.ejb.SessionBean; -import jakarta.ejb.SessionContext; -import jakarta.ejb.EJBException; -import javax.naming.*; -import javax.xml.rpc.handler.MessageContext; - -public class XsdAnyEJB implements SessionBean { - private SessionContext sc; - - public XsdAnyEJB(){} - - public void ejbCreate() throws RemoteException { - System.out.println("In XsdAnyEJB::ejbCreate !!"); - } - - public int test1(int a, - xsdanyejb.SingleWildcardType c, - xsdanyejb.RepeatedWildcardType d) - throws java.rmi.RemoteException - { - MessageContext msgContext = sc.getMessageContext(); - System.out.println("msgContext = " + msgContext); - - System.out.println("XsdAnyEJB.test1() called with "); - System.out.println("a = " + a); - - System.out.println("SingleWildcardType.foo = " + c.getFoo()); - System.out.println("SingleWildcardType.bar = " + c.getBar()); - //System.out.println("SingleWildcardType._any = " + c.get_any()); - System.out.println("SingleWildcardType._any = " + c.getVoo()); - - System.out.println("RepeatedWildcardType.foo = " + d.getFoo()); - System.out.println("RepeatedWildcardType.bar = " + d.getBar()); - System.out.println("RepeatedWildcardType._any = " + d.get_any()); - - System.out.println("GoogleEJB returning " + a); - - return a; - } - - public void setSessionContext(SessionContext sc) { - - this.sc = sc; - } - - public void ejbRemove() throws RemoteException {} - - public void ejbActivate() {} - - public void ejbPassivate() {} - -} diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml deleted file mode 100644 index bcb953bbcad..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml deleted file mode 100644 index cc2b7372200..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/xsdany.wsdl b/appserver/tests/appserv-tests/devtests/webservice/xsdany/xsdany.wsdl deleted file mode 100644 index 6f44fc643c9..00000000000 --- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/xsdany.wsdl +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 7c300417987955599bf8fdcc576f727d39e52b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:26:02 +0100 Subject: [PATCH 16/33] #23507 gftest.sh now respects some variables possibly set by the caller --- appserver/tests/gftest.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/appserver/tests/gftest.sh b/appserver/tests/gftest.sh index b364a843c16..79572057630 100755 --- a/appserver/tests/gftest.sh +++ b/appserver/tests/gftest.sh @@ -49,11 +49,17 @@ if [ ! -z "${JENKINS_HOME}" ] ; then # setup the local repository # with the archived chunk from the pipeline build stage - tar -xzf ${WORKSPACE}/bundles/maven-repo.tar.gz --overwrite -m -p -C ${HOME}/.m2/repository + if [ -f "${WORKSPACE}/bundles/maven-repo.tar.gz" ]; then + tar -xzf ${WORKSPACE}/bundles/maven-repo.tar.gz --overwrite -m -p -C ${HOME}/.m2/repository + fi echo "Removing old glassfish directory: ${S1AS_HOME}"; rm -rf "${S1AS_HOME}"; - export GF_VERSION="$(mvn help:evaluate -f ${APS_HOME}/pom.xml -Dexpression=project.version -q -DforceStdout)"; - export MVN_REPOSITORY="${HOME}/.m2/repository"; + if [ -z "${GF_VERSION}" ]; then + export GF_VERSION="$(mvn help:evaluate -f \"${APS_HOME}/pom.xml\" -Dexpression=project.version -q -DforceStdout)" + fi + if [ -z "${MVN_REPOSITORY}" ]; then + export MVN_REPOSITORY="${HOME}/.m2/repository"; + fi fi "$@" From fce12433148dc667dd2213cc575608d7c045f051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:27:56 +0100 Subject: [PATCH 17/33] #23507 Avoid confusing compiler by the java.lang.Record --- .../sqetests/connector/cci-embedded/ejb/CoffeeBean.java | 2 +- .../appserv-tests/sqetests/connector/cci/ejb/CoffeeBean.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeBean.java index b66bd1aafb2..acf111237a9 100644 --- a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeBean.java +++ b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeBean.java @@ -58,7 +58,7 @@ public int getCoffeeCount() { iSpec.setFunctionName("COUNTCOFFEE"); RecordFactory rf = cf.getRecordFactory(); IndexedRecord iRec = rf.createIndexedRecord("InputRecord"); - Record oRec = ix.execute(iSpec, iRec); + jakarta.resource.cci.Record oRec = ix.execute(iSpec, iRec); Iterator iterator = ((IndexedRecord)oRec).iterator(); while(iterator.hasNext()) { Object obj = iterator.next(); diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeBean.java index ff1a85fea5b..3f650e41fb5 100644 --- a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeBean.java +++ b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeBean.java @@ -58,7 +58,7 @@ public int getCoffeeCount() { iSpec.setFunctionName("COUNTCOFFEE"); RecordFactory rf = cf.getRecordFactory(); IndexedRecord iRec = rf.createIndexedRecord("InputRecord"); - Record oRec = ix.execute(iSpec, iRec); + jakarta.resource.cci.Record oRec = ix.execute(iSpec, iRec); Iterator iterator = ((IndexedRecord)oRec).iterator(); while(iterator.hasNext()) { Object obj = iterator.next(); From ad18ab244f8b0402539dc02892d7916dbb3892e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:32:50 +0100 Subject: [PATCH 18/33] #23507 Fixed NPE in WebServiceReferenceManagerImpl - wsdl variable can be null - reproduced by some test enabled in recent commits --- .../WebServiceReferenceManagerImpl.java | 64 +++++++++++-------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceReferenceManagerImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceReferenceManagerImpl.java index 3e16bee8a2c..15975d08d56 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceReferenceManagerImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceReferenceManagerImpl.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -31,7 +32,6 @@ import javax.naming.Context; import javax.naming.NamingException; import javax.naming.InitialContext; -import javax.xml.namespace.QName; import jakarta.xml.ws.soap.MTOMFeature; import jakarta.xml.ws.soap.AddressingFeature; import jakarta.xml.ws.WebServiceFeature; @@ -68,10 +68,12 @@ public class WebServiceReferenceManagerImpl implements WebServiceReferenceManage protected Logger logger = LogUtils.getLogger(); + @Override public Object getWSContextObject() { return new WebServiceContextImpl(); } + @Override public Object resolveWSReference(ServiceReferenceDescriptor desc, Context context) throws NamingException { @@ -261,8 +263,9 @@ private Object initiateInstance(Class svcClass, ServiceReferenceDescriptor desc) */ if (e instanceof InvocationTargetException) { URL optionalWsdlURL = generateWsdlFile(desc); - if (optionalWsdlURL == null) + if (optionalWsdlURL == null) { throw e; + } obj = cons.newInstance(optionalWsdlURL, desc.getServiceName()); } } @@ -328,13 +331,15 @@ private URL generateWsdlFile(ServiceReferenceDescriptor desc) throws IOException * generate it again. */ - if (optionalWsdl.exists()) + if (optionalWsdl.exists()) { return optionalWsdl.toURI().toURL(); + } createParentDirs(optionalWsdl); ServletAdapter targetEndpoint = getServletAdapter(desc); - if (targetEndpoint == null) + if (targetEndpoint == null) { return null; + } ServiceDefinition serviceDefinition = targetEndpoint.getServiceDefinition(); Iterator wsdlnum = serviceDefinition.iterator(); SDDocument wsdlDocument = null; @@ -346,8 +351,9 @@ private URL generateWsdlFile(ServiceReferenceDescriptor desc) throws IOException } } - if (wsdlDocument == null) + if (wsdlDocument == null) { return null; + } OutputStream outputStream = null; try { @@ -357,8 +363,9 @@ private URL generateWsdlFile(ServiceReferenceDescriptor desc) throws IOException DocumentAddressResolver resolver = targetEndpoint.getDocumentAddressResolver(portAddressResolver); wsdlDocument.writeTo(portAddressResolver, resolver, outputStream); } finally { - if (outputStream != null) + if (outputStream != null) { outputStream.close(); + } } return optionalWsdl.toURI().toURL(); @@ -374,7 +381,6 @@ private URL generateWsdlFile(ServiceReferenceDescriptor desc) throws IOException private ServletAdapter getServletAdapter(ServiceReferenceDescriptor desc) { WebBundleDescriptor webBundle = null; - WebServicesDescriptor webServicesDescriptor = null; /* * If flow has reached to this part of the code,then in all likelihood, @@ -425,8 +431,9 @@ private ServletAdapter getServletAdapter(ServiceReferenceDescriptor desc) { * If an unlikely event when there is no associated webService or desc.getServiceLocalPart() * itself is null, then fall back on fetching ServletAdapter based on wsdl url. */ - if (webService == null) + if (webService == null) { return getServletAdapterBasedOnWsdlUrl(desc); + } String contextRoot = webBundle.getContextRoot(); String webSevicePath = null; @@ -442,8 +449,9 @@ private ServletAdapter getServletAdapter(ServiceReferenceDescriptor desc) { if (desc.getServiceName().equals(endpoint.getServiceName()) && desc.getServiceNamespaceUri().equals(endpoint.getWsdlService().getNamespaceURI())) { String endPointAddressURI = endpoint.getEndpointAddressUri(); - if (endPointAddressURI == null || endPointAddressURI.length() == 0) + if (endPointAddressURI == null || endPointAddressURI.length() == 0) { return null; + } webSevicePath = endPointAddressURI.startsWith("/") ? endPointAddressURI : ("/" + endPointAddressURI); publishingContext = "/" + endpoint.getPublishingUri() + "/" + webService.getWsdlFileUri(); Adapter adapter = JAXWSAdapterRegistry.getInstance() @@ -473,9 +481,13 @@ private ServletAdapter getServletAdapterBasedOnWsdlUrl(ServiceReferenceDescripto } URL wsdl = desc.getWsdlFileUrl(); + if (wsdl == null) { + return null; + } String wsdlPath = wsdl.getPath().trim(); - if (!wsdlPath.contains(WebServiceEndpoint.PUBLISHING_SUBCONTEXT)) + if (!wsdlPath.contains(WebServiceEndpoint.PUBLISHING_SUBCONTEXT)) { return null; + } /* * WsdlPath indeed contains the WebServiceEndpoint.PUBLISHING_SUBCONTEXT, @@ -486,16 +498,20 @@ private ServletAdapter getServletAdapterBasedOnWsdlUrl(ServiceReferenceDescripto String contextRootAndPath = wsdlPath.substring(1, wsdlPath.indexOf(WebServiceEndpoint.PUBLISHING_SUBCONTEXT) - 1); // test/Translator - if (!(contextRootAndPath.length() > 0)) + if (contextRootAndPath.isEmpty()) { return null; + } String[] contextRootAndPathArray = contextRootAndPath.split("/"); // {test, Translator} - if (contextRootAndPathArray.length != 2) + if (contextRootAndPathArray.length != 2) { return null; - if (contextRootAndPathArray[0] == null) + } + if (contextRootAndPathArray[0] == null) { return null; + } String contextRoot = "/" + contextRootAndPathArray[0]; // /test - if (contextRootAndPathArray[1] == null) + if (contextRootAndPathArray[1] == null) { return null; + } String webSevicePath = "/" + contextRootAndPathArray[1]; // /Translator String urlPattern = wsdlPath.substring(contextRoot.length()); Adapter adapter = JAXWSAdapterRegistry.getInstance() @@ -524,7 +540,7 @@ private ArrayList getWebServiceFeatures(ServiceReferenceDescr * If these are present use the * Service(url,wsdl,features) constructor */ - ArrayList wsFeatures = new ArrayList(); + ArrayList wsFeatures = new ArrayList<>(); if (desc.isMtomEnabled()) { wsFeatures.add( new MTOMFeature(true,desc.getMtomThreshold())) ; } @@ -548,14 +564,13 @@ private ArrayList getWebServiceFeatures(ServiceReferenceDescr } private AddressingFeature.Responses getResponse(String s) { - if (s != null) { - return AddressingFeature.Responses.valueOf(AddressingFeature.Responses.class,s); - } else return AddressingFeature.Responses.ALL; - + if (s == null) { + return AddressingFeature.Responses.ALL; + } + return Enum.valueOf(AddressingFeature.Responses.class, s); } - private void resolvePortComponentLinks(ServiceReferenceDescriptor desc) - throws Exception { + private void resolvePortComponentLinks(ServiceReferenceDescriptor desc) throws Exception { // Resolve port component links to target endpoint address. // We can't assume web service client is running in same VM @@ -563,12 +578,11 @@ private void resolvePortComponentLinks(ServiceReferenceDescriptor desc) // // Also set port-qname based on linked port's qname if not // already set. - for(Iterator iter = desc.getPortsInfo().iterator(); iter.hasNext();) { - ServiceRefPortInfo portInfo = (ServiceRefPortInfo) iter.next(); + for (Object element : desc.getPortsInfo()) { + ServiceRefPortInfo portInfo = (ServiceRefPortInfo) element; if( portInfo.isLinkedToPortComponent() ) { - WebServiceEndpoint linkedPortComponent = - portInfo.getPortComponentLink(); + WebServiceEndpoint linkedPortComponent = portInfo.getPortComponentLink(); // XXX-JD we could at this point try to figure out the // endpoint-address from the ejb wsdl file but it is a From 1cb11bfc7f40a2c818eceae700e32109430cdb04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:34:51 +0100 Subject: [PATCH 19/33] #23507 Added add-opens for java.io - fixes issue reproducible by some of naming_all tests when using cluster instances --- .../src/main/resources/config/domain.xml | 16 +++++++++------- .../src/main/resources/config/domain.xml | 14 ++++++++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/appserver/admin/template/src/main/resources/config/domain.xml b/appserver/admin/template/src/main/resources/config/domain.xml index 11b43e79b77..a2275bca738 100644 --- a/appserver/admin/template/src/main/resources/config/domain.xml +++ b/appserver/admin/template/src/main/resources/config/domain.xml @@ -208,12 +208,13 @@ -XX:NewRatio=2 -Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar - --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED - --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED - --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED + --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED + --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED @@ -398,12 +399,13 @@ -Dorg.glassfish.gmbal.no.multipleUpperBoundsException=true -Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar - --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED - --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED - --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED + --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED + --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED @@ -461,7 +463,7 @@ - + diff --git a/nucleus/admin/template/src/main/resources/config/domain.xml b/nucleus/admin/template/src/main/resources/config/domain.xml index 45e7f0bfd77..55e5f53c390 100644 --- a/nucleus/admin/template/src/main/resources/config/domain.xml +++ b/nucleus/admin/template/src/main/resources/config/domain.xml @@ -170,12 +170,13 @@ -XX:NewRatio=2 -Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar - --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED - --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED - --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED + --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED + --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED @@ -324,12 +325,13 @@ -Dorg.glassfish.gmbal.no.multipleUpperBoundsException=true -Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar - --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED - --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED - --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED + --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED + --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED From eb38ffc1ad95b6480406f0b53d272133cf1a3fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:37:24 +0100 Subject: [PATCH 20/33] #23507 runtests.sh extended - respects some externally set env properties - removes glassfish before execution - detects glassfish version automatically --- runtests.sh | 81 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 30 deletions(-) diff --git a/runtests.sh b/runtests.sh index 2b7e7004dce..e244473b30b 100755 --- a/runtests.sh +++ b/runtests.sh @@ -17,19 +17,13 @@ set -e -echo "This script can be temporarily used for local testing until we integrate current set of tests to Maven"; -echo "First argument is a version of GlassFish used for testing. It will be downloaded by Maven command"; -echo "Second argument is a test set id, one of: -cdi_all, ql_gf_full_profile_all, \n -\n -web_jsp, deployment_all, \n -ejb_group_1. ejb_group_2, ejb_group_3, ejb_group_embedded, \n -cdi_all, ql_gf_full_profile_all, ql_gf_nucleus_all, \ -ql_gf_web_profile_all, nucleus_admin_all, jdbc_all, batch_all, persistence_all, \ -connector_group_1, connector_group_2, connector_group_3, connector_group_4"; - -echo "If you need to use a different JAVA_HOME than is used by your system, export it or edit this script."; -echo ""; +catch() { + if [ "$1" != "0" ]; then + "${S1AS_HOME}"/bin/asadmin stop-domain --kill=true --force=true domain1 + echo "Error $1 occurred on $2" + exit $1; + fi +} install_glassfish() { mvn clean -N org.apache.maven.plugins:maven-dependency-plugin:3.2.0:copy \ @@ -48,34 +42,61 @@ install_jacoco() { #################################### -export GF_VERSION="$1" -export JACOCO_ENABLED="true" -test="${2}" +trap 'catch $? $LINENO' EXIT + +echo "This script can be temporarily used for local testing until we integrate current set of tests to Maven"; +echo "First argument is a version of GlassFish used for testing. It will be downloaded by Maven command"; +echo "Second argument is a test set id, one of: +cdi_all, ql_gf_full_profile_all, \n +\n +web_jsp, deployment_all, \n +ejb_group_1. ejb_group_2, ejb_group_3, ejb_group_embedded, \n +cdi_all, ql_gf_full_profile_all, ql_gf_nucleus_all, \ +ql_gf_web_profile_all, nucleus_admin_all, jdbc_all, batch_all, persistence_all, \ +connector_group_1, connector_group_2, connector_group_3, connector_group_4"; + +echo "If you need to use a different JAVA_HOME than is used by your system, export it or edit this script."; +echo ""; -# uncomment and edit this line if your system uses another version. -export JAVA_HOME=/usr/lib/jvm/jdk11 -if [ -z "${GF_VERSION}" ] - then echo "No version supplied." +test="${1}" +if [ -z "${test}" ]; then + echo "No test supplied." exit 1; fi -if [ -z "${test}" ] - then echo "No test supplied." - exit 2; + +if [ -z "${JAVA_HOME}" ]; then + export JAVA_HOME=/usr/lib/jvm/jdk11 fi +export PATH="${JAVA_HOME}/bin:${PATH}" export MVN_REPOSITORY="${HOME}/.m2/repository" +export M2_HOME="${M2_HOME=$(realpath $(dirname $(realpath $(which mvn)))/..)}" +export APS_HOME="$(pwd)/appserver/tests/appserv-tests" + +if [ -z "${2}" ]; then + export GF_VERSION="$(mvn help:evaluate -f \"${APS_HOME}/pom.xml\" -Dexpression=project.version -q -DforceStdout)" +else + export GF_VERSION="$2" +fi + +export JACOCO_ENABLED="true" export WORKSPACE="$(pwd)/target" export TEST_RUN_LOG="${WORKSPACE}/tests-run.log" -export CLASSPATH="${WORKSPACE}/glassfish6/javadb" -export APS_HOME="$(pwd)/appserver/tests/appserv-tests" -export S1AS_HOME="${WORKSPACE}/glassfish6/glassfish" -export PORT_ADMIN="4848" -export PORT_HTTP="8080" -export PORT_HTTPS="8181" -install_glassfish; +export GLASSFISH_HOME="${WORKSPACE}/glassfish6" +export CLASSPATH="${GLASSFISH_HOME}/javadb" +export S1AS_HOME="${GLASSFISH_HOME}/glassfish" + +# These values can be preset by the caller +export PORT_ADMIN="${PORT_ADMIN=4848}" +export PORT_HTTP="${PORT_HTTP=8080}" +export PORT_HTTPS="${PORT_HTTPS=8181}" +if [ ! -f "${WORKSPACE}/bundles/glassfish.zip" ]; then + install_glassfish; +fi install_jacoco; +rm -rf "${GLASSFISH_HOME}" rm -f ./appserver/tests/appserv-tests/test_resultsValid.xml rm -f ./appserver/tests/appserv-tests/test_results.xml ./appserver/tests/gftest.sh run_test "${test}" From cbeddd37d048432285b0ce33a32242ec4d4eed60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:40:29 +0100 Subject: [PATCH 21/33] #23507 Main from appclient removed - it was worthless and unused --- .../glassfish/appclient/client/acc/Main.java | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Main.java diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Main.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Main.java deleted file mode 100644 index f110fb34efe..00000000000 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Main.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.appclient.client.acc; - - -/** - * This is the main program invoked from the command line. - * - * It processes the command line arguments to prepare the Map of options, then - * passes the Map to an instance of the embedded ACC. - */ -public class Main { - - private static final String CLIENT = "-client"; - private static final String NAME = "-name"; - private static final String MAIN_CLASS = "-mainclass"; - private static final String TEXT_AUTH = "-textauth"; - private static final String XML_PATH = "-xml"; - private static final String ACC_CONFIG_XML = "-configxml"; - private static final String DEFAULT_CLIENT_CONTAINER_XML = "sun-acc.xml"; - // duplicated in com.sun.enterprise.jauth.ConfigXMLParser - private static final String SUNACC_XML_URL = "sun-acc.xml.url"; - private static final String NO_APP_INVOKE = "-noappinvoke"; - //Added for allow user to pass user name and password through command line. - private static final String USER = "-user"; - private static final String PASSWORD = "-password"; - private static final String PASSWORD_FILE = "-passwordfile"; - private static final String LOGIN_NAME = "j2eelogin.name"; - private static final String LOGIN_PASSWORD = "j2eelogin.password"; - private static final String DASH = "-"; - - private static final String lineSep = System.getProperty("line.separator"); - -} From de695239ac7de03785868cf46cf3358ab6d89431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:42:01 +0100 Subject: [PATCH 22/33] #23507 Fixed appclient classpath issues - bug was reproducible by several tests from recent commits - removed endorsed as it is not supported any more --- .../org/glassfish/appclient/client/CLIBootstrap.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/CLIBootstrap.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/CLIBootstrap.java index c5009e21ed5..5afabb5a789 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/CLIBootstrap.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/CLIBootstrap.java @@ -290,6 +290,7 @@ private void addProperties(final StringBuilder command) { command.append(' ').append("--add-opens=java.base/java.lang=ALL-UNNAMED"); command.append(' ').append(INSTALL_ROOT_PROPERTY_EXPR).append(quote(gfInfo.home().getAbsolutePath())); command.append(' ').append(SECURITY_POLICY_PROPERTY_EXPR).append(quote(gfInfo.securityPolicy().getAbsolutePath())); + command.append(' ').append("-classpath").append(' ').append(gfInfo.agentJarPath()).append(File.pathSeparatorChar).append('.'); command.append(' ').append(SYSTEM_CLASS_LOADER_PROPERTY_EXPR); command.append(' ').append("-Xshare:off"); command.append(' ').append(SECURITY_AUTH_LOGIN_CONFIG_PROPERTY_EXPR).append(quote(gfInfo.loginConfig().getAbsolutePath())); @@ -917,10 +918,6 @@ File configxml() { return configXMLFile; } - String[] endorsedPaths() { - return new String[] { new File(lib, "endorsed").getAbsolutePath(), new File(modules, "endorsed").getAbsolutePath() }; - } - String extPaths() { return new File(lib, "ext").getAbsolutePath(); } @@ -986,10 +983,6 @@ String javaExe() { return System.getenv(ACCJava_ENV_VAR_NAME); } - File endorsed() { - return new File(lib(), "endorsed"); - } - File ext() { return new File(lib(), "ext"); } From 8001e4f9fe567da99e968a50d6de7c6d4de3bb22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:50:11 +0100 Subject: [PATCH 23/33] #23507 Fixed signing jars downloaded by the appclient - several bugs - reproducible by several tests enabled in recent commits - removed incorrect wrapping of zip into zip - fixed error message, reported input file as an output - fixed closing streams - fixed removing corrupted files (stream could be still open) - fixed behavior when the glassfish-acc.xml file is missing --- .../server/core/jws/JWSAdapterManager.java | 124 ++++++-------- .../server/core/jws/JavaWebStartInfo.java | 25 ++- .../core/jws/servedcontent/ASJarSigner.java | 154 +++++++++--------- .../jws/servedcontent/AutoSignedContent.java | 17 +- .../StreamedAutoSignedStaticContent.java | 37 ++--- .../jws/servedcontent/LocalStrings.properties | 2 +- .../security/appclient/ConfigXMLParser.java | 19 +-- 7 files changed, 171 insertions(+), 207 deletions(-) diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JWSAdapterManager.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JWSAdapterManager.java index 0b0eaea1655..ca09031cb4f 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JWSAdapterManager.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JWSAdapterManager.java @@ -1,5 +1,6 @@ /* * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,9 +18,12 @@ package org.glassfish.appclient.server.core.jws; import com.sun.enterprise.config.serverbeans.Config; -import org.glassfish.orb.admin.config.IiopService; import com.sun.enterprise.deployment.ApplicationClientDescriptor; -import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; + import java.io.File; import java.io.FileFilter; import java.io.FileNotFoundException; @@ -38,8 +42,7 @@ import java.util.jar.Manifest; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; -import jakarta.inject.Named; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.container.EndpointRegistrationException; import org.glassfish.api.container.RequestDispatcher; @@ -52,12 +55,11 @@ import org.glassfish.appclient.server.core.jws.servedcontent.SimpleDynamicContentImpl; import org.glassfish.appclient.server.core.jws.servedcontent.StaticContent; import org.glassfish.enterprise.iiop.api.GlassFishORBFactory; -import org.glassfish.internal.api.ServerContext; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PostConstruct; -import jakarta.inject.Singleton; +import org.glassfish.internal.api.ServerContext; import org.glassfish.logging.annotation.LogMessageInfo; +import org.glassfish.orb.admin.config.IiopService; +import org.jvnet.hk2.annotations.Service; /** * Handles all management of the HTTP adapters created to support Java Web @@ -98,39 +100,35 @@ public class JWSAdapterManager implements PostConstruct { private static final String LINE_SEP = System.getProperty("line.separator"); - private static final List DO_NOT_SERVE_LIST = - Collections.EMPTY_LIST; //Arrays.asList("glassfish/modules/jaxb-osgi.jar"); + private static final List DO_NOT_SERVE_LIST = Collections.emptyList(); private static final String JWS_SIGNED_SYSTEM_JARS_ROOT = "java-web-start/___system"; private static final String JWS_SIGNED_DOMAIN_JARS_ROOT = "java-web-start/___domain"; - private static final String JAVA_WEB_START_CONTEXT_ROOT_PROPERTY_NAME = - "javaWebStartContextRoot"; + private static final String JAVA_WEB_START_CONTEXT_ROOT_PROPERTY_NAME = "javaWebStartContextRoot"; + /** * maps "(aliasName)/(systemJarRelativePath)" to AutoSignedContent for * the system JAR as signed by the cert linked to the alias */ - private final Map appLevelSignedSystemContent = - new HashMap(); + private final Map appLevelSignedSystemContent = new HashMap<>(); - private URI installRootURI = null; + private URI installRootURI; - private AppClientHTTPAdapter systemAdapter = null; + private AppClientHTTPAdapter systemAdapter; - private Logger logger = null; + private Logger logger; private IiopService iiopService; - private final HashMap> contributingAppClients = - new HashMap>(); + private final HashMap> contributingAppClients = new HashMap<>(); - private final ConcurrentHashMap httpAdapters = new - ConcurrentHashMap(); + private final ConcurrentHashMap httpAdapters = new ConcurrentHashMap<>(); - private URI umbrellaRootURI = null; - private File umbrellaRoot = null; - private File systemLevelSignedJARsRoot = null; - private File domainLevelSignedJARsRoot = null; + private URI umbrellaRootURI; + private File umbrellaRoot; + private File systemLevelSignedJARsRoot; + private File domainLevelSignedJARsRoot; @LogMessageInfo( message = "Error starting the adapter to serve static system-level content", @@ -227,7 +225,7 @@ Map addStaticSystemContent( * adapter which serves files from the installation, as opposed to * files from the domain or files from a specific app. */ - Map result = new HashMap(); + Map result = new HashMap<>(); File gfClientJAR = gfClientJAR(); final String classPathExpr = getGFClientModuleClassPath(gfClientJAR); @@ -277,39 +275,39 @@ public boolean accept(File pathname) { return result; } + File gfClientJAR() { - return new File( - libDir(), - "gf-client.jar"); + return new File(libDir(), "gf-client.jar"); } + File gfClientModuleJAR() { - return new File( - modulesDir(), - "gf-client-module.jar"); + return new File(modulesDir(), "gf-client-module.jar"); } + private synchronized File modulesDir() { return new File(new File(installRootURI), "modules"); } + private synchronized File libDir() { return new File(new File(installRootURI), "lib"); } - private AutoSignedContent systemJarSignedContent ( - final File unsignedFile, - final String signingAlias) throws FileNotFoundException { + + private AutoSignedContent systemJarSignedContent(final File unsignedFile, final String signingAlias) + throws FileNotFoundException { final String relativeURI = relativeSystemPath(unsignedFile.toURI()); - final File signedFile = new File(signedSystemContentAliasDir(signingAlias), - relativeURI); + final File signedFile = new File(signedSystemContentAliasDir(signingAlias), relativeURI); return new AutoSignedContent(unsignedFile, signedFile, signingAlias, jarSigner, relativeURI, MANIFEST_APP_NAME_FOR_SYSTEM_FILES); } - Map addDynamicSystemContent(final List systemJARRelativeURIs, - final String signingAlias) throws IOException { - final Map result = new HashMap(); + + Map addDynamicSystemContent(final List systemJARRelativeURIs, + final String signingAlias) throws IOException { + final Map result = new HashMap<>(); final String template = JavaWebStartInfo.textFromURL( "/org/glassfish/appclient/server/core/jws/templates/systemJarsDocumentTemplate.jnlp"); final StringBuilder sb = new StringBuilder(); @@ -328,8 +326,7 @@ Map addDynamicSystemContent(final List systemJARR } private String systemPath(final URI systemFileURI) { - return //NamingConventions.JWSAPPCLIENT_SYSTEM_PREFIX + "/" + - relativeSystemPath(systemFileURI); + return relativeSystemPath(systemFileURI); } String systemPath(final URI systemFileURI, final String signingAlias) { @@ -546,23 +543,16 @@ synchronized File signedSystemContentAliasDir(final String alias) { public String contextRootForAppAdapter(final String appName) { final AppClientHTTPAdapter adapter = httpAdapters.get(appName); - if (adapter != null) { - return adapter.contextRoot(); - } else { - return null; - } + return adapter == null ? null : adapter.contextRoot(); } - private synchronized void addContributorToAppLevelAdapter( - final String appName, - final AppClientServerApplication contributor) { - /* - * Record that the calling app client server app has contributed content - * to the Grizzly adapter. - */ + + private synchronized void addContributorToAppLevelAdapter(final String appName, + final AppClientServerApplication contributor) { + // Record that the calling app client server app has contributed content to the Grizzly adapter. Set contributorsToAppLevelAdapter = contributingAppClients.get(appName); if (contributorsToAppLevelAdapter == null) { - contributorsToAppLevelAdapter = new HashSet(); + contributorsToAppLevelAdapter = new HashSet<>(); contributingAppClients.put(appName, contributorsToAppLevelAdapter); } contributorsToAppLevelAdapter.add(contributor); @@ -572,13 +562,9 @@ public synchronized void removeContentForAppClient(final String appName, final String clientURIWithinEAR, final AppClientServerApplication contributor) throws EndpointRegistrationException { - /* - * Remove the adapter for the user-friendly context root. - */ + // Remove the adapter for the user-friendly context root. removeAdapter(userFriendlyContextRoot(contributor)); - removeContributorToAppLevelAdapter(appName, contributor); - appClientDeployer.removeContextRoot(appName, clientURIWithinEAR); } @@ -602,21 +588,17 @@ private synchronized void removeContributorToAppLevelAdapter( } } - private synchronized void removeAdapter(final String contextRoot) - throws EndpointRegistrationException { + + private synchronized void removeAdapter(final String contextRoot) throws EndpointRegistrationException { requestDispatcher.unregisterEndpoint(contextRoot); } - private String getGFClientModuleClassPath(final File gfClientJAR) throws IOException { - final JarFile jf = new JarFile(gfClientJAR); - try { - final Manifest mf = jf.getManifest(); - Attributes mainAttrs = mf.getMainAttributes(); - return mainAttrs.getValue(Attributes.Name.CLASS_PATH); - } finally - { - jf.close(); + private String getGFClientModuleClassPath(final File gfClientJAR) throws IOException { + try (JarFile jf = new JarFile(gfClientJAR)) { + final Manifest mf = jf.getManifest(); + Attributes mainAttrs = mf.getMainAttributes(); + return mainAttrs.getValue(Attributes.Name.CLASS_PATH); } } diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java index 53892b3a4d8..b7889f04c31 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java @@ -1,5 +1,6 @@ /* * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -18,7 +19,6 @@ import com.sun.enterprise.deployment.ApplicationClientDescriptor; import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import com.sun.logging.LogDomains; import java.beans.PropertyChangeEvent; import java.io.File; import java.io.FileNotFoundException; @@ -133,8 +133,8 @@ public class JavaWebStartInfo implements ConfigListener { private String signingAlias; - final private Map staticContent = new HashMap(); - final private Map dynamicContent = new HashMap(); + final private Map staticContent = new HashMap<>(); + final private Map dynamicContent = new HashMap<>(); private static final String JNLP_MIME_TYPE = "application/x-java-jnlp-file"; @@ -423,7 +423,7 @@ private Set addClientContentToHTTPAdapters() throws EndpointRegistratio dch.addDeveloperContentFromPath(developerJNLPDoc); - Set result = new HashSet(staticContent.values()); + Set result = new HashSet<>(staticContent.values()); result.addAll(dynamicContent.values()); jwsAdapterManager.addContentForAppClient( @@ -498,7 +498,7 @@ private void initClientStaticContent() private void addSignedSystemContent( ) throws FileNotFoundException, IOException { - final List systemJARRelativeURIs = new ArrayList(); + final List systemJARRelativeURIs = new ArrayList<>(); final Map addedStaticContent = jwsAdapterManager.addStaticSystemContent( systemJARRelativeURIs, @@ -663,17 +663,12 @@ public File signedFileForProvidedAppFile(final File unsignedFile) { public static File signedFileForProvidedAppFile(final URI relURI, final File unsignedFile, final AppClientDeployerHelper helper, - final DeploymentContext dc) { /* - * Place a signed file for a developer-provided file at - * - * generated/xml/(appName)/signed/(path-within-app-of-unsigned-file) - * - * - */ + final DeploymentContext dc) { + // Place a signed file for a developer-provided file at + // generated/xml/(appName)/signed/(path-within-app-of-unsigned-file) final File rootForSignedFilesInApp = helper.rootForSignedFilesInApp(); mkdirs(rootForSignedFilesInApp); final URI signedFileURI = rootForSignedFilesInApp.toURI().resolve(relURI); - return new File(signedFileURI); } @@ -805,7 +800,7 @@ private VendorInfo vendorInfo() { } public static class VendorInfo { - private String vendorStringFromDescriptor; + private final String vendorStringFromDescriptor; private String vendor = ""; private String imageURIString = ""; private String splashImageURIString = ""; @@ -858,7 +853,7 @@ public String JNLPSplashImageURI() { @Override public UnprocessedChangeEvents changed(PropertyChangeEvent[] events) { /* Record any events we tried to process but could not. */ - List unprocessedEvents = new ArrayList(); + List unprocessedEvents = new ArrayList<>(); for (PropertyChangeEvent event : events) { try { diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ASJarSigner.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ASJarSigner.java index 939cd7bf2af..875ec8cd26e 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ASJarSigner.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ASJarSigner.java @@ -1,5 +1,6 @@ /* * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -18,34 +19,37 @@ import com.sun.enterprise.server.pluggable.SecuritySupport; import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; -import static java.util.Arrays.asList; +import jakarta.inject.Singleton; +import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; +import java.io.OutputStream; import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; import java.security.PrivateKey; +import java.security.UnrecoverableKeyException; import java.security.cert.CertPath; import java.security.cert.Certificate; +import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; -import java.security.cert.X509Certificate; -import java.util.Arrays; import java.util.Collections; import java.util.Map; import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.zip.ZipOutputStream; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PostConstruct; -import jakarta.inject.Singleton; +import org.jvnet.hk2.annotations.Service; + import jdk.security.jarsigner.JarSigner; -import jdk.security.jarsigner.JarSignerException; -import org.glassfish.appclient.server.core.jws.JavaWebStartInfo; +import static java.util.Arrays.asList; +import static org.glassfish.appclient.server.core.jws.JavaWebStartInfo.APPCLIENT_SERVER_LOGMESSAGE_RESOURCE; +import static org.glassfish.appclient.server.core.jws.JavaWebStartInfo.APPCLIENT_SERVER_MAIN_LOGGER; /** * Signs a specified JAR file. @@ -66,73 +70,53 @@ public class ASJarSigner implements PostConstruct { /** property name optionally set by the admin in domain.xml to select an alias for signing */ public static final String USER_SPECIFIED_ALIAS_PROPERTYNAME = "com.sun.aas.jws.signing.alias"; - /** keystore type for JKS keystores */ - private static final String JKS_KEYSTORE_TYPE_VALUE = "jks"; - /** default alias for signing if the admin does not specify one */ private static final String DEFAULT_ALIAS_VALUE = "s1as"; - private static final String DEFAULT_DIGEST_ALGORITHM = "SHA-1"; - private static final String DEFAULT_SIGNATURE_ALGORITHM = "SHA1withRSA"; + private static final String DEFAULT_DIGEST_ALGORITHM = "SHA-256"; + private static final String DEFAULT_SIGNATURE_ALGORITHM = "SHA256withRSA"; private static final SecuritySupport securitySupport = SecuritySupport.getDefaultInstance(); -// /** user-specified signing alias */ -// private final String userAlias; // = System.getProperty(USER_SPECIFIED_ALIAS_PROPERTYNAME); - private static final StringManager localStrings = StringManager.getManager(ASJarSigner.class); private Logger logger; @Override public void postConstruct() { - logger =Logger.getLogger(JavaWebStartInfo.APPCLIENT_SERVER_MAIN_LOGGER, JavaWebStartInfo.APPCLIENT_SERVER_LOGMESSAGE_RESOURCE); + logger = Logger.getLogger(APPCLIENT_SERVER_MAIN_LOGGER, APPCLIENT_SERVER_LOGMESSAGE_RESOURCE); } + /** - *Creates a signed jar from the specified unsigned jar. - *@param unsignedJar the unsigned JAR file - *@param signedJar the signed JAR to be created - *@param attrs additional attributes to be added to the JAR's manifest main section - *@return the elapsed time to sign the JAR (in milliseconds) - *@throws Exception getting the keystores from SSLUtils fails + * Creates a signed jar from the specified unsigned jar. + * + * @param unsignedJar the unsigned JAR file + * @param signedJar the signed JAR to be created + * @param attrs additional attributes to be added to the JAR's manifest main section + * @return the elapsed time to sign the JAR (in milliseconds) + * @throws Exception getting the keystores from SSLUtils fails */ - public long signJar(final File unsignedJar, final File signedJar, - String alias, Attributes attrs) throws Exception { - - final ZipOutputStream zout = new ZipOutputStream( - new FileOutputStream(signedJar)); - try { - final long result = signJar(unsignedJar, zout, alias, attrs, Collections.EMPTY_MAP); - return result; - } catch (Exception ex) { - /* - *In case of any problems, make sure there is no ill-formed signed - *jar file left behind. - */ - if ( signedJar.exists() && ! signedJar.delete()) { - logger.log(Level.FINE, "Could not remove generated signed JAR {0} after JarSigner reported an error", - signedJar.getAbsolutePath()); - } - throw ex; - } finally { - zout.close(); + public long signJar(final File unsignedJar, final File signedJar, String alias, Attributes attrs) throws Exception { + try (OutputStream zout = new BufferedOutputStream(new FileOutputStream(signedJar))) { + return signJar(unsignedJar, zout, alias, attrs, Collections.emptyMap()); } } + /** * Creates a signed ZIP output stream from an unsigned JAR and, possibly, additional content. + * * @param unsignedJar JAR file containing most of the content to sign and return * @param signedJar already-opened ZipOutputStream to receive the signed content * @param alias the alias with which to identify the cert for signing the output * @param attrs additional manifest attributes to add * @param additionalContent additional JAR entries to add - * @return - * @throws Exception + * @return the elapsed time to sign the JAR (in milliseconds) + * @throws IllegalStateException */ - public long signJar(final File unsignedJar, final ZipOutputStream signedJar, - String alias, final Attributes attrs, final Map additionalContent) throws Exception { - + public long signJar(final File unsignedJar, final OutputStream signedJar, String alias, final Attributes attrs, + final Map additionalContent) throws IllegalStateException { if (alias == null) { alias = DEFAULT_ALIAS_VALUE; } @@ -140,48 +124,56 @@ public long signJar(final File unsignedJar, final ZipOutputStream signedJar, long duration = 0; synchronized(this) { try { - Certificate[] certificates = null; - PrivateKey privateKey = null; - KeyStore[] keyStores = securitySupport.getKeyStores(); - for (int i = 0; i < keyStores.length; i++) { - privateKey = securitySupport.getPrivateKeyForAlias(alias, i); - if (privateKey != null) { - certificates = keyStores[i].getCertificateChain(alias); - } - } - - CertPath certPath = CertificateFactory.getInstance("X.509").generateCertPath(asList(certificates)); - - JarSigner signer = new JarSigner.Builder(privateKey, certPath) - .digestAlgorithm(DEFAULT_DIGEST_ALGORITHM) - .signatureAlgorithm(DEFAULT_SIGNATURE_ALGORITHM) - .build(); - + JarSigner signer = createJarSigner(alias); // TODO: add Attributes to Manifest and additionalContent - - signer.sign(new JarFile(unsignedJar), signedJar); - - } catch (Throwable t) { - /* - *The jar signer will have written some information to System.out - */ - throw new Exception(localStrings.getString("jws.sign.errorSigning", - unsignedJar.getAbsolutePath(), alias), t); + try (JarFile jarFile = new JarFile(unsignedJar)) { + signer.sign(jarFile, signedJar); + } + } catch (Exception e) { + throw new IllegalStateException( + localStrings.getString("jws.sign.errorSigning", unsignedJar.getAbsolutePath(), alias), e); } finally { duration = System.currentTimeMillis() - startTime; logger.log(Level.FINE, "Signing {0} took {1} ms", - new Object[]{unsignedJar.getAbsolutePath(), duration}); + new Object[] {unsignedJar.getAbsolutePath(), duration}); } } return duration; } + + private JarSigner createJarSigner(final String alias) + throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException, CertificateException { + Certificate[] certificates = null; + PrivateKey privateKey = null; + KeyStore[] keyStores = securitySupport.getKeyStores(); + for (int i = 0; i < keyStores.length; i++) { + privateKey = securitySupport.getPrivateKeyForAlias(alias, i); + if (privateKey == null) { + continue; + } + certificates = keyStores[i].getCertificateChain(alias); + if (certificates != null && certificates.length > 0) { + break; + } + } + if (certificates == null) { + throw new IllegalStateException("No certificates available for the alias: " + alias); + } + CertPath certPath = CertificateFactory.getInstance("X.509").generateCertPath(asList(certificates)); + return new JarSigner.Builder(privateKey, certPath) + .digestAlgorithm(DEFAULT_DIGEST_ALGORITHM) + .signatureAlgorithm(DEFAULT_SIGNATURE_ALGORITHM) + .build(); + } + + /** - *Wraps any underlying exception. - *

- *This is primarily used to insulate calling logic from - *the large variety of exceptions that can occur during signing - *from which the caller cannot really recover. + * Wraps any underlying exception. + *

+ * This is primarily used to insulate calling logic from + * the large variety of exceptions that can occur during signing + * from which the caller cannot really recover. */ public static class ASJarSignerException extends Exception { public ASJarSignerException(String msg, Throwable t) { diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/AutoSignedContent.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/AutoSignedContent.java index 19c22c25a06..73d6990174a 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/AutoSignedContent.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/AutoSignedContent.java @@ -1,5 +1,6 @@ /* * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -16,17 +17,15 @@ package org.glassfish.appclient.server.core.jws.servedcontent; -import com.sun.enterprise.util.net.NetUtils; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import java.nio.file.Files; import java.text.MessageFormat; import java.util.ResourceBundle; import java.util.jar.Attributes; -import java.util.logging.Level; -import java.util.logging.Logger; /** * Represents otherwise fixed content that must be automatically signed @@ -64,7 +63,6 @@ static Attributes createJWSAttrs(final URI requestURI, final String appName) { private final File signedFile; private final String userProvidedAlias; private final ASJarSigner jarSigner; - private final URI relativeURI; private final String appName; public AutoSignedContent(final File unsignedFile, @@ -80,7 +78,6 @@ public AutoSignedContent(final File unsignedFile, this.signedFile = signedFile; this.userProvidedAlias = userProvidedAlias; this.jarSigner = jarSigner; - this.relativeURI = URI.create(relativeURI); this.appName = appName; } @@ -151,7 +148,15 @@ private void createSignedFile(final URI requestURI) throws Exception { } } final Attributes attrs = createJWSAttrs(requestURI, appName); - jarSigner.signJar(unsignedFile, signedFile, userProvidedAlias, attrs); + try { + jarSigner.signJar(unsignedFile, signedFile, userProvidedAlias, attrs); + } catch (Exception e) { + // File may be already created, but probably has corrupted content. + if (signedFile.exists()) { + Files.deleteIfExists(signedFile.toPath()); + } + throw e; + } } @Override diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java index 79d8cfe2bf8..f9bb2249cd9 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -22,6 +23,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.net.URI; +import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; @@ -105,35 +107,26 @@ public void process(String relativeURIString, Request gReq, Response gResp) thro * Instead we'll just write to the output stream and Grizzly will * chunk it for us if needed. */ - final ZipOutputStream zos = new ZipOutputStream(gResp.getOutputStream()); logger.log(Level.FINE, "Request's session contains cached JNLP"); final byte[] jnlpContent = (byte[]) jwsObj; - final Map addedContent = new HashMap(); + final Map addedContent = new HashMap<>(); addedContent.put(SIGNED_JNLP_PATH, jnlpContent); try { - jarSigner().signJar(unsignedFile(), zos, userProvidedAlias(), createJWSAttrs(AppClientHTTPAdapter.requestURI(gReq), appName()), addedContent); - /* - * Create an on-disk copy of the signed JAR for debugging purposes - * if logging is detailed enough. - */ + jarSigner().signJar(unsignedFile(), gResp.getOutputStream(), userProvidedAlias(), + createJWSAttrs(AppClientHTTPAdapter.requestURI(gReq), appName()), addedContent); + // Create an on-disk copy of the signed JAR for debugging purposes if logging is detailed enough. if (logger.isLoggable(Level.FINEST)) { - final File debugSignedJARFile = new File(unsignedFile().getAbsolutePath()+".debug"); - final ZipOutputStream dbgZos = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(debugSignedJARFile))); - try { - jarSigner().signJar(unsignedFile(), dbgZos, userProvidedAlias(), createJWSAttrs(AppClientHTTPAdapter.requestURI(gReq), appName()), addedContent); - } finally { - dbgZos.close(); + final File debugSignedJARFile = new File(unsignedFile().getAbsolutePath() + ".debug"); + try (ZipOutputStream dbgZos = new ZipOutputStream( + new BufferedOutputStream(new FileOutputStream(debugSignedJARFile)))) { + jarSigner().signJar(unsignedFile(), dbgZos, userProvidedAlias(), + createJWSAttrs(AppClientHTTPAdapter.requestURI(gReq), appName()), addedContent); } logger.log(Level.FINEST, "Created on-disk signed JAR {0}", debugSignedJARFile.getAbsolutePath()); } - zos.close(); - } catch (IOException ioex) { - throw ioex; - } catch (Exception ex) { + } catch (URISyntaxException ex) { throw new IOException(ex); - } finally { - zos.close(); } } @@ -156,10 +149,8 @@ private String contentType(final File file) { if (dot > 0) { String ext = substr.substring(dot + 1); - String ct = MimeType.get(ext); - return ct; - } else { - return MimeType.get("html"); + return MimeType.get(ext); } + return MimeType.get("html"); } } diff --git a/appserver/appclient/server/core/src/main/resources/org/glassfish/appclient/server/core/jws/servedcontent/LocalStrings.properties b/appserver/appclient/server/core/src/main/resources/org/glassfish/appclient/server/core/jws/servedcontent/LocalStrings.properties index a9855f5e7d4..93093007a44 100644 --- a/appserver/appclient/server/core/src/main/resources/org/glassfish/appclient/server/core/jws/servedcontent/LocalStrings.properties +++ b/appserver/appclient/server/core/src/main/resources/org/glassfish/appclient/server/core/jws/servedcontent/LocalStrings.properties @@ -22,7 +22,7 @@ jws.sign.noUnsignedJar=Unsigned jar {0} marked for signing does not exist jws.sign.userAliasAbsent=User-specified alias {0} to be used for signing JAR files was not found in any keystore; attempting to use default alias instead jws.sign.aliasNotFound=Alias {0} not found in keystore(s); aborting jws.sign.aliasFoundMult=Alias {0} to be used for signing JAR files was found in more than one keystore; using the first occurrence from the keystores with these providers: {1} -jws.sign.errorSigning=Error attempting to create signed jar {0} with alias {1} +jws.sign.errorSigning=Error attempting to sign jar {0} with alias {1} jws.sign.errorCreatingDir=Unknown error attempting to create directory {0} to contain signed jar jws.sign.keyNotPrivate=Key for alias {0} is not a private key, as required jws.sign.notX509Cert=Certificate associated with alias {0} is not an X509 certificate, as required diff --git a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/ConfigXMLParser.java b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/ConfigXMLParser.java index 8e0aa43b61e..955b1f01e28 100644 --- a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/ConfigXMLParser.java +++ b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/ConfigXMLParser.java @@ -1,5 +1,6 @@ /* * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -18,6 +19,7 @@ import static java.util.regex.Matcher.quoteReplacement; +import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -59,8 +61,8 @@ public class ConfigXMLParser implements ConfigParser { private static Pattern PROPERTY_PATTERN = Pattern.compile("\\$\\{\\{(.*?)}}|\\$\\{(.*?)}"); // configuration info - private Map configMap = new HashMap(); - private Set layersWithDefault = new HashSet(); + private final Map configMap = new HashMap(); + private final Set layersWithDefault = new HashSet<>(); private List msgSecConfigs = null; private static final String ACC_XML = "glassfish-acc.xml.url"; @@ -90,10 +92,12 @@ private void processClientConfigContext(Map newConfig) throws IOException { } + @Override public Map getConfigMap() { return configMap; } + @Override public Set getLayersWithDefault() { return layersWithDefault; } @@ -218,23 +222,18 @@ private MessagePolicy parsePolicy(Object policy) { return AuthMessagePolicy.getMessagePolicy(authSource, authRecipient); } + @Override public void initialize(Object config) throws IOException { String sun_acc = System.getProperty(ACC_XML, "glassfish-acc.xml"); List msgconfigs = null; - if (Globals.getDefaultHabitat() == null && sun_acc != null) { - InputStream is = null; - try { - is = new FileInputStream(sun_acc); + if (Globals.getDefaultHabitat() == null && sun_acc != null && new File(sun_acc).exists()) { + try (InputStream is = new FileInputStream(sun_acc)) { JAXBContext jc = JAXBContext.newInstance(ClientContainer.class); Unmarshaller u = jc.createUnmarshaller(); ClientContainer cc = (ClientContainer) u.unmarshal(is); msgconfigs = cc.getMessageSecurityConfig(); } catch (JAXBException ex) { _logger.log(Level.SEVERE, null, ex); - } finally { - if (is != null) { - is.close(); - } } } else { Util util = Util.getInstance(); From a65caf90615a4b49779277f7f8abe07bcc12b6ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:51:45 +0100 Subject: [PATCH 24/33] #23507 Deleted MEJB classes - lazy init, but then crashed - MEJB is not supported any more, see specification of Jakarta EE 9.1 --- .../kernel/javaee/MEJBNamingObjectProxy.java | 112 ------------------ .../glassfish/kernel/javaee/MEJBService.java | 72 ----------- 2 files changed, 184 deletions(-) delete mode 100644 appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBNamingObjectProxy.java delete mode 100755 appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java diff --git a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBNamingObjectProxy.java b/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBNamingObjectProxy.java deleted file mode 100644 index ec44fdf07e0..00000000000 --- a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBNamingObjectProxy.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.kernel.javaee; - -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.logging.LogDomains; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.deployment.DeployCommandParameters; -import org.glassfish.api.naming.GlassfishNamingManager; -import org.glassfish.api.naming.NamingObjectProxy; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.ServerContext; -import org.glassfish.internal.deployment.Deployment; -import org.glassfish.internal.deployment.ExtendedDeploymentContext; - -import javax.naming.Context; -import javax.naming.NamingException; -import java.io.File; -import java.io.IOException; -import java.util.logging.Logger; - - -/** - * Used to register MEJB for MEJB lazy initialization - */ -public class MEJBNamingObjectProxy implements NamingObjectProxy { - - private static final String NON_PORTABLE_MEJB_JNDI_NAME = "ejb/mgmt/MEJB"; - private static final String PORTABLE_MEJB_JNDI_NAME_SHORT = "java:global/mejb/MEJBBean"; - private static final String PORTABLE_MEJB_JNDI_NAME_LONG = - "java:global/mejb/MEJBBean!org.glassfish.admin.mejb.MEJBHome"; - - private static String[] jndiNames = new String[] - {NON_PORTABLE_MEJB_JNDI_NAME, - PORTABLE_MEJB_JNDI_NAME_SHORT, - PORTABLE_MEJB_JNDI_NAME_LONG}; - - private ServiceLocator habitat; - - private static final Logger _logger = LogDomains.getLogger( - MEJBNamingObjectProxy.class, LogDomains.EJB_LOGGER); - - - public MEJBNamingObjectProxy(ServiceLocator habitat) { - this.habitat = habitat; - } - - static String[] getJndiNames() { - return jndiNames; - } - - public Object create(Context ic) throws NamingException { - - Object mEJBHome = null; - try { - unpublishJndiNames(); - deployMEJB(); - mEJBHome = ic.lookup(NON_PORTABLE_MEJB_JNDI_NAME); - } catch (NamingException ne) { - throw ne; - } catch (Exception e) { - NamingException namingException = - new NamingException(e.getMessage()); - namingException.initCause(e); - throw namingException; - } - return mEJBHome; - } - - private void unpublishJndiNames() throws NamingException { - GlassfishNamingManager gfNamingManager = habitat.getService(GlassfishNamingManager.class); - for (String next : getJndiNames()) { - gfNamingManager.unpublishObject(next); - } - } - - private void deployMEJB() throws IOException { - _logger.info("Loading MEJB app on JNDI look up"); - ServerContext serverContext = habitat.getService(ServerContext.class); - File mejbArchive = new File(serverContext.getInstallRoot(), - "lib/install/applications/mejb.jar"); - DeployCommandParameters deployParams = - new DeployCommandParameters(mejbArchive); - String targetName = habitat.getService(Server.class, ServerEnvironment.DEFAULT_INSTANCE_NAME).getName(); - deployParams.target = targetName; - deployParams.name = "mejb"; - ActionReport report = habitat.getService(ActionReport.class, "plain"); - Deployment deployment = habitat.getService(Deployment.class); - ExtendedDeploymentContext dc = deployment.getBuilder(_logger, deployParams, report).source(mejbArchive).build(); - deployment.deploy(dc); - - if (report.getActionExitCode() != ActionReport.ExitCode.SUCCESS) { - throw new RuntimeException("Failed to deploy MEJB app: " + - report.getFailureCause()); - } - } -} diff --git a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java b/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java deleted file mode 100755 index b929156ecfe..00000000000 --- a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.kernel.javaee; - -import jakarta.inject.Inject; -import jakarta.inject.Provider; - -import org.glassfish.hk2.runlevel.RunLevel; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PostConstruct; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.InitRunLevel; -import org.glassfish.internal.api.Globals; -import org.glassfish.api.naming.GlassfishNamingManager; - -import com.sun.logging.LogDomains; - -import java.util.logging.Logger; -import java.util.logging.Level; - -/** - * MEJB service to register mejb with a temporary NamingObjectProxy at server - * start up time - */ -@Service -@RunLevel(InitRunLevel.VAL) -public class MEJBService implements PostConstruct { - - // we need to inject Globals as it used by the naming manager and - // therefore needs to be allocated. - @Inject - Globals globals; - - @Inject - ServiceLocator habitat; - - @Inject - Provider gfNamingManagerProvider; - - private static final Logger _logger = LogDomains.getLogger( - MEJBService.class, LogDomains.EJB_LOGGER); - - public void postConstruct() { - GlassfishNamingManager gfNamingManager = - gfNamingManagerProvider.get(); - - MEJBNamingObjectProxy mejbProxy = - new MEJBNamingObjectProxy(habitat); - for(String next : MEJBNamingObjectProxy.getJndiNames()) { - try { - gfNamingManager.publishObject(next, mejbProxy, true); - } catch (Exception e) { - _logger.log(Level.WARNING, "Problem in publishing temp proxy for MEJB: " + - e.getMessage(), e); - } - } - } -} From ff68d39774fef90e7a876a088ea22a391b9f6887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:53:04 +0100 Subject: [PATCH 25/33] #23507 Enabled naming, deployment, security and webservice tests on jenkins --- Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 18311230caf..73ed6a3b8a1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,7 +38,11 @@ def jobs = [ "connector_group_3", "connector_group_4", "jdbc_all", - "persistence_all" + "persistence_all", + "naming_all", + "deployment_all", + "security_all", + "webservice_all" ] def parallelStagesMap = jobs.collectEntries { From cf41ba40568d95efff5afb938816f168b0b75030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 3 Mar 2022 22:55:21 +0100 Subject: [PATCH 26/33] #23507 Updated README.md --- README.md | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index a34be2a9809..31d2ae9ab34 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ You can use also some maven optimizations, ie. using `-T4C` to allow parallel bu ### Special Scripts * `./updateVersion.sh 6.99.99.experimental` - useful for custom distributions, so you can avoid conflicts with version in master branch. -* `./runTests.sh 6.2.0 cdi_all` - useful to run [additional](#additional-testing) tests locally; before that edit the script and update variables so they will reflect your environment. +* `./runtests.sh [testBlockName] [?glassfishVersion]` - useful to run [old additional tests](#old-additional-tests) locally * `./validateJars.sh` - uses the bnd command to check OSGI dependencies in all target directories ## Additional Testing @@ -60,28 +60,33 @@ They are quite old and have high technical debt, but at this moment they still p ### Old Additional Tests -* `./runTests.sh 6.2.3 cdi_all` - Usual time: 6 minutes -* `./runTests.sh 6.2.3 ejb_group_1` - Usual time: 8 minutes -* `./runTests.sh 6.2.3 web_jsp` - Usual time: 6 minutes +:warning: if the script fails, sometimes it doesn't stop the domain and you have to do that manually. + +* `./runtests.sh batch_all` - Usual time: 1 minute +* `./runtests.sh cdi_all` - Usual time: 6 minutes +* `./runtests.sh connector_group_1` - Usual time: 16 minutes +* `./runtests.sh connector_group_2` - Usual time: 3 minutes +* `./runtests.sh connector_group_3` - Usual time: 4 minutes +* `./runtests.sh connector_group_4` - Usual time: 16 minutes +* `./runtests.sh deployment_all` - Usual time: 8 minutes +* `./runtests.sh ejb_group_1` - Usual time: 10 minutes +* `./runtests.sh ejb_group_2` - Usual time: 7 minutes +* `./runtests.sh ejb_group_3` - Usual time: 18 minutes +* `./runtests.sh ejb_group_embedded` - Usual time: 4 minutes +* `./runtests.sh ejb_group_all` - Usual time: 4 minutes +* `./runtests.sh jdbc_all` - Usual time: 20 minutes +* `./runtests.sh naming_all` - Usual time: 2 minutes +* `./runtests.sh persistence_all` - Usual time: 3 minutes +* `./runtests.sh security_all` - Usual time: 8 minutes +* `./runtests.sh web_jsp` - Usual time: 8 minutes +* `./runtests.sh webservice_all` - Usual time: 10 minutes +* `./gfbuild.sh archive_bundles && ./gftest.sh ejb_web_all` - Usual time: 4 minutes +* `./gfbuild.sh archive_bundles && ./gftest.sh nucleus_admin_all` - Not fixed yet +* `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_full_profile_all` - Usual time: 4 minutes +* `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_nucleus_all` - Not fixed yet * `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_web_profile_all` - Usual time: 2 minutes * `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_full_profile_all` - Usual time: 4 minutes -### Half-Dead Additional Tests Waiting for a Rescue - -First warning: if the script fails, it doesn't stop the domain and you have to do that manually. -* `./runTests.sh 6.2.3 batch_all` - Crashes, Derby uses different port than expected -* `./runTests.sh 6.2.3 connector_group_1` - Crashes, ports -* `./runTests.sh 6.2.3 connector_group_2` - Crashes, ports -* `./runTests.sh 6.2.3 connector_group_3` - Crashes, ports -* `./runTests.sh 6.2.3 connector_group_4` - Crashes, ports -* `./runTests.sh 6.2.3 deployment_all` - Usual time: 1 minute, failure: still uses javax packages. -* `./runTests.sh 6.2.3 ejb_group_2` - Usual time: 2 minutes, failure: incompatible API at TimerSessionEJB. -* `./runTests.sh 6.2.3 ejb_group_3` - Usual time: 4 minutes, failure: still uses javax packages -* `./runTests.sh 6.2.3 jdbc_all` - Crashes, Derby uses different port than expected -* `./runTests.sh 6.2.3 persistence_all` - Crashes, Derby uses different port than expected -* `./gfbuild.sh archive_bundles && ./gftest.sh ejb_web_all` - Usual time: 4 minutes, failure: could not create the derby database -* `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_nucleus_all` - Crashes -* `./gfbuild.sh archive_bundles && ./gftest.sh nucleus_admin_all` - Crashes, missing TestNG dependency * many tests under appserver/tests subdirectories; they are still waiting for someone's attention. ## Basic Usage From 440c938494991e71080f0754492d858eeeae48aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Fri, 4 Mar 2022 09:37:43 +0100 Subject: [PATCH 27/33] #23507 Yet one forgotten ZipOutputStream removed --- .../jws/servedcontent/StreamedAutoSignedStaticContent.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java index f9bb2249cd9..bfbebc699a4 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java @@ -22,13 +22,13 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.zip.ZipOutputStream; import org.glassfish.appclient.server.core.AppClientDeployerHelper; import org.glassfish.appclient.server.core.jws.AppClientHTTPAdapter; import static org.glassfish.appclient.server.core.jws.RestrictedContentAdapter.DATE_HEADER_NAME; @@ -118,8 +118,7 @@ public void process(String relativeURIString, Request gReq, Response gResp) thro // Create an on-disk copy of the signed JAR for debugging purposes if logging is detailed enough. if (logger.isLoggable(Level.FINEST)) { final File debugSignedJARFile = new File(unsignedFile().getAbsolutePath() + ".debug"); - try (ZipOutputStream dbgZos = new ZipOutputStream( - new BufferedOutputStream(new FileOutputStream(debugSignedJARFile)))) { + try (OutputStream dbgZos = new BufferedOutputStream(new FileOutputStream(debugSignedJARFile))) { jarSigner().signJar(unsignedFile(), dbgZos, userProvidedAlias(), createJWSAttrs(AppClientHTTPAdapter.requestURI(gReq), appName()), addedContent); } From 652822fcb646d68760f9a9d656184e727325ef4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 5 Mar 2022 12:21:42 +0100 Subject: [PATCH 28/33] #23507 Fixed compatibility with Jakarta EE 10 --- .../client/acc/AppClientContainer.java | 7 ++----- .../ejb30/ear/security/web/MyFilter.java | 4 +--- .../ejb30/war/jsp/web/MyFilter.java | 3 +-- .../ejb30/war/servlet/web/MyFilter.java | 3 +-- .../src/DummyPolicyConfigurationFactory.java | 21 ++++++++++++++----- .../HttpServletChallengeTestAuthModule.java | 5 ++--- .../src/HttpServletFormTestAuthModule.java | 9 ++++---- .../web/jsessionIdParameter/docroot/test.jsp | 4 ++-- 8 files changed, 29 insertions(+), 27 deletions(-) diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java index e5e6a93b74d..e860f2df002 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java @@ -377,13 +377,10 @@ private void completePreparation(final Instrumentation inst) throws prepareURLStreamHandling(); - //This is required for us to enable interrupt jaxws service - //creation calls - System.setProperty("jakarta.xml.ws.spi.Provider", - "com.sun.enterprise.webservice.spi.ProviderImpl"); + //This is required for us to enable interrupt jaxws service creation calls + System.setProperty("jakarta.xml.ws.spi.Provider", "com.sun.xml.ws.spi.ProviderImpl"); //InjectionManager's injectClass will be called from getMainMethod - // Load any managed beans ManagedBeanManager managedBeanManager = habitat.getService(ManagedBeanManager.class); managedBeanManager.loadManagedBeans(desc.getApplication()); diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/MyFilter.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/MyFilter.java index 38c4db5fa7e..cf4e2ceea45 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/MyFilter.java +++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/MyFilter.java @@ -64,9 +64,7 @@ public void doFilter (ServletRequest request, HttpServletRequest httpRequest = (HttpServletRequest)request; HttpSession httpSession = httpRequest.getSession(true); if (httpRequest.isUserInRole("j2ee")) { - httpSession.putValue("deployment.ejb30.ear.security", - "filterMessage=hello world: " + loginTimeout); - + httpSession.setAttribute("deployment.ejb30.ear.security", "filterMessage=hello world: " + loginTimeout); } chain.doFilter(request, response); } diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyFilter.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyFilter.java index a625be7c844..c7d262ba62e 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyFilter.java +++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyFilter.java @@ -75,8 +75,7 @@ public void doFilter (ServletRequest request, } HttpServletRequest httpRequest = (HttpServletRequest)request; HttpSession httpSession = httpRequest.getSession(true); - httpSession.putValue("deployment.ejb30.web.jsp", "Hello World: " + - loginTimeout); + httpSession.setAttribute("deployment.ejb30.web.jsp", "Hello World: " + loginTimeout); chain.doFilter(request, response); } diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/MyFilter.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/MyFilter.java index 1aa32957b12..04021b9eda2 100644 --- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/MyFilter.java +++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/MyFilter.java @@ -63,8 +63,7 @@ public void doFilter (ServletRequest request, } HttpServletRequest httpRequest = (HttpServletRequest)request; HttpSession httpSession = httpRequest.getSession(true); - httpSession.putValue("deployment.ejb30.war.servlet", - "Filter: Hello World: " + loginTimeout); + httpSession.setAttribute("deployment.ejb30.war.servlet", "Filter: Hello World: " + loginTimeout); chain.doFilter(request, response); } diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/DummyPolicyConfigurationFactory.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/DummyPolicyConfigurationFactory.java index b77039e24fe..6c9f0b308f2 100644 --- a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/DummyPolicyConfigurationFactory.java +++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/DummyPolicyConfigurationFactory.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -21,14 +22,24 @@ import jakarta.security.jacc.PolicyContextException; public class DummyPolicyConfigurationFactory extends PolicyConfigurationFactory { - public PolicyConfiguration - getPolicyConfiguration(String contextID, boolean remove) - throws jakarta.security.jacc.PolicyContextException { + + public PolicyConfiguration getPolicyConfiguration() { + return null; + } + + + public PolicyConfiguration getPolicyConfiguration(String contextID) { return null; } - public boolean inService(String contextID) - throws jakarta.security.jacc.PolicyContextException { + + public PolicyConfiguration getPolicyConfiguration(String contextID, boolean remove) + throws jakarta.security.jacc.PolicyContextException { + return null; + } + + + public boolean inService(String contextID) throws jakarta.security.jacc.PolicyContextException { return false; } } diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java index f347a91a635..12aa06e1ed7 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java +++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java @@ -86,8 +86,7 @@ public AuthStatus validateRequest(MessageInfo messageInfo, } HttpSession session = request.getSession(false); - boolean secondPhase = (session != null && - session.getValue("FIRST_DONE") != null); + boolean secondPhase = (session != null && session.getAttribute("FIRST_DONE") != null); String loginName = ((secondPhase)? username + "_2" : username); char[] pwd = new char[password.length()]; password.getChars(0, password.length(), pwd, 0); @@ -117,7 +116,7 @@ public AuthStatus validateRequest(MessageInfo messageInfo, response.setHeader("WWW-Authenticate", "Basic realm=\"default\""); if (session == null) { session = request.getSession(true); - session.putValue("FIRST_DONE", Boolean.TRUE); + session.setAttribute("FIRST_DONE", Boolean.TRUE); } response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); return AuthStatus.SEND_SUCCESS; diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/src/HttpServletFormTestAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/src/HttpServletFormTestAuthModule.java index b09ea53b0bc..06158588906 100644 --- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/src/HttpServletFormTestAuthModule.java +++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/src/HttpServletFormTestAuthModule.java @@ -75,8 +75,7 @@ public AuthStatus validateRequest(MessageInfo messageInfo, try { HttpSession session = request.getSession(false); if (session != null) { - Subject savedClientSubject = - (Subject)session.getValue(SAVED_SUBJECT); + Subject savedClientSubject = (Subject) session.getAttribute(SAVED_SUBJECT); if (savedClientSubject != null) { System.out.println("already has saved subject"); // just copy principals for testing @@ -96,7 +95,7 @@ public AuthStatus validateRequest(MessageInfo messageInfo, if (session == null) { session = request.getSession(true); } - session.putValue(SAVED_REQUEST, new SavedRequest(request)); + session.setAttribute(SAVED_REQUEST, new SavedRequest(request)); RequestDispatcher rd = request.getRequestDispatcher("login.jsp"); rd.forward(request, response); System.out.println("Form: SEND_CONTINUE"); @@ -117,9 +116,9 @@ public AuthStatus validateRequest(MessageInfo messageInfo, System.out.println("login success: " + username + ", " + password); SavedRequest sreq = null; if (session != null) { - sreq = (SavedRequest)session.getValue(SAVED_REQUEST); + sreq = (SavedRequest) session.getAttribute(SAVED_REQUEST); // for testing only as Subject is not Serializable - session.putValue(SAVED_SUBJECT, clientSubject); + session.setAttribute(SAVED_SUBJECT, clientSubject); } if (sreq != null) { StringBuffer sb = new StringBuffer(sreq.getRequestURI()); diff --git a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/docroot/test.jsp b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/docroot/test.jsp index b8474cf3e01..20afe7ba910 100644 --- a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/docroot/test.jsp +++ b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/docroot/test.jsp @@ -19,7 +19,7 @@ id=<%=session.getId()%> <% String a = request.getParameter("a"); if (a != null) { - session.putValue("a", a); + session.setAttribute("a", a); } - out.println("a=" + session.getValue("a")); + out.println("a=" + session.getAttribute("a")); %> From b50d5b169250a6471b6b3ef45db4dc7e5c0ef086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Wed, 16 Mar 2022 14:03:47 +0100 Subject: [PATCH 29/33] Improved snapshot builds - parallelism, settings.xml - fixed which maven uses which settings.xml - invoker builds with the custom settings.xml - invoker builds projects in parallel threads - fixed relativePath - added properties to settings.xml - skip everything not required --- Jenkinsfile | 2 +- snapshots/pom.xml | 8 +++- snapshots/settings.xml | 87 ++++++++++++++++++++++++------------------ 3 files changed, 57 insertions(+), 40 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 17a8bbc640a..e32818af06a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -267,7 +267,7 @@ spec: uname -a # temporary build of external snapshot dependencies - mvn clean install -f ./snapshots/pom.xml -s ./snapshots/settings.xml + mvn clean install -f ./snapshots/pom.xml # Until we fix ANTLR in cmp-support-sqlstore, broken in parallel builds. Just -Pfast after the fix. mvn clean install -Pfastest,staging -T4C ./gfbuild.sh archive_bundles diff --git a/snapshots/pom.xml b/snapshots/pom.xml index 2220b2dc26d..acf218d1ed2 100644 --- a/snapshots/pom.xml +++ b/snapshots/pom.xml @@ -23,11 +23,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" > 4.0.0 - + org.eclipse.ee4j project 1.0.6 + org.glassfish.main.snapshots @@ -89,7 +90,10 @@ pom.xml - clean source:jar install -Pstaging -DskipTests -Dmaven.test.skip=true + clean install + ${basedir}/../settings.xml + staging,default + 4 diff --git a/snapshots/settings.xml b/snapshots/settings.xml index f5d77a1ed76..7f671366111 100644 --- a/snapshots/settings.xml +++ b/snapshots/settings.xml @@ -1,40 +1,53 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd" +> - - - default - - true - - - - sonatype-nexus-staging - Sonatype Nexus Staging - https://jakarta.oss.sonatype.org/content/repositories/staging/ - - true - - - false - - - + + + default + + true + - - - sonatype-nexus-staging - Sonatype Nexus Staging - https://jakarta.oss.sonatype.org/content/repositories/staging/ - - true - - - false - - - - - - \ No newline at end of file + + true + true + true + true + true + true + true + true + + + + + sonatype-nexus-staging + Sonatype Nexus Staging + https://jakarta.oss.sonatype.org/content/repositories/staging/ + + true + + + false + + + + + + + sonatype-nexus-staging + Sonatype Nexus Staging + https://jakarta.oss.sonatype.org/content/repositories/staging/ + + true + + + false + + + + + + From 5f22f7a307bae2875f1172620b11755fa26d347f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Wed, 16 Mar 2022 14:12:18 +0100 Subject: [PATCH 30/33] Upgraded dependencies - servlet, metro, grizzly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - servlet6 - grizzly 4 snapshot - webservices 4 snapshot Signed-off-by: David Matějček --- .../org/apache/catalina/core/Constants.java | 13 +- .../core/SessionCookieConfigImpl.java | 69 ++-- .../apache/catalina/core/StandardContext.java | 367 +++++++++++------- .../grizzly/config/ssl/JSSESupport.java | 6 +- nucleus/parent/pom.xml | 84 ++-- .../security/ssl/GlassfishSSLSupport.java | 12 +- snapshots/grizzly/pom.xml | 49 +++ snapshots/metro/pom.xml | 49 +++ snapshots/pom.xml | 2 + 9 files changed, 413 insertions(+), 238 deletions(-) create mode 100644 snapshots/grizzly/pom.xml create mode 100644 snapshots/metro/pom.xml diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/Constants.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/Constants.java index 90eeeebb94f..4fa789efb90 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/Constants.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/Constants.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Contributors to Eclipse Foundation. + * Copyright (c) 2021-2022 Contributors to Eclipse Foundation. * Copyright (c) 1997-2022 Oracle and/or its affiliates. All rights reserved. * Copyright 2004 The Apache Software Foundation * @@ -25,12 +25,19 @@ public class Constants { public static final int MAJOR_VERSION = 6; public static final int MINOR_VERSION = 0; - public static final String JSP_SERVLET_CLASS = - "org.glassfish.wasp.servlet.JspServlet"; + public static final String JSP_SERVLET_CLASS = "org.glassfish.wasp.servlet.JspServlet"; public static final String JSP_SERVLET_NAME = "jsp"; public static final String DEFAULT_SERVLET_NAME = "default"; public static final String IS_DEFAULT_ERROR_PAGE_ENABLED_INIT_PARAM = "org.glassfish.web.isDefaultErrorPageEnabled"; + + public static final String COOKIE_COMMENT_ATTR = "Comment"; + public static final String COOKIE_DOMAIN_ATTR = "Domain"; + public static final String COOKIE_MAX_AGE_ATTR = "Max-Age"; + public static final String COOKIE_PATH_ATTR = "Path"; + public static final String COOKIE_SECURE_ATTR = "Secure"; + public static final String COOKIE_HTTP_ONLY_ATTR = "HttpOnly"; + public static final String COOKIE_SAME_SITE_ATTR = "SameSite"; } diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/SessionCookieConfigImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/SessionCookieConfigImpl.java index 2636e5ba66f..5a6f8a9c49f 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/SessionCookieConfigImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/SessionCookieConfigImpl.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022 Contributors to the Eclipse Foundation * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -16,13 +17,14 @@ package org.apache.catalina.core; -import org.apache.catalina.Globals; import org.apache.catalina.LogFacade; import java.text.MessageFormat; +import java.util.Collections; import java.util.Map; import java.util.ResourceBundle; -import java.util.logging.Logger; +import java.util.TreeMap; + import jakarta.servlet.SessionCookieConfig; /** @@ -31,14 +33,15 @@ */ public class SessionCookieConfigImpl implements SessionCookieConfig { - private String name; - private String domain; - private String path; - private String comment; - private boolean httpOnly = true; - private boolean secure; - private StandardContext ctx; - private int maxAge = -1; + private static final int DEFAULT_MAX_AGE = -1; + private static final boolean DEFAULT_HTTP_ONLY = false; + private static final boolean DEFAULT_SECURE = false; + private static final String DEFAULT_NAME = "JSESSIONID"; + + private String name = DEFAULT_NAME; + + private final Map attributes = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + private final StandardContext ctx; private static final ResourceBundle rb = LogFacade.getLogger().getResourceBundle(); @@ -95,8 +98,7 @@ public void setDomain(String domain) { new Object[] {"dnmain", ctx.getName()}); throw new IllegalStateException(msg); } - - this.domain = domain; + setAttribute(Constants.COOKIE_DOMAIN_ATTR, domain); } @@ -106,7 +108,7 @@ public void setDomain(String domain) { */ @Override public String getDomain() { - return domain; + return getAttribute(Constants.COOKIE_DOMAIN_ATTR); } @@ -124,8 +126,7 @@ public void setPath(String path) { new Object[] {"path", ctx.getName()}); throw new IllegalStateException(msg); } - - this.path = path; + setAttribute(Constants.COOKIE_PATH_ATTR, path); } @@ -137,7 +138,7 @@ public void setPath(String path) { */ @Override public String getPath() { - return path; + return getAttribute(Constants.COOKIE_PATH_ATTR); } @@ -155,8 +156,7 @@ public void setComment(String comment) { new Object[] {"comment", ctx.getName()}); throw new IllegalStateException(msg); } - - this.comment = comment; + setAttribute(Constants.COOKIE_COMMENT_ATTR, comment); } @@ -166,7 +166,7 @@ public void setComment(String comment) { */ @Override public String getComment() { - return comment; + return getAttribute(Constants.COOKIE_COMMENT_ATTR); } @@ -187,8 +187,7 @@ public void setHttpOnly(boolean httpOnly) { new Object[] {"httpOnly", ctx.getName()}); throw new IllegalStateException(msg); } - - this.httpOnly = httpOnly; + setAttribute(Constants.COOKIE_HTTP_ONLY_ATTR, String.valueOf(httpOnly)); } @@ -199,7 +198,8 @@ public void setHttpOnly(boolean httpOnly) { */ @Override public boolean isHttpOnly() { - return httpOnly; + String value = getAttribute(Constants.COOKIE_HTTP_ONLY_ATTR); + return value == null ? DEFAULT_HTTP_ONLY : Boolean.parseBoolean(value); } @@ -223,8 +223,7 @@ public void setSecure(boolean secure) { new Object[] {"secure", ctx.getName()}); throw new IllegalStateException(msg); } - - this.secure = secure; + setAttribute(Constants.COOKIE_SECURE_ATTR, String.valueOf(secure)); } @@ -239,7 +238,8 @@ public void setSecure(boolean secure) { */ @Override public boolean isSecure() { - return secure; + String value = getAttribute(Constants.COOKIE_SECURE_ATTR); + return value == null ? DEFAULT_SECURE : Boolean.parseBoolean(value); } @@ -250,35 +250,28 @@ public void setMaxAge(int maxAge) { new Object[] {"maxAge", ctx.getName()}); throw new IllegalStateException(msg); } - - this.maxAge = maxAge; + setAttribute(Constants.COOKIE_MAX_AGE_ATTR, String.valueOf(maxAge)); } @Override public int getMaxAge() { - return maxAge; + String value = getAttribute(Constants.COOKIE_MAX_AGE_ATTR); + return value == null ? DEFAULT_MAX_AGE : Integer.parseInt(value); } - @Override public void setAttribute(String name, String value) { - // TODO IMPLEMENT! - + this.attributes.put(name, value); } - @Override public String getAttribute(String name) { - // TODO IMPLEMENT! - return null; + return this.attributes.get(name); } - @Override public Map getAttributes() { - // TODO IMPLEMENT! - return null; + return Collections.unmodifiableMap(this.attributes); } - } diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java index 0270c749573..2f2d8f627ac 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Contributors to Eclipse Foundation. + * Copyright (c) 2021-2022 Contributors to Eclipse Foundation. * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * Copyright 2004 The Apache Software Foundation * @@ -18,65 +18,78 @@ package org.apache.catalina.core; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import org.glassfish.grizzly.http.server.util.AlternateDocBase; -import org.glassfish.grizzly.http.server.util.Mapper; -import org.glassfish.grizzly.http.server.util.MappingData; +import jakarta.servlet.*; +import jakarta.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.http.HttpServletMapping; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionAttributeListener; +import jakarta.servlet.http.HttpSessionIdListener; +import jakarta.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpUpgradeHandler; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.net.MalformedURLException; +import java.net.URLDecoder; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.text.MessageFormat; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.logging.Level; + +import javax.management.MBeanRegistrationException; +import javax.management.MalformedObjectNameException; +import javax.management.Notification; +import javax.management.NotificationBroadcasterSupport; +import javax.management.ObjectName; +import javax.naming.Binding; +import javax.naming.NamingException; +import javax.naming.directory.DirContext; + import org.apache.catalina.*; +import org.apache.catalina.connector.MappingImpl; import org.apache.catalina.deploy.*; import org.apache.catalina.loader.WebappLoader; +import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.session.ManagerBase; import org.apache.catalina.session.PersistentManagerBase; import org.apache.catalina.session.StandardManager; -import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.ContextConfig; -import org.apache.catalina.util.*; +import org.apache.catalina.util.CharsetMapper; +import org.apache.catalina.util.CustomObjectInputStream; +import org.apache.catalina.util.ExtensionValidator; +import org.apache.catalina.util.RequestUtil; +import org.apache.catalina.util.URLEncoder; import org.apache.naming.ContextBindings; import org.apache.naming.resources.BaseDirContext; import org.apache.naming.resources.DirContextURLStreamHandler; import org.apache.naming.resources.FileDirContext; -import org.apache.naming.resources.WebDirContext; import org.apache.naming.resources.ProxyDirContext; import org.apache.naming.resources.Resource; import org.apache.naming.resources.WARDirContext; +import org.apache.naming.resources.WebDirContext; +import org.glassfish.grizzly.http.server.util.AlternateDocBase; +import org.glassfish.grizzly.http.server.util.Mapper; +import org.glassfish.grizzly.http.server.util.MappingData; +import org.glassfish.grizzly.http.util.CharChunk; +import org.glassfish.grizzly.http.util.MessageBytes; import org.glassfish.hk2.classmodel.reflect.Types; import org.glassfish.web.loader.WebappClassLoader; -import org.glassfish.web.loader.ServletContainerInitializerUtil; import org.glassfish.web.valve.GlassFishValve; -import javax.management.*; -import javax.naming.Binding; -import javax.naming.NamingException; -import javax.naming.directory.DirContext; -import jakarta.servlet.*; -import jakarta.servlet.descriptor.JspConfigDescriptor; -import jakarta.servlet.http.HttpSession; -import jakarta.servlet.http.HttpSessionAttributeListener; -import jakarta.servlet.http.HttpSessionIdListener; -import jakarta.servlet.http.HttpSessionListener; -import jakarta.servlet.http.HttpUpgradeHandler; - +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; import static java.util.logging.Level.SEVERE; import static org.apache.catalina.Globals.FACES_INITIALIZER; import static org.glassfish.web.loader.ServletContainerInitializerUtil.getInitializerList; import static org.glassfish.web.loader.ServletContainerInitializerUtil.getInterestList; -import java.io.*; -import java.net.MalformedURLException; -import java.net.URLDecoder; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.text.MessageFormat; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.logging.Level; -import jakarta.servlet.http.HttpServletMapping; -import org.apache.catalina.connector.MappingImpl; -import org.glassfish.grizzly.http.util.CharChunk; -import org.glassfish.grizzly.http.util.MessageBytes; - /** * Standard implementation of the Context interface. Each * child container must be a Wrapper implementation to process the @@ -165,26 +178,26 @@ public StandardContext() { /** * The list of instantiated application event listeners */ - private List eventListeners = - new ArrayList(); + private final List eventListeners = + new ArrayList<>(); /** * The list of ServletContextListeners */ protected ArrayList contextListeners = - new ArrayList(); + new ArrayList<>(); /** * The list of HttpSessionListeners */ - private List sessionListeners = - new ArrayList(); + private final List sessionListeners = + new ArrayList<>(); /** * The set of application parameters defined for this application. */ - private List applicationParameters = - new ArrayList(); + private final List applicationParameters = + new ArrayList<>(); /** * The application available flag for this Context. @@ -229,8 +242,8 @@ public StandardContext() { /** * The security constraints for this web application. */ - private List constraints = - new ArrayList(); + private final List constraints = + new ArrayList<>(); /** * The ServletContext implementation associated with this Context. @@ -294,8 +307,8 @@ public StandardContext() { /** * Thread local data used during request dispatch. */ - private ThreadLocal dispatchData = - new ThreadLocal(); + private final ThreadLocal dispatchData = + new ThreadLocal<>(); /** * The document root for this web application. @@ -306,8 +319,8 @@ public StandardContext() { * The exception pages for this web application, keyed by fully qualified * class name of the Java exception. */ - private Map exceptionPages = - new HashMap(); + private final Map exceptionPages = + new HashMap<>(); /** * The default error page (error page that was declared @@ -319,32 +332,32 @@ public StandardContext() { * The set of filter configurations (and associated filter instances) we * have initialized, keyed by filter name. */ - private Map filterConfigs = - new HashMap(); + private final Map filterConfigs = + new HashMap<>(); /** * The set of filter definitions for this application, keyed by * filter name. */ - private Map filterDefs = new HashMap(); + private final Map filterDefs = new HashMap<>(); /** * The list of filter mappings for this application, in the order * they were defined in the deployment descriptor. */ - private List filterMaps = new ArrayList(); + private final List filterMaps = new ArrayList<>(); /** * The list of classnames of InstanceListeners that will be added * to each newly created Wrapper by createWrapper(). */ - private ArrayList instanceListeners = new ArrayList(); + private final ArrayList instanceListeners = new ArrayList<>(); /** * The set of already instantiated InstanceListeners that will be added * to each newly created Wrapper by createWrapper(). */ - private List instanceListenerInstances = new ArrayList(); + private final List instanceListenerInstances = new ArrayList<>(); /** * The login configuration descriptor for this web application. @@ -354,7 +367,7 @@ public StandardContext() { /** * The mapper associated with this context. */ - private Mapper mapper = new Mapper(); + private final Mapper mapper = new Mapper(); /** * The naming context listener for this web application. @@ -369,18 +382,18 @@ public StandardContext() { /** * The message destinations for this web application. */ - private Map messageDestinations = new HashMap(); + private final Map messageDestinations = new HashMap<>(); /** * The MIME mappings for this web application, keyed by extension. */ - private Map mimeMappings = new HashMap(); + private final Map mimeMappings = new HashMap<>(); /** * The context initialization parameters for this web application, * keyed by name. */ - private HashMap parameters = new HashMap(); + private final HashMap parameters = new HashMap<>(); /** * The request processing pause flag (while reloading occurs) @@ -440,18 +453,18 @@ public StandardContext() { * The security role mappings for this application, keyed by role * name (as used within the application). */ - private Map roleMappings = new HashMap(); + private final Map roleMappings = new HashMap<>(); /** * The security roles for this application */ - private List securityRoles = new ArrayList(); + private final List securityRoles = new ArrayList<>(); /** * The servlet mappings for this web application, keyed by * matching pattern. */ - private final Map servletMappings = new HashMap(); + private final Map servletMappings = new HashMap<>(); /** * The session timeout (in minutes) for this web application. @@ -475,7 +488,7 @@ public StandardContext() { * HTTP status code (as an Integer). */ private final Map statusPages = - new HashMap(); + new HashMap<>(); /** * Amount of ms that the container will wait for servlets to unload. @@ -485,7 +498,7 @@ public StandardContext() { /** * The watched resources for this application. */ - private List watchedResources = + private final List watchedResources = Collections.synchronizedList(new ArrayList()); /** @@ -497,13 +510,13 @@ public StandardContext() { * The list of classnames of LifecycleListeners that will be added * to each newly created Wrapper by createWrapper(). */ - private ArrayList wrapperLifecycles = new ArrayList(); + private final ArrayList wrapperLifecycles = new ArrayList<>(); /** * The list of classnames of ContainerListeners that will be added * to each newly created Wrapper by createWrapper(). */ - private List wrapperListeners = new ArrayList(); + private final List wrapperListeners = new ArrayList<>(); /** * The pathname to the work directory for this context (relative to @@ -689,10 +702,10 @@ public StandardContext() { private boolean sessionCookieNameInitialized = false; protected ConcurrentMap servletRegisMap = - new ConcurrentHashMap(); + new ConcurrentHashMap<>(); protected ConcurrentMap filterRegisMap = - new ConcurrentHashMap(); + new ConcurrentHashMap<>(); /** * The list of ordered libs, which is used as the value of the @@ -964,8 +977,9 @@ public CharsetMapper getCharsetMapper() { public void setCharsetMapper(CharsetMapper mapper) { CharsetMapper oldCharsetMapper = this.charsetMapper; this.charsetMapper = mapper; - if( mapper != null ) + if( mapper != null ) { this.charsetMapperClass= mapper.getClass().getName(); + } support.firePropertyChange("charsetMapper", oldCharsetMapper, this.charsetMapper); } @@ -1271,7 +1285,7 @@ public void addAlternateDocBase(String urlPattern, String docBase) { alternateDocBase.setBasePath(getBasePath(docBase)); if (alternateDocBases == null) { - alternateDocBases = new ArrayList(); + alternateDocBases = new ArrayList<>(); } alternateDocBases.add(alternateDocBase); } @@ -1329,7 +1343,9 @@ public String getJvmRoute() { } public String getEngineName() { - if( engineName != null ) return engineName; + if( engineName != null ) { + return engineName; + } return domain; } @@ -1370,9 +1386,10 @@ public LoginConfig getLoginConfig() { public void setLoginConfig(LoginConfig config) { // Validate the incoming property value - if (config == null) + if (config == null) { throw new IllegalArgumentException (rb.getString(LogFacade.LOGIN_CONFIG_REQUIRED_EXCEPTION)); + } String loginPage = config.getLoginPage(); if ((loginPage != null) && !loginPage.startsWith("/")) { if (isServlet22()) { @@ -1491,9 +1508,10 @@ public String getPublicId() { */ @Override public void setPublicId(String publicId) { - if (log.isLoggable(Level.FINEST)) + if (log.isLoggable(Level.FINEST)) { log.log(Level.FINEST, "Setting deployment descriptor public ID to '" + publicId + "'"); + } String oldPublicId = this.publicId; this.publicId = publicId; @@ -1810,8 +1828,9 @@ public synchronized void setResources(DirContext resources) { } DirContext oldResources = this.webappResources; - if (oldResources == resources) + if (oldResources == resources) { return; + } if (resources instanceof BaseDirContext) { BaseDirContext baseDirContext = (BaseDirContext)resources; @@ -1846,8 +1865,9 @@ private synchronized void setAlternateResources( final DirContext oldResources = ContextsAdapterUtility.unwrap( alternateDocBase.getWebappResources()); - if (oldResources == resources) + if (oldResources == resources) { return; + } if (resources instanceof BaseDirContext) { ((BaseDirContext) resources).setCached(isCachingAllowed()); @@ -2294,8 +2314,9 @@ public void addEjb(ContextEjb ejb) { public void addEnvironment(ContextEnvironment environment) { ContextEnvironment env = findEnvironment(environment.getName()); - if ((env != null) && !env.getOverride()) + if ((env != null) && !env.getOverride()) { return; + } namingResources.addEnvironment(environment); if (notifyContainerListeners) { @@ -2325,9 +2346,10 @@ public void addResourceParams(ResourceParams resourceParameters) { @Override public void addErrorPage(ErrorPage errorPage) { // Validate the input parameters - if (errorPage == null) + if (errorPage == null) { throw new IllegalArgumentException (rb.getString(LogFacade.ERROR_PAGE_REQUIRED_EXCEPTION)); + } String location = errorPage.getLocation(); if ((location != null) && !location.startsWith("/")) { if (isServlet22()) { @@ -2504,7 +2526,7 @@ public void addFilterMap(FilterMap filterMap, boolean isMatchAfter) { * the given name. */ public Collection getServletNameFilterMappings(String filterName) { - HashSet mappings = new HashSet(); + HashSet mappings = new HashSet<>(); synchronized (filterMaps) { for (FilterMap fm : filterMaps) { if (filterName.equals(fm.getFilterName()) && @@ -2521,7 +2543,7 @@ public Collection getServletNameFilterMappings(String filterName) { * name. */ public Collection getUrlPatternFilterMappings(String filterName) { - HashSet mappings = new HashSet(); + HashSet mappings = new HashSet<>(); synchronized (filterMaps) { for (FilterMap fm : filterMaps) { if (filterName.equals(fm.getFilterName()) && @@ -3349,7 +3371,7 @@ public Set addServletMapping(String name, !name.equals(Constants.DEFAULT_SERVLET_NAME) && !name.equals(Constants.JSP_SERVLET_NAME)) { if (conflicts == null) { - conflicts = new HashSet(); + conflicts = new HashSet<>(); } conflicts.add(pattern); } @@ -3797,8 +3819,9 @@ public void addWelcomeFile(String name) { setReplaceWelcomeFiles(false); } String results[] = new String[welcomeFiles.length + 1]; - for (int i = 0; i < welcomeFiles.length; i++) + for (int i = 0; i < welcomeFiles.length; i++) { results[i] = welcomeFiles[i]; + } results[welcomeFiles.length] = name; welcomeFiles = results; @@ -4241,10 +4264,11 @@ public String findRoleMapping(String role) { synchronized (roleMappings) { realRole = roleMappings.get(role); } - if (realRole != null) + if (realRole != null) { return (realRole); - else + } else { return (role); + } } /** @@ -4323,8 +4347,9 @@ public int[] findStatusPages() { int results[] = new int[statusPages.size()]; Iterator elements = statusPages.keySet().iterator(); int i = 0; - while (elements.hasNext()) + while (elements.hasNext()) { results[i++] = elements.next(); + } return results; } } @@ -4489,8 +4514,9 @@ public void removeApplicationParameter(String name) { @Override public void removeChild(Container child) { - if (!(child instanceof Wrapper)) + if (!(child instanceof Wrapper)) { throw new IllegalArgumentException(rb.getString(LogFacade.NO_WRAPPER_EXCEPTION)); + } super.removeChild(child); } @@ -4942,8 +4968,9 @@ public void fireRequestDestroyedEvent(ServletRequest request) { */ public boolean filterStart() { - if (log.isLoggable(Level.FINE)) + if (log.isLoggable(Level.FINE)) { log.log(Level.FINE, "Starting filters"); + } // Instantiate and record a FilterConfig for each defined filter boolean ok = true; synchronized (filterConfigs) { @@ -4976,8 +5003,9 @@ public boolean filterStart() { */ public boolean filterStop() { - if (log.isLoggable(Level.FINE)) + if (log.isLoggable(Level.FINE)) { log.log(Level.FINE, "Stopping filters"); + } // Release all Filter and FilterConfig instances synchronized (filterConfigs) { @@ -5172,8 +5200,9 @@ private void mergeParameters() { for (ApplicationParameter param : findApplicationParameters()) { if (param.getOverride()) { - if (mergedParams.get(param.getName()) == null) + if (mergedParams.get(param.getName()) == null) { mergedParams.put(param.getName(), param.getValue()); + } } else { mergedParams.put(param.getName(), param.getValue()); } @@ -5194,7 +5223,7 @@ public boolean resourcesStart() { boolean ok = true; - Hashtable env = new Hashtable(); + Hashtable env = new Hashtable<>(); if(getParent() != null) { env.put(ProxyDirContext.HOST, getParent().getName()); } @@ -5229,7 +5258,7 @@ public void alternateResourcesStart() throws LifecycleException { return; } - Hashtable env = new Hashtable(); + Hashtable env = new Hashtable<>(); if (getParent() != null) { env.put(ProxyDirContext.HOST, getParent().getName()); } @@ -5338,7 +5367,7 @@ public void loadOnStartup(Container children[]) throws LifecycleException { // END SJSAS 6377790 // Collect "load on startup" servlets that need to be initialized Map> map = - new TreeMap>(); + new TreeMap<>(); for (Container aChildren : children) { Wrapper wrapper = (Wrapper)aChildren; int loadOnStartup = wrapper.getLoadOnStartup(); @@ -5348,7 +5377,7 @@ public void loadOnStartup(Container children[]) throws LifecycleException { Integer key = loadOnStartup; List list = map.get(key); if(list == null) { - list = new ArrayList(); + list = new ArrayList<>(); map.put(key, list); } list.add(wrapper); @@ -5438,10 +5467,11 @@ public synchronized void start() throws LifecycleException { } try { if ((docBase != null) && (docBase.endsWith(".war")) && - (!(new File(docBase).isDirectory()))) + (!(new File(docBase).isDirectory()))) { setResources(new WARDirContext()); - else + } else { setResources(new WebDirContext()); + } } catch (IllegalArgumentException e) { throw new LifecycleException(rb.getString(LogFacade.INIT_RESOURCES_EXCEPTION), e); } @@ -5517,10 +5547,12 @@ public synchronized void start() throws LifecycleException { started = true; // Start our subordinate components, if any - if ((loader != null) && (loader instanceof Lifecycle)) + if ((loader != null) && (loader instanceof Lifecycle)) { ((Lifecycle) loader).start(); - if ((logger != null) && (logger instanceof Lifecycle)) + } + if ((logger != null) && (logger instanceof Lifecycle)) { ((Lifecycle) logger).start(); + } // Unbinding thread // START OF SJSAS 8.1 6174179 @@ -5530,10 +5562,12 @@ public synchronized void start() throws LifecycleException { // Binding thread oldCCL = bindThread(); - if ((realm != null) && (realm instanceof Lifecycle)) + if ((realm != null) && (realm instanceof Lifecycle)) { ((Lifecycle) realm).start(); - if ((resources != null) && (resources instanceof Lifecycle)) + } + if ((resources != null) && (resources instanceof Lifecycle)) { ((Lifecycle) resources).start(); + } // Start our child containers, if any for (Container child : findChildren()) { @@ -5544,8 +5578,9 @@ public synchronized void start() throws LifecycleException { // Start the Valves in our pipeline (including the basic), // if any - if (pipeline instanceof Lifecycle) + if (pipeline instanceof Lifecycle) { ((Lifecycle) pipeline).start(); + } // START SJSAS 8.1 5049111 // Notify our interested LifecycleListeners @@ -5913,8 +5948,9 @@ public synchronized void stop(boolean isShutdown) // Notify our interested LifecycleListeners lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null); - if (log.isLoggable(Level.FINE)) + if (log.isLoggable(Level.FINE)) { log.log(Level.FINE, "Stopping complete"); + } if(oname != null) { // Send j2ee.object.deleted notification @@ -5957,7 +5993,7 @@ public void destroy() throws Exception { private void resetContext() throws Exception, MBeanRegistrationException { // Restore the original state ( pre reading web.xml in start ) // If you extend this - override this method and make sure to clean up - children=new HashMap(); + children=new HashMap<>(); startupTime = 0; startTimeMillis = 0; tldScanTime = 0; @@ -6002,8 +6038,9 @@ public String toString() { @Override public void backgroundProcess() { - if (!started) + if (!started) { return; + } count = (count + 1) % managerChecksFrequency; @@ -6053,12 +6090,15 @@ public void backgroundProcess() { */ protected String adjustURLPattern(String urlPattern) { - if (urlPattern == null) + if (urlPattern == null) { return (urlPattern); - if (urlPattern.startsWith("/") || urlPattern.startsWith("*.")) + } + if (urlPattern.startsWith("/") || urlPattern.startsWith("*.")) { return (urlPattern); - if (!isServlet22()) + } + if (!isServlet22()) { return (urlPattern); + } if (log.isLoggable(Level.FINE)) { log.log(Level.FINE, LogFacade.URL_PATTERN_WARNING, urlPattern); } @@ -6129,8 +6169,9 @@ private String getBasePath(String docBase) { String basePath = null; Container container = this; while (container != null) { - if (container instanceof Host) + if (container instanceof Host) { break; + } container = container.getParent(); } File file = new File(docBase); @@ -6141,8 +6182,9 @@ private String getBasePath(String docBase) { // Use the "appBase" property of this container String appBase = ((Host) container).getAppBase(); file = new File(appBase); - if (!file.isAbsolute()) + if (!file.isAbsolute()) { file = new File(engineBase(), appBase); + } basePath = (new File(file, docBase)).getPath(); } } else { @@ -6262,7 +6304,7 @@ public String getNamingContextName() { if (parent == null) { namingContextName = getName(); } else { - Stack stk = new Stack(); + Stack stk = new Stack<>(); StringBuilder buff = new StringBuilder(); while (parent != null) { stk.push(parent.getName()); @@ -6307,8 +6349,9 @@ public String getHostname() { if (parentHost != null) { hostName = parentHost.getName(); } - if ((hostName == null) || (hostName.length() < 1)) + if ((hostName == null) || (hostName.length() < 1)) { hostName = "_"; + } return hostName; } @@ -6336,18 +6379,22 @@ private void postWorkDirectory() { engineName = parentEngine.getName(); } } - if ((hostName == null) || (hostName.length() < 1)) + if ((hostName == null) || (hostName.length() < 1)) { hostName = "_"; - if ((engineName == null) || (engineName.length() < 1)) + } + if ((engineName == null) || (engineName.length() < 1)) { engineName = "_"; + } String temp = getPath(); - if (temp.startsWith("/")) + if (temp.startsWith("/")) { temp = temp.substring(1); + } temp = temp.replace('/', '_'); temp = temp.replace('\\', '_'); - if (temp.length() < 1) + if (temp.length() < 1) { temp = "_"; + } if (hostWorkDir != null ) { workDir = hostWorkDir + File.separator + temp; } else { @@ -6408,15 +6455,17 @@ protected boolean validateURLPattern(String urlPattern) { if (urlPattern.indexOf('/') < 0) { checkUnusualURLPattern(urlPattern); return true; - } else + } else { return false; + } } if ( (urlPattern.startsWith("/")) && (!urlPattern.contains("*."))) { checkUnusualURLPattern(urlPattern); return true; - } else + } else { return false; + } } @@ -6446,7 +6495,7 @@ private void checkUnusualURLPattern(String urlPattern) { */ public String[] getEnvironments() { ContextEnvironment[] envs = getNamingResources().findEnvironments(); - List results = new ArrayList(); + List results = new ArrayList<>(); for(ContextEnvironment env : envs) { try { ObjectName oname = createObjectName(env); @@ -6470,7 +6519,7 @@ public String[] getEnvironments() { public String[] getResourceNames() { ContextResource[] resources = getNamingResources().findResources(); - List results = new ArrayList(); + List results = new ArrayList<>(); for(ContextResource resource : resources) { try { ObjectName oname = createObjectName(resource); @@ -6493,7 +6542,7 @@ public String[] getResourceNames() { public String[] getResourceLinks() { ContextResourceLink[] links = getNamingResources().findResourceLinks(); - List results = new ArrayList(); + List results = new ArrayList<>(); for(ContextResourceLink link : links) { try { ObjectName oname = createObjectName(link); @@ -6611,11 +6660,14 @@ public ObjectName createObjectName(String hostDomain, ObjectName parentName) getJ2EEServer(); onameStr="j2eeType=WebModule,name=" + name + suffix; - if( log.isLoggable(Level.FINE)) + if( log.isLoggable(Level.FINE)) { log.log(Level.FINE, "Registering " + onameStr + " for " + oname); + } // default case - no domain explictely set. - if( getDomain() == null ) domain=hst.getDomain(); + if( getDomain() == null ) { + domain=hst.getDomain(); + } return new ObjectName(getDomain() + ":" + onameStr); } @@ -6733,7 +6785,9 @@ public ObjectName getParentName() throws MalformedObjectNameException { } // XXX The service and domain should be the same. String parentDomain=getEngineName(); - if( parentDomain == null ) parentDomain=domain; + if( parentDomain == null ) { + parentDomain=domain; + } return new ObjectName( parentDomain + ":" + "type=Host,host=" + hostName); } @@ -6762,8 +6816,9 @@ public ObjectName createObjectName(ContextEnvironment environment) ",resourcetype=Global,name=" + environment.getName()); } else if (container instanceof Context) { String path = ((Context)container).getPath(); - if (path.length() < 1) + if (path.length() < 1) { path = "/"; + } Host host = (Host) ((Context)container).getParent(); name = new ObjectName(domain + ":type=Environment" + ",resourcetype=Context,path=" + path + @@ -6795,8 +6850,9 @@ public ObjectName createObjectName(ContextResource resource) ",name=" + encodedResourceName); } else if (container instanceof Context) { String path = ((Context)container).getPath(); - if (path.length() < 1) + if (path.length() < 1) { path = "/"; + } Host host = (Host) ((Context)container).getParent(); name = new ObjectName(domain + ":type=Resource" + ",resourcetype=Context,path=" + path + @@ -6830,8 +6886,9 @@ public ObjectName createObjectName(ContextResourceLink resourceLink) ",name=" + encodedResourceLinkName); } else if (container instanceof Context) { String path = ((Context)container).getPath(); - if (path.length() < 1) + if (path.length() < 1) { path = "/"; + } Host host = (Host) ((Context)container).getParent(); name = new ObjectName(domain + ":type=ResourceLink" + ",resourcetype=Context,path=" + path + @@ -6888,11 +6945,13 @@ public ServletContext getContext(String uri) { String mapuri = uri; while (true) { child = (Context) host.findChild(mapuri); - if (child != null) + if (child != null) { break; + } int slash = mapuri.lastIndexOf('/'); - if (slash < 0) + if (slash < 0) { break; + } mapuri = mapuri.substring(0, slash); } } catch (Throwable t) { @@ -6972,14 +7031,17 @@ public int getMinorVersion() { @Override public String getMimeType(String file) { - if (file == null) + if (file == null) { return (null); + } int period = file.lastIndexOf("."); - if (period < 0) + if (period < 0) { return (null); + } String extension = file.substring(period + 1); - if (extension.length() < 1) + if (extension.length() < 1) { return (null); + } return (findMimeMapping(extension)); } @@ -6992,13 +7054,15 @@ public String getMimeType(String file) { public RequestDispatcher getNamedDispatcher(String name) { // Validate the name argument - if (name == null) + if (name == null) { return (null); + } // Create and return a corresponding request dispatcher Wrapper wrapper = (Wrapper) findChild(name); - if (wrapper == null) + if (wrapper == null) { return (null); + } return new ApplicationDispatcher(wrapper, null, null, null, null, null, name); @@ -7048,8 +7112,9 @@ public String getRealPath(String path) { return null; } - if (!isFilesystemBased()) + if (!isFilesystemBased()) { return null; + } if (path == null) { return null; @@ -7113,8 +7178,9 @@ public void log(String message) { public void log(Exception exception, String message) { message= neutralizeForLog(message); org.apache.catalina.Logger logger = getLogger(); - if (logger != null) + if (logger != null) { logger.log(exception, logName() + message); + } } /** @@ -7124,8 +7190,9 @@ public void log(Exception exception, String message) { public void log(String message, Throwable throwable) { message= neutralizeForLog(message); org.apache.catalina.Logger logger = getLogger(); - if (logger != null) + if (logger != null) { logger.log(logName() + message, throwable); + } } /** @@ -7137,12 +7204,14 @@ public void log(String message, Throwable throwable) { @Override public InputStream getResourceAsStream(String path) { - if (path == null || !path.startsWith("/")) + if (path == null || !path.startsWith("/")) { return (null); + } path = RequestUtil.normalize(path); - if (path == null) + if (path == null) { return (null); + } DirContext resources = null; @@ -7163,8 +7232,9 @@ public InputStream getResourceAsStream(String path) { if (resources != null) { try { Object resource = resources.lookup(path); - if (resource instanceof Resource) + if (resource instanceof Resource) { return (((Resource) resource).streamContent()); + } } catch (Exception e) { // do nothing } @@ -7187,8 +7257,9 @@ public java.net.URL getResource(String path) } path = RequestUtil.normalize(path); - if (path == null) + if (path == null) { return (null); + } String libPath = "/WEB-INF/lib/"; if ((path.startsWith(libPath)) && (path.endsWith(".jar"))) { @@ -7260,8 +7331,9 @@ public Set getResourcePaths(String path) { } path = RequestUtil.normalize(path); - if (path == null) + if (path == null) { return (null); + } DirContext resources = null; @@ -7294,7 +7366,7 @@ public Set getResourcePaths(String path) { */ private Set getResourcePathsInternal(DirContext resources, String path) { - HashSet set = new HashSet(); + HashSet set = new HashSet<>(); try { listCollectionPaths(set, resources, path); } catch (NamingException e) { @@ -7352,8 +7424,9 @@ public RequestDispatcher getRequestDispatcher(String path) { } path = RequestUtil.normalize(path); - if (path == null) + if (path == null) { return (null); + } pos = path.length(); @@ -7656,7 +7729,7 @@ public static class RestrictedServletContextListener /* * The ServletContextListener to which to delegate */ - private ServletContextListener delegate; + private final ServletContextListener delegate; /** * Constructor @@ -7817,8 +7890,9 @@ public MySecurityManager run() { Binding binding = childPaths.nextElement(); String name = binding.getName(); StringBuilder childPath = new StringBuilder(path); - if (!"/".equals(path) && !path.endsWith("/")) + if (!"/".equals(path) && !path.endsWith("/")) { childPath.append("/"); + } childPath.append(name); Object object = binding.getObject(); if (object instanceof DirContext && @@ -7833,10 +7907,11 @@ public MySecurityManager run() { * Get full path, based on the host name and the context path. */ private static String getJNDIUri(String hostName, String path) { - if (!path.startsWith("/")) + if (!path.startsWith("/")) { return "/" + hostName + "/" + path; - else + } else { return "/" + hostName + path; + } } /** diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSESupport.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSESupport.java index 88142a266b0..31ccd6df8fe 100644 --- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSESupport.java +++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSESupport.java @@ -95,8 +95,8 @@ public String getCipherSuite() throws IOException { @Override - public Object[] getPeerCertificateChain() throws IOException { - return getPeerCertificateChain(false); + public Certificate[] getPeerCertificates() throws IOException { + return getPeerCertificates(false); } @@ -136,7 +136,7 @@ protected Certificate[] getX509Certificates(SSLSession session) throws IOExcepti @Override - public Object[] getPeerCertificateChain(boolean force) throws IOException { + public Certificate[] getPeerCertificates(boolean force) throws IOException { if (session == null) { return null; } diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index 49b6d32353d..fd9ec0bb3bb 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -84,14 +84,14 @@ 7.0.3-SNAPSHOT - - 4.0.0-M3 + 4.0.0-SNAPSHOT 2.0.1.MR @@ -120,9 +120,9 @@ - + 4.2.4 - 3.0.1 + 4.0.0-SNAPSHOT 2.0.0 3.2.3 4.1.2 @@ -135,7 +135,7 @@ - + 2.2.1.Final 3.4.3.Final 3.28.0-GA @@ -157,13 +157,13 @@ 5.8.2 1.34 1.0.3 - + 8 9 - - + + - + UTF-8 ${project.build.directory}/common-resources ${project.build.commonResourcesDirectory}/legal @@ -210,14 +210,14 @@ expressly ${expressly.version} - + jakarta.servlet jakarta.servlet-api ${jakarta.servlet-api.version} - + jakarta.validation @@ -234,14 +234,14 @@ hibernate-validator-cdi ${hibernate-validator.version} - + org.glassfish.metro webservices-extra-jdk-packages ${webservices.version} - + jakarta.inject @@ -260,7 +260,7 @@ osgi-resource-locator ${osgi-resource-locator.version} - + jakarta.xml.bind @@ -278,7 +278,7 @@ jaxb-osgi ${jakarta.jaxb-impl.version} - + jakarta.ws.rs @@ -292,7 +292,7 @@ pom import - + jakarta.mail @@ -304,7 +304,7 @@ angus-mail ${angus.mail.version} - + jakarta.activation @@ -316,17 +316,17 @@ angus-activation ${angus.activation.version} - + jakarta.annotation jakarta.annotation-api ${jakarta.annotation-api.version} - - + + - + org.glassfish.corba @@ -353,7 +353,7 @@ rmic ${glassfish-corba.version} - + org.glassfish.grizzly @@ -362,14 +362,14 @@ pom import - + org.glassfish.external management-api ${glassfish-management-api.version} - + org.glassfish.pfl @@ -396,14 +396,14 @@ pfl-tf-tools ${pfl.version} - + org.glassfish.gmbal gmbal ${gmbal.version} - + org.glassfish.shoal @@ -420,18 +420,18 @@ shoal-cache ${shoal.version} - + org.glassfish.ha ha-api ${ha-api.version} - - - + + + - + org.osgi osgi.cmpn @@ -529,11 +529,11 @@ jline 2.14.5 - - - + + + - + org.jboss.logging jboss-logging @@ -574,7 +574,7 @@ asm-util ${asm.version} - + javax.xml.stream stax-api @@ -586,7 +586,7 @@ jettison ${jettison.version} - + com.fasterxml @@ -619,7 +619,7 @@ - + antlr antlr @@ -704,7 +704,7 @@ logging-annotation-processor ${logging-annotation-processor.version} - + diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java index 16d5581d76b..2e0e8664b5e 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java @@ -1,6 +1,6 @@ /* - * Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2021 Contributors to the Eclipse Foundation + * Copyright (c) 2021-2022 Contributors to the Eclipse Foundation + * Copyright (c) 2010-2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -77,12 +77,12 @@ public String getCipherSuite() throws IOException { } @Override - public Object[] getPeerCertificateChain() throws IOException { - return getPeerCertificateChain(false); + public Certificate[] getPeerCertificates() throws IOException { + return getPeerCertificates(false); } @Override - public Object[] getPeerCertificateChain(boolean force) throws IOException { + public Certificate[] getPeerCertificates(boolean force) throws IOException { if (session == null) { return null; } @@ -152,7 +152,7 @@ private void handshake() throws IOException { socket.startHandshake(); } - private Object[] getX509Certs() { + private Certificate[] getX509Certs() { Certificate[] certs = null; try { certs = session.getPeerCertificates(); diff --git a/snapshots/grizzly/pom.xml b/snapshots/grizzly/pom.xml new file mode 100644 index 00000000000..4d5bfb33735 --- /dev/null +++ b/snapshots/grizzly/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + org.glassfish.main.snapshots + snapshotsmodule + 0.0.0-SNAPSHOT + + + grizzly + pom + + + https://github.com/eclipse-ee4j/grizzly/archive/refs/heads/master.zip + ${project.build.directory}/grizzly-master + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + maven-invoker-plugin + + + + diff --git a/snapshots/metro/pom.xml b/snapshots/metro/pom.xml new file mode 100644 index 00000000000..4f332a9cf65 --- /dev/null +++ b/snapshots/metro/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + org.glassfish.main.snapshots + snapshotsmodule + 0.0.0-SNAPSHOT + + + metro + pom + + + https://github.com/eclipse-ee4j/metro-wsit/archive/refs/heads/master.zip + ${project.build.directory}/metro-wsit-master/wsit + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + maven-invoker-plugin + + + + diff --git a/snapshots/pom.xml b/snapshots/pom.xml index acf218d1ed2..195bce90007 100644 --- a/snapshots/pom.xml +++ b/snapshots/pom.xml @@ -41,6 +41,8 @@ hibernate-validator + grizzly + metro From 87b99c57c196f52af0d4a30cc4c8a6704a81ffa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Wed, 16 Mar 2022 16:03:16 +0100 Subject: [PATCH 31/33] Updated Maven and JDK in the Docker for Jenkins --- Jenkinsfile | 2 +- etc/docker/Dockerfile | 17 +++++++++++------ etc/docker/Makefile | 8 ++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e32818af06a..134c0a49ad7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ env.label = "glassfish-ci-pod-${UUID.randomUUID().toString()}" // Docker image defined in this project in [glassfish]/etc/docker/Dockerfile -env.gfImage = "ee4jglassfish/ci:tini-jdk-11.0.10" +env.gfImage = "dmatej/eclipse-jenkins-glassfish:11.0.14.1" def jobs = [ "verifyPhase", diff --git a/etc/docker/Dockerfile b/etc/docker/Dockerfile index ba358dba9a3..4f5616cc01b 100644 --- a/etc/docker/Dockerfile +++ b/etc/docker/Dockerfile @@ -2,13 +2,18 @@ FROM krallin/centos-tini ADD ./entrypoint.sh /etc/ +# HOWTO: # -# The JDK was got from the following releases: -# -JDK11: https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/ -# releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_11.0.10_9.tar.gz -# Since the JDK is a very large file, download and add the file manually. +# 1) cd etc/docker +# 2) wget https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_linux_11.0.14.1_1.tar.gz +# 3) tar -xvzf OpenJDK11U-jdk_x64_linux_11.0.14.1_1.tar.gz +# 4) make # takes aroung 5 minutes, depending on network speed +# 5) docker login +# 6) docker push dmatej/eclipse-jenkins-glassfish:11.0.14.1 or another repository, don't forget to update the Jenkinsfile and Makefile too. +# 7) docker logout +# 8) git commit, git push, run jenkins build, etc. # -ADD ./openjdk-11.0.10_9 /usr/lib/jvm/jdk11 +ADD ./openjdk-11.0.14.1_1 /usr/lib/jvm/jdk11 RUN chmod +x /etc/entrypoint.sh && \ # @@ -24,7 +29,7 @@ RUN chmod +x /etc/entrypoint.sh && \ # # install maven # - curl -O https://archive.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.zip && \ + curl -O https://archive.apache.org/dist/maven/maven-3/3.8.5/binaries/apache-maven-3.8.5-bin.zip && \ unzip apache-maven-*-bin.zip -d /usr/share && \ rm apache-maven-*-bin.zip && \ mv /usr/share/apache-maven-* /usr/share/maven && \ diff --git a/etc/docker/Makefile b/etc/docker/Makefile index b6d0ff32f18..635e1e8eec6 100644 --- a/etc/docker/Makefile +++ b/etc/docker/Makefile @@ -1,5 +1,5 @@ SHELL := /bin/bash -IMAGE_TAG = tini-jdk-11.0.10 +IMAGE_TAG = 11.0.14.1 .PHONY: clean docker-clean docker-build docker-push @@ -8,10 +8,10 @@ default: docker-build clean: docker-clean docker-clean: - docker rmi ee4jglassfish/ci:$(IMAGE_TAG) + docker rmi dmatej/eclipse-jenkins-glassfish:$(IMAGE_TAG) docker-build: - docker build -t ee4jglassfish/ci:$(IMAGE_TAG) . + docker build -t dmatej/eclipse-jenkins-glassfish:$(IMAGE_TAG) . docker-push: - docker push ee4jglassfish/ci:$(IMAGE_TAG) + docker push dmatej/eclipse-jenkins-glassfish:$(IMAGE_TAG) From 538b72ee6471514a4095612ebb4cf6465589b2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Wed, 16 Mar 2022 19:04:10 +0100 Subject: [PATCH 32/33] Sources are required in some builds. --- snapshots/pom.xml | 3 ++- snapshots/settings.xml | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/snapshots/pom.xml b/snapshots/pom.xml index 195bce90007..e2621f92c3c 100644 --- a/snapshots/pom.xml +++ b/snapshots/pom.xml @@ -92,7 +92,8 @@ pom.xml - clean install + + clean source:jar install ${basedir}/../settings.xml staging,default 4 diff --git a/snapshots/settings.xml b/snapshots/settings.xml index 7f671366111..9f840adbf2c 100644 --- a/snapshots/settings.xml +++ b/snapshots/settings.xml @@ -17,7 +17,6 @@ true true true - true true From 4b6545cb5f18e35f24dee9baccdcb5e99379158e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Fri, 18 Mar 2022 14:23:22 +0100 Subject: [PATCH 33/33] Updated dependencies: grizzly, xmlsec, jersey, shoal --- appserver/pom.xml | 12 +++++----- nucleus/parent/pom.xml | 4 ++-- snapshots/grizzly/pom.xml | 2 +- snapshots/jersey/pom.xml | 49 +++++++++++++++++++++++++++++++++++++++ snapshots/metro/pom.xml | 2 +- snapshots/pom.xml | 2 ++ snapshots/shoal/pom.xml | 49 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 110 insertions(+), 10 deletions(-) create mode 100644 snapshots/jersey/pom.xml create mode 100644 snapshots/shoal/pom.xml diff --git a/appserver/pom.xml b/appserver/pom.xml index 62aa7fdd645..c5601440d01 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -137,7 +137,7 @@ 3.1.0-M1 - 2.1.7 + 2.3.0 6.2.8 4.2.1 @@ -156,7 +156,7 @@ - + 3.0.0 0.2 5.0.0 @@ -167,16 +167,16 @@ - + 6.7 6.7 10.15.2.0 1.6.3 2.4 - - + + - + Eclipse GlassFish GlassFish glassfish diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index fd9ec0bb3bb..51e161271ab 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -105,7 +105,7 @@ 3.1.0 - 3.1.0-M3 + 3.1.0-SNAPSHOT 2.1.0 @@ -127,7 +127,7 @@ 3.2.3 4.1.2 4.0.3 - 2.0.0 + 3.0.0-SNAPSHOT 3.1.13 1.9 1.0.14 diff --git a/snapshots/grizzly/pom.xml b/snapshots/grizzly/pom.xml index 4d5bfb33735..a38276817c6 100644 --- a/snapshots/grizzly/pom.xml +++ b/snapshots/grizzly/pom.xml @@ -1,7 +1,7 @@ + + 4.0.0 + + org.glassfish.main.snapshots + snapshotsmodule + 0.0.0-SNAPSHOT + + + jersey + pom + + + https://github.com/dmatej/jersey/archive/refs/heads/grizzly4.zip + ${project.build.directory}/jersey-grizzly4 + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + maven-invoker-plugin + + + + diff --git a/snapshots/metro/pom.xml b/snapshots/metro/pom.xml index 4f332a9cf65..d608c6d2893 100644 --- a/snapshots/metro/pom.xml +++ b/snapshots/metro/pom.xml @@ -1,7 +1,7 @@ + + 4.0.0 + + org.glassfish.main.snapshots + snapshotsmodule + 0.0.0-SNAPSHOT + + + shoal + pom + + + https://github.com/dmatej/glassfish-shoal/archive/refs/heads/jakartaee-10.zip + ${project.build.directory}/glassfish-shoal-jakartaee-10 + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + maven-invoker-plugin + + + +